Add mechanism to NSS generated keys

F-2037

Author: LinuxJedi

src/crypto.c

@@ -6759,6 +6759,7 @@ CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession,
 
                 ret = WP11_Object_SetSecretKey(pbkdf2Key, secretKeyData, secretKeyLen);
                 if (ret == 0) {
+                    WP11_Object_SetKeyGeneration(pbkdf2Key, pMechanism->mechanism);
                     rv = AddObject(session, pbkdf2Key, pTemplate, ulCount, phKey);
                     if (rv != CKR_OK) {
                         WP11_Object_Free(pbkdf2Key);
@@ -6856,6 +6857,7 @@ CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession,
 
                 ret = WP11_Object_SetSecretKey(pbeKey, secretKeyData, secretKeyLen);
                 if (ret == 0) {
+                    WP11_Object_SetKeyGeneration(pbeKey, pMechanism->mechanism);
                     rv = AddObject(session, pbeKey, pTemplate, ulCount, phKey);
                     if (rv != CKR_OK) {
                         WP11_Object_Free(pbeKey);

src/internal.c

@@ -10627,6 +10627,19 @@ int WP11_Object_SetAttr(WP11_Object* object, CK_ATTRIBUTE_TYPE type, byte* data,
     return ret;
 }
 
+/**
+ * Mark an object as locally generated and record the mechanism used.
+ *
+ * @param  object     [in]  Object to update.
+ * @param  mechanism  [in]  Generation mechanism.
+ */
+void WP11_Object_SetKeyGeneration(WP11_Object* object,
+                                  CK_MECHANISM_TYPE mechanism)
+{
+    object->local = 1;
+    object->keyGenMech = mechanism;
+}
+
 /**
  * Check whether the attribute matches in the object.
  *

tests/include.am

@@ -61,6 +61,11 @@ noinst_PROGRAMS += tests/aes_keygen_attrs_test
 tests_aes_keygen_attrs_test_SOURCES = tests/aes_keygen_attrs_test.c
 tests_aes_keygen_attrs_test_LDADD =
 
+check_PROGRAMS += tests/pbkdf2_keygen_attrs_test
+noinst_PROGRAMS += tests/pbkdf2_keygen_attrs_test
+tests_pbkdf2_keygen_attrs_test_SOURCES = tests/pbkdf2_keygen_attrs_test.c
+tests_pbkdf2_keygen_attrs_test_LDADD =
+
 check_PROGRAMS += tests/pkcs11v3test
 noinst_PROGRAMS += tests/pkcs11v3test
 tests_pkcs11v3test_SOURCES = tests/pkcs11v3test.c
@@ -79,6 +84,7 @@ tests_find_objects_null_template_test_LDADD += src/libwolfpkcs11.la
 tests_aes_cbc_pad_padding_test_LDADD += src/libwolfpkcs11.la
 tests_ecb_check_value_error_test_LDADD += src/libwolfpkcs11.la
 tests_aes_keygen_attrs_test_LDADD += src/libwolfpkcs11.la
+tests_pbkdf2_keygen_attrs_test_LDADD += src/libwolfpkcs11.la
 tests_pkcs11v3test_LDADD += src/libwolfpkcs11.la
 else
 tests_object_id_uniqueness_test_LDADD += src/libwolfpkcs11.la
@@ -87,6 +93,7 @@ tests_find_objects_null_template_test_LDADD += src/libwolfpkcs11.la
 tests_aes_cbc_pad_padding_test_LDADD += src/libwolfpkcs11.la
 tests_ecb_check_value_error_test_LDADD += src/libwolfpkcs11.la
 tests_aes_keygen_attrs_test_LDADD += src/libwolfpkcs11.la
+tests_pbkdf2_keygen_attrs_test_LDADD += src/libwolfpkcs11.la
 endif
 
 EXTRA_DIST += tests/unit.h \