[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_8-4-gc6fc7ec

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

The branch, gnutls_2_12_x has been updated
       via  c6fc7ec81a41473766fa42a4b2cdeb47ba031b9b (commit)
       via  a2eeac96c617aa757fd2cd3416f7bf26f3a782a1 (commit)
       via  b7e9f4caa15c269c703e540a9170c04428d59469 (commit)
      from  0ccd850d5738944b63c3ddc53246019edb2a6f46 (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 c6fc7ec81a41473766fa42a4b2cdeb47ba031b9b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 14 14:38:59 2011 +0200

    Corrected issue when asking multiple times for PIN.

commit a2eeac96c617aa757fd2cd3416f7bf26f3a782a1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Aug 14 13:27:28 2011 +0200

    corrected configure test.

commit b7e9f4caa15c269c703e540a9170c04428d59469
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Aug 12 16:54:53 2011 +0200

    do not escape \#

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

Summary of changes:
 doc/manpages/gnutls-cli.1 |    8 ++++----
 lib/configure.ac          |    2 +-
 lib/pkcs11.c              |   19 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/doc/manpages/gnutls-cli.1 b/doc/manpages/gnutls-cli.1
index 0b170ec..8a42a5c 100644
--- a/doc/manpages/gnutls-cli.1
+++ b/doc/manpages/gnutls-cli.1
@@ -123,14 +123,14 @@ SRP password to use.
 .IP "\-\-srpusername \fINAME\fR"
 SRP username to use.
 .IP "\-\-x509cafile \fIFILE\fR"
-Certificate file to use. This option accepts PKCS \#11 URLs such as
-pkcs11:token=Root%20CA%20Certificates;serial=1%3AROOTS%3ADEFAULT;model=1%2E0;manufacturer=Gnome%20Keyring
+Certificate file to use. This option accepts PKCS #11 URLs such as
+"pkcs11:token=xxx"
 .IP "\-\-x509certfile \fIFILE\fR"
-X.509 Certificate file to use, or a PKCS \#11 URL.
+X.509 Certificate file to use, or a PKCS #11 URL.
 .IP "\-\-x509fmtder"
 Use DER format for certificates
 .IP "\-\-x509keyfile \fIFILE\fR"
-X.509 key file or PKCS \#11 URL to use.
+X.509 key file or PKCS #11 URL to use.
 .IP "\-\-x509crlfile \fIFILE\fR"
 X.509 CRL file to use.
 .IP "\-\-pskusername \fINAME\fR"
diff --git a/lib/configure.ac b/lib/configure.ac
index 4d54c15..75bdc8d 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -84,7 +84,7 @@ PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, 
ZLIB_HAS_PKGCONFIG=n)
 
 if test x$ac_zlib != xno; then
   if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
-    if test x$GNUTLS_REQUIRES_PRIVATE = x; then
+    if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
       GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
     else
       GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index f5ce8ad..fed076b 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1854,16 +1854,12 @@ retrieve_pin_for_callback (struct ck_token_info 
*token_info, int attempts,
   free (label);
 
   if (ret < 0)
-    {
-      gnutls_assert ();
-      return GNUTLS_E_PKCS11_PIN_ERROR;
-    }
+    return gnutls_assert_val(GNUTLS_E_PKCS11_PIN_ERROR);
 
   *pin = p11_kit_pin_new_for_string (pin_value);
-
-  /* Try to scrub the pin off the stack.  Clever compilers will
-   * probably optimize this away, oh well. */
-  memset (pin, 0, sizeof pin);
+  
+  if (*pin == NULL)
+    return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
   return 0;
 }
@@ -1879,7 +1875,10 @@ retrieve_pin (struct p11_kit_uri *info, struct 
ck_token_info *token_info,
   /* Check if a pinfile is specified, and use that if possible */
   pinfile = p11_kit_uri_get_pinfile (info);
   if (pinfile != NULL)
-    return retrieve_pin_for_pinfile (pinfile, token_info, attempts, user_type, 
pin);
+    {
+      _gnutls_debug_log("pk11: Using pinfile to retrieve PIN\n");
+      return retrieve_pin_for_pinfile (pinfile, token_info, attempts, 
user_type, pin);
+    }
 
   /* The global gnutls pin callback */
   else if (pin_func)
@@ -1961,7 +1960,7 @@ pkcs11_login (struct ck_function_list * module, 
ck_session_handle_t pks,
             }
         }
 
-      ret = retrieve_pin (info, &tinfo, attempt, user_type, &pin);
+      ret = retrieve_pin (info, &tinfo, attempt++, user_type, &pin);
       if (ret < 0)
         {
           gnutls_assert ();


hooks/post-receive
-- 
GNU gnutls