[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_19-7-g3e686ef

[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=3e686ef013dbe016ee09a9ea4fbeca33cc67d853

The branch, gnutls_2_12_x has been updated
       via  3e686ef013dbe016ee09a9ea4fbeca33cc67d853 (commit)
       via  870013fd4ebbdad40f9235b8237a6a9010d97549 (commit)
       via  1e8cdf09648bc11c584a2e9584af27d8baf8b929 (commit)
      from  66f247a2fb7aa6a09ee1d8281bf43d973cf26140 (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 3e686ef013dbe016ee09a9ea4fbeca33cc67d853
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 10 12:55:02 2012 +0200

    do not use @euro

commit 870013fd4ebbdad40f9235b8237a6a9010d97549
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 10 12:47:11 2012 +0200

    bumped versions

commit 1e8cdf09648bc11c584a2e9584af27d8baf8b929
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 9 11:48:02 2012 +0200

    Fixed leaks in PKCS #8 decoding

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

Summary of changes:
 NEWS                     |    4 +++-
 configure.ac             |    2 +-
 doc/cha-cert-auth.texi   |    4 ++--
 doc/signatures.texi      |    4 ++--
 lib/configure.ac         |    2 +-
 lib/m4/hooks.m4          |    2 +-
 lib/x509/privkey_pkcs8.c |    6 +++---
 libextra/configure.ac    |    2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index 4c70f28..c394f13 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,9 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-Version 2.12.20 (unreleased)
+Version 2.12.20 (released 2012-06-10)
+
+** libgnutls: Fixed memory leak in PKCS #8 key import.
 
 ** libgnutls: Check key identifiers when checking for an issuer.
 
diff --git a/configure.ac b/configure.ac
index 6d44bee..89e04d4 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.19], address@hidden)
+AC_INIT([GnuTLS], [2.12.20], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index 19f4b9e..2065bad 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -578,8 +578,8 @@ used to preprocess the input to the signature algorithm. 
This works as
 long as it is difficult enough to generate two different messages with
 the same hash algorithm output. In that case the same signature could
 be used as a proof for both messages. Nobody wants to sign an innocent
-message of donating 1 @euro{} to Greenpeace and find out that he
-donated 1.000.000 @euro{} to Bad Inc.
+message of donating 1 euro to Greenpeace and find out that he
+donated 1.000.000 euros to Bad Inc.
 
 For a hash algorithm to be called cryptographic the following three
 requirements must hold:
diff --git a/doc/signatures.texi b/doc/signatures.texi
index 32e1013..1b7c667 100644
--- a/doc/signatures.texi
+++ b/doc/signatures.texi
@@ -11,8 +11,8 @@ used to preprocess the input to the signature algorithm. This 
works as
 long as it is difficult enough to generate two different messages with
 the same hash algorithm output. In that case the same signature could
 be used as a proof for both messages. Nobody wants to sign an innocent
-message of donating 1 @euro{} to Greenpeace and find out that he
-donated 1.000.000 @euro{} to Bad Inc.
+message of donating 1 euro to Greenpeace and find out that he
+donated 1.000.000 euros to Bad Inc.
 
 For a hash algorithm to be called cryptographic the following three
 requirements must hold
diff --git a/lib/configure.ac b/lib/configure.ac
index 25f68d7..1ecca78 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.19], address@hidden)
+AC_INIT([libgnutls], [2.12.20], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 5cd1b22..e921f71 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -27,7 +27,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 48)
-  AC_SUBST(LT_REVISION, 3)
+  AC_SUBST(LT_REVISION, 4)
   AC_SUBST(LT_AGE, 22)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index d58471b..32a6f8e 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1346,7 +1346,7 @@ read_pbkdf2_params (ASN1_TYPE pbes2_asn,
   /* We don't read the PRF. We only use the default.
    */
 
-  return 0;
+  result = 0;
 
 error:
   asn1_delete_structure (&pbkdf2_asn);
@@ -1554,8 +1554,8 @@ read_pbe_enc_params (ASN1_TYPE pbes2_asn,
       goto error;
     }
   _gnutls_hard_log ("IV.size: %d\n", params->iv_size);
-
-  return 0;
+  
+  result = 0;
 
 error:
   asn1_delete_structure (&pbe_asn);
diff --git a/libextra/configure.ac b/libextra/configure.ac
index c293507..da52265 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.19], address@hidden)
+AC_INIT([libgnutls-extra], [2.12.20], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 


hooks/post-receive
-- 
GNU gnutls