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.

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 5fdd756a1881c2d04948d2bdd4c284056580668e..6ef1039efa3627a48bd515092edb4d4908df3819 100644 (file)
--- 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 e0f7675b86cab674e9633fea883a8fb4f525ec0b..87878256a83471573182bbcd68dcf863a99113e9 100644 (file)
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -121,7 +121,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++); \