[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_19-46-ge67121a

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

The branch, gnutls_3_0_x-2 has been updated
       via  e67121a3f3abaf8b3e81605fc0d3d8d4e8035cf4 (commit)
       via  6eb271e93fd7c38d77973c285c8e607784f3042f (commit)
      from  0cd87aa365ea26a3f4eb6a2500529f5e8343f5f4 (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 e67121a3f3abaf8b3e81605fc0d3d8d4e8035cf4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 3 12:53:19 2012 +0200

    Removed duplicate entries and added an explicit local.

commit 6eb271e93fd7c38d77973c285c8e607784f3042f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 3 12:20:47 2012 +0200

    better function naming.

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

Summary of changes:
 lib/libgnutls.map |    4 ++--
 lib/pkcs11.c      |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 629d226..b2b9825 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -634,7 +634,6 @@ GNUTLS_2_12
        gnutls_pubkey_import_pkcs11_url;
        gnutls_pubkey_get_verify_algorithm;
        gnutls_pubkey_verify_hash;
-       gnutls_pkcs11_obj_export;
        gnutls_pubkey_import;
        gnutls_x509_crt_set_pubkey;
        gnutls_x509_crq_set_pubkey;
@@ -825,7 +824,6 @@ GNUTLS_PRIVATE {
     # Internal symbols needed by gnutls-cli-debug:
     _gnutls_rsa_pms_set_version;
     _gnutls_record_set_default_version;
-    _gnutls_record_set_default_version;
     # Internal symbols needed by tests/gc:
     _gnutls_hmac_fast;
     _gnutls_pbkdf2_sha1;
@@ -837,4 +835,6 @@ GNUTLS_PRIVATE {
     # Internal symbols needed by tests/pkcs12_s2k:
     _gnutls_pkcs12_string_to_key;
     _gnutls_bin2hex;
+  local:
+    *;
 };
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 6cc40f3..4897f62 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1816,7 +1816,7 @@ struct pkey_list
 
 
 static int
-retrieve_pin_for_pinfile (const char *pinfile, struct ck_token_info 
*token_info,
+retrieve_pin_from_source (const char *pinfile, struct ck_token_info 
*token_info,
                           int attempts, ck_user_type_t user_type, struct 
p11_kit_pin **pin)
 {
   unsigned int flags = 0;
@@ -1967,7 +1967,7 @@ retrieve_pin (struct p11_kit_uri *info, struct 
ck_token_info *token_info,
   if (pinfile != NULL)
     {
       _gnutls_debug_log("pk11: Using pinfile to retrieve PIN\n");
-      ret = retrieve_pin_for_pinfile (pinfile, token_info, attempts, 
user_type, pin);
+      ret = retrieve_pin_from_source (pinfile, token_info, attempts, 
user_type, pin);
     }
 
   /* The global gnutls pin callback */


hooks/post-receive
-- 
GNU gnutls