summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-10-12 19:11:34 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-10-12 19:11:34 +0200
commit13ee3a5eecf7131a45d967985e2a2d64ab3ac0a4 (patch)
tree37a32bc1f04b6fc82c980236412614fa3aa11c0b
parenta16d52f0bd0163a9064f56f109d29300cb2e3892 (diff)
downloadgnutls_3_1_3.tar.gz
call gnutls_x509_privkey_import_openssl() even with not a password.gnutls_3_1_3
-rw-r--r--lib/x509/privkey.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 4d861b2456..2b91e70c5c 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -601,7 +601,7 @@ gnutls_x509_privkey_import2 (gnutls_x509_privkey_t key,
ret = gnutls_x509_privkey_import_pkcs8(key, data, format, password, flags);
if (ret < 0)
{
- if (format == GNUTLS_X509_FMT_PEM && password != NULL)
+ if (format == GNUTLS_X509_FMT_PEM)
{
int err;
err = gnutls_x509_privkey_import_openssl(key, data, password);