Minor test fixes and version improvements

Author: Frauschi

.gitignore

@@ -50,9 +50,12 @@ examples/obj_list
 examples/slot_info
 examples/token_info
 store/wp11*
+store/debug
+store/empty_pin_test
 store/object
 store/pkcs11mtt
 store/pkcs11test
+store/pkcs11v3test
 store/rsa
 store/str
 test/*
@@ -63,6 +66,7 @@ test/*
 .settings
 add_cert_file
 .cache
+compile_commands.json
 
 tests/wp11_rsakey_*
 tests/wp11_dhkey_*
@@ -72,6 +76,7 @@ tests/wp11_token_*
 tests/wp11_obj_*
 tests/token_path_test
 tests/rsa_session_persistence_test
+tests/empty_pin_store_test
 
 IDE/VisualStudio/.vs
 

src/wolfpkcs11.c

@@ -26,9 +26,10 @@
 #include <wolfpkcs11/pkcs11.h>
 #include <wolfpkcs11/internal.h>
 
-/* Function list table. */
+/* Function list table for PKCS#11 v2.40 */
 static CK_FUNCTION_LIST wolfpkcs11FunctionList = {
-    { 2, 40 },
+    /* Version: Major, Minor */
+    {           2,     40 },
 
     C_Initialize,
     C_Finalize,
@@ -104,8 +105,10 @@ static CK_FUNCTION_LIST wolfpkcs11FunctionList = {
 
 CK_RV C_GetInfoV3_0(CK_INFO_PTR pInfo);
 
+/* Function list table for PKCS#11 v3.0 */
 static CK_FUNCTION_LIST_3_0 wolfpkcs11FunctionList_3_0 = {
-    { 3, 0 },
+    /* Version: Major, Minor */
+    {           3,     0 },
 
     C_Initialize,
     C_Finalize,
@@ -207,8 +210,10 @@ static CK_FUNCTION_LIST_3_0 wolfpkcs11FunctionList_3_0 = {
 
 CK_RV C_GetInfoV3_2(CK_INFO_PTR pInfo);
 
+/* Function list table for PKCS#11 v3.2 */
 static CK_FUNCTION_LIST_3_2 wolfpkcs11FunctionList_3_2 = {
-    { CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR },
+    /* Version: Major, Minor */
+    {           3,     2 },
 
     C_Initialize,
     C_Finalize,

tests/pkcs11mtt.c

@@ -1523,7 +1523,7 @@ static CK_RV test_recover(void* args)
     }
     if (ret == CKR_OK) {
         ret = funcList->C_VerifyRecover(session, sig, sigSz, data, &dataSz);
-#ifndef NO_RSA
+#if !defined(NO_RSA) && defined(WC_RSA_DIRECT)
         CHECK_CKR_FAIL(ret, CKR_OPERATION_NOT_INITIALIZED,
                                               "Verify Recover not initialized");
 #else

tests/pkcs11test.c

@@ -1888,6 +1888,20 @@ static CK_RV test_pkcs5_pbkdf2_key_gen(void* args)
     }
 #endif
 
+#ifdef WOLFSSL_SHA384
+    if (ret == CKR_OK) {
+        CK_PKCS5_PBKD2_PARAMS sha384Params = pbkdf2Params;
+        CK_MECHANISM sha384Mech = mechanism;
+        sha384Params.prf = CKP_PKCS5_PBKD2_HMAC_SHA384;
+        sha384Mech.pParameter = &sha384Params;
+
+        ret = funcList->C_GenerateKey(session, &sha384Mech, keyTemplate,
+                                      sizeof(keyTemplate)/sizeof(CK_ATTRIBUTE), &key);
+        CHECK_CKR(ret, "PKCS#5 PBKDF2 with SHA384");
+    }
+#endif
+
+#ifdef WOLFSSL_SHA512
     if (ret == CKR_OK) {
         CK_PKCS5_PBKD2_PARAMS sha512Params = pbkdf2Params;
         CK_MECHANISM sha512Mech = mechanism;
@@ -1898,6 +1912,7 @@ static CK_RV test_pkcs5_pbkdf2_key_gen(void* args)
                                       sizeof(keyTemplate)/sizeof(CK_ATTRIBUTE), &key);
         CHECK_CKR(ret, "PKCS#5 PBKDF2 with SHA512");
     }
+#endif
 
     return ret;
 }
@@ -2460,7 +2475,7 @@ static CK_RV test_copy_object_deep_copy(void* args)
     return ret;
 }
 
-#if (!defined(NO_RSA) && !defined(WOLFPKCS11_TPM))
+#if (!defined(NO_RSA) && !defined(WOLFPKCS11_TPM) && defined(WOLFSSL_KEY_GEN))
 static CK_RV test_copy_object_rsa_key(void* args)
 {
     CK_SESSION_HANDLE session = *(CK_SESSION_HANDLE*)args;
@@ -5353,7 +5368,7 @@ static CK_RV test_recover(void* args)
     }
     if (ret == CKR_OK) {
         ret = funcList->C_VerifyRecover(session, sig, sigSz, data, &dataSz);
-#ifndef NO_RSA
+#if !defined(NO_RSA) && defined(WC_RSA_DIRECT)
         CHECK_CKR_FAIL(ret, CKR_OPERATION_NOT_INITIALIZED,
                                               "Verify Recover not initialized");
 #else
@@ -5365,7 +5380,7 @@ static CK_RV test_recover(void* args)
     return ret;
 }
 
-#ifndef NO_RSA
+#if !defined(NO_RSA) && defined(WC_RSA_DIRECT)
 static CK_RV rsa_verify_recover(CK_SESSION_HANDLE session,
                                 CK_MECHANISM_TYPE mech_type)
 {
@@ -15762,7 +15777,7 @@ static TEST_FUNC testFunc[] = {
     PKCS11TEST_FUNC_SESS_DECL(test_op_state_fail),
     PKCS11TEST_FUNC_SESS_DECL(test_object),
     PKCS11TEST_FUNC_SESS_DECL(test_copy_object_deep_copy),
-#if (!defined(NO_RSA) && !defined(WOLFPKCS11_TPM))
+#if (!defined(NO_RSA) && !defined(WOLFPKCS11_TPM) && defined(WOLFSSL_KEY_GEN))
     PKCS11TEST_FUNC_SESS_DECL(test_copy_object_rsa_key),
 #endif
 #ifdef HAVE_ECC
@@ -15793,7 +15808,7 @@ static TEST_FUNC testFunc[] = {
     PKCS11TEST_FUNC_SESS_DECL(test_digest_fail),
     PKCS11TEST_FUNC_SESS_DECL(test_sign_verify),
     PKCS11TEST_FUNC_SESS_DECL(test_recover),
-#ifndef NO_RSA
+#if !defined(NO_RSA) && defined(WC_RSA_DIRECT)
     PKCS11TEST_FUNC_SESS_DECL(test_verify_recover_pkcs),
     PKCS11TEST_FUNC_SESS_DECL(test_verify_recover_x509),
 #endif

wolfpkcs11/pkcs11.h

@@ -24,6 +24,8 @@
 
 #ifdef WOLFPKCS11_USER_SETTINGS
     #include "user_settings.h"
+#else
+    #include <wolfpkcs11/options.h>
 #endif
 
 #include <wolfpkcs11/visibility.h>
@@ -73,8 +75,18 @@ extern "C" {
 
 #define CK_NULL_PTR     NULL_PTR
 
-#define CRYPTOKI_VERSION_MAJOR		          3
-#define CRYPTOKI_VERSION_MINOR		          2
+#ifndef CRYPTOKI_VERSION_MAJOR
+    #if defined(WOLFPKCS11_PKCS11_V3_2)
+        #define CRYPTOKI_VERSION_MAJOR 3
+        #define CRYPTOKI_VERSION_MINOR 2
+    #elif defined(WOLFPKCS11_PKCS11_V3_0)
+        #define CRYPTOKI_VERSION_MAJOR 3
+        #define CRYPTOKI_VERSION_MINOR 0
+    #else
+        #define CRYPTOKI_VERSION_MAJOR 2
+        #define CRYPTOKI_VERSION_MINOR 40
+    #endif
+#endif
 
 
 #define CK_INVALID_HANDLE                     0UL