[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_21-5-gecd5fa6

[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=ecd5fa69ae5dbf680acf2c581d6a14259d1c5b5c

The branch, gnutls_2_12_x has been updated
       via  ecd5fa69ae5dbf680acf2c581d6a14259d1c5b5c (commit)
       via  8b7638a1e3994d5d6ddcb702cf2aae1b958c43b1 (commit)
       via  713df5857fbb8b22dc5b32b5a052eca0fc115200 (commit)
       via  fcc063e196a97acdbbc94c5fd2d9603d21fc9c1f (commit)
      from  b43035823a6739f70f7d62678f2661438c66247f (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 ecd5fa69ae5dbf680acf2c581d6a14259d1c5b5c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 17 10:25:57 2012 +0100

    documented fix

commit 8b7638a1e3994d5d6ddcb702cf2aae1b958c43b1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 17 10:17:04 2012 +0100

    more gcc warnings to ignore

commit 713df5857fbb8b22dc5b32b5a052eca0fc115200
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 17 10:13:57 2012 +0100

    bumped version

commit fcc063e196a97acdbbc94c5fd2d9603d21fc9c1f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 25 15:37:17 2012 +0200

    Prevent the usage of strlen() on null values.

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

Summary of changes:
 NEWS                     |    3 +++
 configure.ac             |    9 ++++++++-
 lib/configure.ac         |    2 +-
 lib/x509/privkey_pkcs8.c |   14 +++++++++++---
 libextra/configure.ac    |    2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 3ee16a9..65c0063 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ Minimum libtasn1 dependency is now 2.14.
 ** libgnutls: Always tolerate key usage violation errors from the side
 of the peer, but also notify via an audit message.
 
+** libgnutls: Allow a NULL password to be specified in 
+gnutls_x509_privkey_import_pkcs8().
+
 ** minitasn1: Upgraded to libtasn1 version 3.0.
 
 ** API and ABI modifications:
diff --git a/configure.ac b/configure.ac
index 654b516..dd57ec4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [2.12.21], address@hidden)
+AC_INIT([GnuTLS], [2.12.22], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -237,11 +237,18 @@ if test "$gl_gcc_warnings" = yes; then
   nw="$nw -Wconversion"             # Too many warnings for now
   nw="$nw -Wsign-conversion"        # Too many warnings for now
   nw="$nw -Wformat-y2k"             # Too many warnings for now
+  nw="$nw -Woverlength-strings"     # We use some in tests/
   nw="$nw -Wvla"                    # There is no point to avoid C99 variable 
length arrays
   nw="$nw -Wformat-nonliteral"      # Incompatible with gettext _()
   nw="$nw -Wunsafe-loop-optimizations"
   nw="$nw -Wstrict-overflow"
   nw="$nw -Wmissing-noreturn"
+  nw="$nw -Winline"                 # Too compiler dependent
+  nw="$nw -Wsuggest-attribute=pure" # Is it worth using attributes?
+  nw="$nw -Wsuggest-attribute=const" # Is it worth using attributes?
+  nw="$nw -Wsuggest-attribute=noreturn" # Is it worth using attributes?
+  nw="$nw -Wstack-protector"        # Some functions cannot be protected
+  nw="$nw -Wredundant-decls"        # Some files cannot be compiled with that 
(gl_fd_to_handle)
 
   gl_MANYWARN_ALL_GCC([ws])
   gl_MANYWARN_COMPLEMENT(ws, [$ws], [$nw])
diff --git a/lib/configure.ac b/lib/configure.ac
index 266f7ef..488c49f 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # MA 02110-1301, USA
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls], [2.12.21], address@hidden)
+AC_INIT([libgnutls], [2.12.22], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 32a6f8e..8684422 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1577,6 +1577,10 @@ decrypt_data (schema_id schema, ASN1_TYPE pkcs8_asn,
   cipher_hd_st ch;
   int ch_init = 0;
   int key_size;
+  unsigned int pass_len = 0;
+  
+  if (password)
+    pass_len = strlen(password);
 
   data_size = 0;
   result = asn1_read_value (pkcs8_asn, root, NULL, &data_size);
@@ -1625,7 +1629,7 @@ decrypt_data (schema_id schema, ASN1_TYPE pkcs8_asn,
     case PBES2_AES_192:
     case PBES2_AES_256:
 
-      result = _gnutls_pbkdf2_sha1 (password, strlen (password),
+      result = _gnutls_pbkdf2_sha1 (password, pass_len,
                                     kdf_params->salt, kdf_params->salt_size,
                                     kdf_params->iter_count, key, key_size);
 
@@ -1879,9 +1883,13 @@ generate_key (schema_id schema,
               struct pbkdf2_params *kdf_params,
               struct pbe_enc_params *enc_params, gnutls_datum_t * key)
 {
-  opaque rnd[2];
+  unsigned char rnd[2];
+  unsigned int pass_len = 0;
   int ret;
 
+  if (password)
+    pass_len = strlen(password);
+
   ret = _gnutls_rnd (GNUTLS_RND_RANDOM, rnd, 2);
   if (ret < 0)
     {
@@ -1955,7 +1963,7 @@ generate_key (schema_id schema,
     case PBES2_AES_192:
     case PBES2_AES_256:
 
-      ret = _gnutls_pbkdf2_sha1 (password, strlen (password),
+      ret = _gnutls_pbkdf2_sha1 (password, pass_len,
                                  kdf_params->salt, kdf_params->salt_size,
                                  kdf_params->iter_count,
                                  key->data, kdf_params->key_size);
diff --git a/libextra/configure.ac b/libextra/configure.ac
index 25d9b28..e7ba3cc 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # 02110-1301, USA.
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls-extra], [2.12.21], address@hidden)
+AC_INIT([libgnutls-extra], [2.12.22], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 


hooks/post-receive
-- 
GNU gnutls