Add correct flags for PBKDF2 keys

F-2038

Author: LinuxJedi

src/crypto.c

@@ -6772,6 +6772,25 @@ CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession,
 
             wc_ForceZero(derivedKey, derivedKeyLen);
             XFREE(derivedKey, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+
+            if (rv == CKR_OK) {
+                rv = WP11_Object_GetAttr(pbkdf2Key, CKA_SENSITIVE, &getVar,
+                                         &getVarLen);
+                if ((rv == CKR_OK) && (getVar == CK_TRUE)) {
+                    rv = WP11_Object_SetAttr(pbkdf2Key, CKA_ALWAYS_SENSITIVE,
+                                             &trueVar, sizeof(CK_BBOOL));
+                }
+                if (rv == CKR_OK) {
+                    rv = WP11_Object_GetAttr(pbkdf2Key, CKA_EXTRACTABLE,
+                                             &getVar, &getVarLen);
+                    if ((rv == CKR_OK) && (getVar == CK_FALSE)) {
+                        rv = WP11_Object_SetAttr(pbkdf2Key,
+                                                 CKA_NEVER_EXTRACTABLE,
+                                                 &trueVar, sizeof(CK_BBOOL));
+                    }
+                }
+            }
+
             return rv;
         }
 #ifdef WOLFPKCS11_NSS
@@ -6870,6 +6889,25 @@ CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession,
 
             wc_ForceZero(derivedKey, derivedKeyLen);
             XFREE(derivedKey, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+
+            if (rv == CKR_OK) {
+                rv = WP11_Object_GetAttr(pbeKey, CKA_SENSITIVE, &getVar,
+                                         &getVarLen);
+                if ((rv == CKR_OK) && (getVar == CK_TRUE)) {
+                    rv = WP11_Object_SetAttr(pbeKey, CKA_ALWAYS_SENSITIVE,
+                                             &trueVar, sizeof(CK_BBOOL));
+                }
+                if (rv == CKR_OK) {
+                    rv = WP11_Object_GetAttr(pbeKey, CKA_EXTRACTABLE,
+                                             &getVar, &getVarLen);
+                    if ((rv == CKR_OK) && (getVar == CK_FALSE)) {
+                        rv = WP11_Object_SetAttr(pbeKey,
+                                                 CKA_NEVER_EXTRACTABLE,
+                                                 &trueVar, sizeof(CK_BBOOL));
+                    }
+                }
+            }
+
             return rv;
         }
 #endif

tests/pbkdf2_keygen_attrs_test.c

@@ -208,6 +208,8 @@ static int test_pbkdf2_keygen_attrs(CK_SESSION_HANDLE session)
     CK_OBJECT_HANDLE key;
     CK_BBOOL local = CK_FALSE;
     CK_MECHANISM_TYPE genMech = CK_UNAVAILABLE_INFORMATION;
+    CK_BBOOL alwaysSensitive = CK_FALSE;
+    CK_BBOOL neverExtractable = CK_FALSE;
     int result = 0;
 
     CK_BYTE password[] = "TestPassword123";
@@ -239,17 +241,23 @@ static int test_pbkdf2_keygen_attrs(CK_SESSION_HANDLE session)
 
     CK_OBJECT_CLASS keyClass = CKO_SECRET_KEY;
     CK_KEY_TYPE keyType = CKK_GENERIC_SECRET;
+    CK_BBOOL bTrue = CK_TRUE;
+    CK_BBOOL bFalse = CK_FALSE;
 
     CK_ATTRIBUTE genTmpl[] = {
-        { CKA_CLASS,     &keyClass, sizeof(keyClass) },
-        { CKA_KEY_TYPE,  &keyType,  sizeof(keyType)  },
-        { CKA_VALUE_LEN, &keyLength, sizeof(keyLength) },
+        { CKA_CLASS,       &keyClass,  sizeof(keyClass) },
+        { CKA_KEY_TYPE,    &keyType,   sizeof(keyType)  },
+        { CKA_VALUE_LEN,   &keyLength, sizeof(keyLength) },
+        { CKA_SENSITIVE,   &bTrue,     sizeof(bTrue) },
+        { CKA_EXTRACTABLE, &bFalse,    sizeof(bFalse) },
     };
     CK_ULONG genTmplCnt = sizeof(genTmpl) / sizeof(*genTmpl);
 
     CK_ATTRIBUTE getTmpl[] = {
-        { CKA_LOCAL,             &local,   sizeof(local)   },
-        { CKA_KEY_GEN_MECHANISM, &genMech, sizeof(genMech) },
+        { CKA_LOCAL,              &local,             sizeof(local)             },
+        { CKA_KEY_GEN_MECHANISM,  &genMech,           sizeof(genMech)           },
+        { CKA_ALWAYS_SENSITIVE,   &alwaysSensitive,   sizeof(alwaysSensitive)   },
+        { CKA_NEVER_EXTRACTABLE,  &neverExtractable,  sizeof(neverExtractable)  },
     };
     CK_ULONG getTmplCnt = sizeof(getTmpl) / sizeof(*getTmpl);
 
@@ -282,6 +290,28 @@ static int test_pbkdf2_keygen_attrs(CK_SESSION_HANDLE session)
     printf("PASS: CKA_KEY_GEN_MECHANISM is CKM_PKCS5_PBKD2\n");
     test_passed++;
 
+    if (alwaysSensitive != CK_TRUE) {
+        fprintf(stderr,
+                "FAIL: CKA_ALWAYS_SENSITIVE: expected CK_TRUE, got %d\n",
+                (int)alwaysSensitive);
+        test_failed++;
+        result = -1;
+        goto cleanup;
+    }
+    printf("PASS: CKA_ALWAYS_SENSITIVE is CK_TRUE\n");
+    test_passed++;
+
+    if (neverExtractable != CK_TRUE) {
+        fprintf(stderr,
+                "FAIL: CKA_NEVER_EXTRACTABLE: expected CK_TRUE, got %d\n",
+                (int)neverExtractable);
+        test_failed++;
+        result = -1;
+        goto cleanup;
+    }
+    printf("PASS: CKA_NEVER_EXTRACTABLE is CK_TRUE\n");
+    test_passed++;
+
 cleanup:
     return result;
 }