Revert "Do not crash if password is null and GNUTLS_PKCS_PLAIN is not specified."

This allows decrypting PKCS #12 structures that are encrypted with a NULL password (which is different than empty).

This reverts commit 7b20e72332e3e5238e8236375a2a82b1387e2e06.

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 825ba8388f6f8f431ecc26de33c6bcc371300d47..3af1045ea681493bfbac16c9cefbaa68a2df049f 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1228,7 +1228,7 @@ gnutls_x509_privkey_import_pkcs8 (gnutls_x509_privkey_t key,
       need_free = 1;
     }
 
-  if (password == NULL || (flags & GNUTLS_PKCS_PLAIN))
+  if (flags & GNUTLS_PKCS_PLAIN)
     {
       result = decode_private_key_info (&_data, key);
     }