summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/pkcs11_int.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pkcs11_int.c b/lib/pkcs11_int.c
index 25c537bbed..2994baf113 100644
--- a/lib/pkcs11_int.c
+++ b/lib/pkcs11_int.c
@@ -137,6 +137,12 @@ pkcs11_get_attribute_avalue(struct ck_function_list * module,
templ.value_len = 0;
rv = (module)->C_GetAttributeValue(sess, object, &templ, 1);
if (rv == CKR_OK) {
+ /* PKCS#11 v2.20 requires sensitive values to set a length
+ * of -1. In that case an error should have been returned,
+ * but some implementations return CKR_OK instead. */
+ if (templ.value_len == (unsigned long)-1)
+ return CKR_ATTRIBUTE_SENSITIVE;
+
if (templ.value_len == 0)
return rv;