From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 8 Aug 2014 07:06:14 +0000 (+0200)
Subject: pkcs11: check CKA_UNWRAP as well for enabling GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP
X-Git-Tag: gnutls_3_4_0~1110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b82b93943e3bd1e3c0fab945fefa6cf59bfbcd0;p=thirdparty%2Fgnutls.git

pkcs11: check CKA_UNWRAP as well for enabling GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP
---

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index b6f602725a..d1159149bc 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -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;