[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_18-3-g3693c0c

[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=3693c0c474c85e363a3949aa8d70e9cee0de59bf

The branch, gnutls_2_12_x has been updated
       via  3693c0c474c85e363a3949aa8d70e9cee0de59bf (commit)
       via  fee115648e64653cfe4eb178cfedf237091d6f2f (commit)
      from  d6b983dee475d1597687c3dcbca54c5842e3fc7f (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 3693c0c474c85e363a3949aa8d70e9cee0de59bf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Apr 16 18:20:21 2012 +0200

    documented fix

commit fee115648e64653cfe4eb178cfedf237091d6f2f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Apr 16 18:18:51 2012 +0200

    by default register a file callback in p11-kit to read a file from the 
pin-source pkcs11url field.

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

Summary of changes:
 NEWS         |    3 +++
 lib/pkcs11.c |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 1f72315..37f2015 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end for copying conditions.
 
 Version 2.12.19 (unreleased)
 
+** libgnutls: When decoding a PKCS #11 URL the pin-source field
+is assumed to be a file that stores the pin.
+
 ** minitasn1: Upgraded to libtasn1 version 2.13 (pre-release).
 
 ** API and ABI modifications:
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 6fc55a2..074186c 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -557,6 +557,9 @@ gnutls_pkcs11_init (unsigned int flags, const char 
*deprecated_config_file)
     }
   init++;
 
+  p11_kit_pin_register_callback (P11_KIT_PIN_FALLBACK, 
p11_kit_pin_file_callback,
+                                 NULL, NULL);
+
   if (flags == GNUTLS_PKCS11_FLAG_AUTO)
     {
       if (deprecated_config_file == NULL)
@@ -1911,7 +1914,7 @@ 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)
+  if (pinfile != NULL && attempts == 0)
     {
       _gnutls_debug_log("pk11: Using pinfile to retrieve PIN\n");
       return retrieve_pin_for_pinfile (pinfile, token_info, attempts, 
user_type, pin);


hooks/post-receive
-- 
GNU gnutls