[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-154-g8b7c0f7

[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=8b7c0f7aa41c9c812cd63fc85b4cfb8feceb0b03

The branch, master has been updated
       via  8b7c0f7aa41c9c812cd63fc85b4cfb8feceb0b03 (commit)
      from  37ea5acc461ddb921748d6b4a9c656ffc93938ae (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 8b7c0f7aa41c9c812cd63fc85b4cfb8feceb0b03
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Jun 21 20:57:38 2012 +0200

    Use the label when looking for a certificate or private key in PKCS #11.
    
    Patch by David Woodhouse.

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

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

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 0f9c1b0..fa22cff 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1421,6 +1421,7 @@ find_obj_url (struct pkcs11_session_info *sinfo,
   int found = 0, ret;
   uint8_t *cert_data = NULL;
   char label_tmp[PKCS11_LABEL_SIZE];
+  char id_tmp[PKCS11_ID_SIZE];
 
   if (info == NULL)
     {                           /* we don't support multiple calls */
@@ -1437,8 +1438,22 @@ find_obj_url (struct pkcs11_session_info *sinfo,
       return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
     }
 
+  a_vals = 0;
   attr = p11_kit_uri_get_attribute (find_data->crt->info, CKA_ID);
-  if (attr == NULL)
+  if (attr)
+    {
+      memcpy (a + a_vals, attr, sizeof (struct ck_attribute));
+      a_vals++;
+    }
+
+  attr = p11_kit_uri_get_attribute (find_data->crt->info, CKA_LABEL);
+  if (attr)
+    {
+      memcpy (a + a_vals, attr, sizeof (struct ck_attribute));
+      a_vals++;
+    }
+
+  if (!a_vals)
     {
       gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
@@ -1454,9 +1469,6 @@ find_obj_url (struct pkcs11_session_info *sinfo,
     }
 
   /* Find objects with given class and type */
-  memcpy (a, attr, sizeof (struct ck_attribute));
-  a_vals = 1;
-
   attr = p11_kit_uri_get_attribute (find_data->crt->info, CKA_CLASS);
   if (attr)
     {
@@ -1494,17 +1506,16 @@ find_obj_url (struct pkcs11_session_info *sinfo,
       a[1].type = CKA_LABEL;
       a[1].value = label_tmp;
       a[1].value_len = sizeof (label_tmp);
+      a[2].type = CKA_ID;
+      a[2].value = id_tmp;
+      a[2].value_len = sizeof(id_tmp);
 
-      if (pkcs11_get_attribute_value (sinfo->module, sinfo->pks, obj, a, 2) == 
CKR_OK)
+      if (pkcs11_get_attribute_value (sinfo->module, sinfo->pks, obj, a, 3) == 
CKR_OK)
         {
-          gnutls_datum_t id;
+          gnutls_datum_t id = { a[2].value, a[2].value_len };
           gnutls_datum_t data = { a[0].value, a[0].value_len };
           gnutls_datum_t label = { a[1].value, a[1].value_len };
 
-          attr = p11_kit_uri_get_attribute (find_data->crt->info, CKA_ID);
-          id.data = attr->value;
-          id.size = attr->value_len;
-
           if (class == CKO_PUBLIC_KEY)
             {
               ret =
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index b0bee57..f377a9d 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -277,8 +277,12 @@ gnutls_pkcs11_privkey_import_url (gnutls_pkcs11_privkey_t 
pkey,
   attr = p11_kit_uri_get_attribute (pkey->info, CKA_ID);
   if (!attr || !attr->value_len)
     {
-      gnutls_assert ();
-      return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
+      attr = p11_kit_uri_get_attribute (pkey->info, CKA_LABEL);
+      if (!attr || !attr->value_len)
+        {
+          gnutls_assert ();
+          return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
+        }
     }
 
   FIND_OBJECT (&sinfo, obj, pkey);


hooks/post-receive
-- 
GNU gnutls