]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
pkcs11: check CKA_UNWRAP as well for enabling GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP
authorNikos Mavrogiannopoulos <nmav@redhat.com>
Fri, 8 Aug 2014 07:06:14 +0000 (09:06 +0200)
committerNikos Mavrogiannopoulos <nmav@redhat.com>
Fri, 8 Aug 2014 07:06:19 +0000 (09:06 +0200)
lib/pkcs11.c

index b6f602725aab13b5e7df31df72c2ab312e1a37fc..d1159149bc6a79eee9cd707821951248ad99c156 100644 (file)
@@ -1513,6 +1513,14 @@ pkcs11_import_object(ck_object_handle_t obj, ck_object_class_t class,
        a[0].value = &b;
        a[0].value_len = sizeof(b);
 
+       rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
+       if (rv == CKR_OK && b != 0)
+               fobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP;
+
+       a[0].type = CKA_UNWRAP;
+       a[0].value = &b;
+       a[0].value_len = sizeof(b);
+
        rv = pkcs11_get_attribute_value(sinfo->module, sinfo->pks, obj, a, 1);
        if (rv == CKR_OK && b != 0)
                fobj->flags |= GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP;