[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_20-11-g3b0281b

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

The branch, gnutls_3_0_x-2 has been updated
       via  3b0281b15e01dd8df2baa27db5f9308fae5feb0e (commit)
       via  71e7aa41ee8c969de04c839fcfc89f09afda60ad (commit)
       via  6207bc075869ffcc5a6d4d9d3f564e42aac1bd83 (commit)
       via  df9be0776e2f23458d3d933dfac188577a515b56 (commit)
       via  23c080ad8b4d746c2195802cb25b99373cb93d0b (commit)
       via  9eb6e316f9aa3615db00d71b83c088d5fa5b4cb7 (commit)
       via  5f52c3914292bd4b14fd6dd5cddc600557f1820f (commit)
       via  f2c69964275e366f4f0b3e1ebf4788e09b898cdf (commit)
      from  a4b5f38cbabbad84f45b192f40e6865baab31f19 (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 3b0281b15e01dd8df2baa27db5f9308fae5feb0e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 9 11:57:21 2012 +0200

    documented fix

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

    Fixed leaks in PKCS #8 decoding

commit 6207bc075869ffcc5a6d4d9d3f564e42aac1bd83
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Jun 8 09:20:32 2012 +0200

    documented pin_callback expectations.

commit df9be0776e2f23458d3d933dfac188577a515b56
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jun 7 22:13:32 2012 +0200

    Print the fingerprint only in the first certificate in the chain.

commit 23c080ad8b4d746c2195802cb25b99373cb93d0b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jun 6 21:17:34 2012 +0200

    corrected function name

commit 9eb6e316f9aa3615db00d71b83c088d5fa5b4cb7
Author: Mark Brand <address@hidden>
Date:   Wed Jun 6 10:09:48 2012 +0200

    add missing include wincrypt.h
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 5f52c3914292bd4b14fd6dd5cddc600557f1820f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 5 23:04:09 2012 +0200

    mention retrieve_function2

commit f2c69964275e366f4f0b3e1ebf4788e09b898cdf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 5 22:41:40 2012 +0200

    corrected invalid char

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

Summary of changes:
 NEWS                                 |    8 ++++++++
 doc/cha-gtls-app.texi                |    2 +-
 doc/examples/ex-cert-select-pkcs11.c |    5 +++++
 lib/gnutls_x509.c                    |    3 +++
 lib/includes/gnutls/gnutls.h.in      |    2 +-
 lib/x509/privkey_pkcs8.c             |    6 +++---
 src/common.c                         |    1 +
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index fdc2974..93ce65d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,14 @@ GnuTLS NEWS -- History of user-visible changes.                
-*- outline -*-
 Copyright (C) 2000-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 3.0.21 (unreleased)
+
+** libgnutls: Fixed memory leak in PKCS #8 key import.
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 3.0.20 (released 2012-06-05)
 
 ** libgnutls: Corrected bug which prevented the parsing of
diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index 9f2c8bf..35f705f 100644
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -425,7 +425,7 @@ In that case a certificate should be selected according the 
peer's signature
 algorithm preferences. To get those preferences use
 @funcref{gnutls_sign_algorithm_get_requested}. Both functions are shown below.
 
address@hidden,gnutls_sign_algorithm_get_requested}
address@hidden,gnutls_certificate_set_retrieve_function2,gnutls_sign_algorithm_get_requested}
 
 The functions above do not handle the requested server name automatically.
 A server would need to check the name requested by the client
diff --git a/doc/examples/ex-cert-select-pkcs11.c 
b/doc/examples/ex-cert-select-pkcs11.c
index e8cb21e..83c2e64 100644
--- a/doc/examples/ex-cert-select-pkcs11.c
+++ b/doc/examples/ex-cert-select-pkcs11.c
@@ -46,6 +46,11 @@ pin_callback (void *user, int attempt, const char *token_url,
 {
   const char *password;
   int len;
+  
+  /* Note that a PIN callback may be called multiple times during a
+   * session. It is expected to cache and return the same PIN for
+   * the same token_url, unless flags is set to GNUTLS_PKCS11_PIN_WRONG.
+   */
 
   printf ("PIN required for token '%s' with URL '%s'\n", token_label,
           token_url);
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 71e0d69..130d75c 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -42,6 +42,9 @@
 #include "x509/x509_int.h"
 #include <gnutls_str_array.h>
 #include "read-file.h"
+#if defined _WIN32 || defined __WIN32__
+#include <wincrypt.h>
+#endif
 
 /*
  * some x509 certificate parsing functions.
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 95ce1c7..9d78967 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -430,7 +430,7 @@ extern "C"
  *   set only if CRLs are checked.
  * @GNUTLS_CERT_SIGNER_NOT_FOUND: The certificate's issuer is not known. 
  *   This is the case if the issuer is not included in the trusted certificate 
list.
- * @GNUTLS_CERT_SIGNER_NOT_CA: The certificate’s signer was not a CA. This
+ * @GNUTLS_CERT_SIGNER_NOT_CA: The certificate's signer was not a CA. This
  *   may happen if this was a version 1 certificate, which is common with 
  *   some CAs, or a version 3 certificate without the basic constrains 
extension.
  * @GNUTLS_CERT_INSECURE_ALGORITHM:  The certificate was signed using an 
insecure
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index b442956..825ba83 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1362,7 +1362,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);
@@ -1570,8 +1570,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/src/common.c b/src/common.c
index c2f30a0..95de4b4 100644
--- a/src/common.c
+++ b/src/common.c
@@ -139,6 +139,7 @@ print_x509_info (gnutls_session_t session, int flag, int 
print_cert)
             }
 
           printf ("- Certificate[%d] info:\n - ", j);
+          if (flag == GNUTLS_CRT_PRINT_COMPACT && j > 0) flag = 
GNUTLS_CRT_PRINT_ONELINE;
 
           ret =
             gnutls_x509_crt_print (crt, flag, &cinfo);


hooks/post-receive
-- 
GNU gnutls