[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_6_1-5-g7c78a45

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

The branch, gnutls_2_12_x has been updated
       via  7c78a454729924f108cf099c301090070e98aef0 (commit)
      from  b33a02336e30ecb7cc9a6e866ca70ffc8c799207 (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 7c78a454729924f108cf099c301090070e98aef0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 7 19:07:24 2011 +0200

    Return error code when an object is not found.
    Only request for token insertion if the expected data is not found.
    
    Based on patch by Stef Walter.

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

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

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index f63bec7..a2dce6c 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1060,9 +1060,9 @@ pkcs11_find_object (pakchois_session_t ** _pks,
       *_pks = pks;
       pakchois_find_objects_final (pks);
       return 0;
-
     }
 
+  ret = GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
   pakchois_find_objects_final (pks);
 fail:
   pakchois_close_session (pks);
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index c4674d5..3d1ed3e 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -120,7 +120,7 @@ gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t 
pkey,
                int rret; \
                ret = pkcs11_find_object (&pks, &obj, &key->info, \
                        SESSION_LOGIN); \
-               if (ret < 0) { \
+               if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { \
                        if (token_func) \
                          { \
                            rret = token_func(token_data, key->info.token, 
retries++); \


hooks/post-receive
-- 
GNU gnutls