[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_21_real-11-g4ef1ee7

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=4ef1ee7061a258d53b6cf66c91187bd077a5d119

The branch, gnutls_3_0_x-2 has been updated
       via  4ef1ee7061a258d53b6cf66c91187bd077a5d119 (commit)
       via  f6535bc44280c0b75e13274574645ba2dc36c008 (commit)
      from  b4222f5db3a8dc197068cce867f458ed333b5dec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ef1ee7061a258d53b6cf66c91187bd077a5d119
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 4 13:06:03 2012 +0200

    updated

commit f6535bc44280c0b75e13274574645ba2dc36c008
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 4 12:57:59 2012 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                     |    3 +++
 lib/x509/privkey_pkcs8.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 01435ff..d459a18 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ See the end for copying conditions.
 ** certtool: Allow the user to choose the hash algorithm
 when signing certificate request or certificate revocation list.
 
+** Restored the behavior of gnutls_x509_privkey_import_pkcs8()
+which now may (again) accept a NULL password.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 825ba83..3af1045 100644
--- 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);
     }


hooks/post-receive
-- 
GNU gnutls