Minor test fixes and version improvements

Author: Frauschi

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

@@ -5353,7 +5353,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 +5365,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)
 {
@@ -15793,7 +15793,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

@@ -73,8 +73,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