From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 12 Oct 2012 17:11:34 +0000 (+0200)
Subject: call gnutls_x509_privkey_import_openssl() even with not a password.
X-Git-Tag: gnutls_3_1_3^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13ee3a5eecf7131a45d967985e2a2d64ab3ac0a4;p=thirdparty%2Fgnutls.git

call gnutls_x509_privkey_import_openssl() even with not a password.
---

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);