Fix build issues and findings

Author: LinuxJedi

src/crypto.c

@@ -6760,37 +6760,35 @@ 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);
+                    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));
+                        }
                     }
-                } else {
+                }
+                if (rv == CKR_OK) {
+                    rv = AddObject(session, pbkdf2Key, pTemplate, ulCount, phKey);
+                }
+                if (rv != CKR_OK) {
                     WP11_Object_Free(pbkdf2Key);
-                    rv = CKR_FUNCTION_FAILED;
                 }
             }
 
             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
@@ -6877,37 +6875,35 @@ 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);
+                    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));
+                        }
                     }
-                } else {
+                }
+                if (rv == CKR_OK) {
+                    rv = AddObject(session, pbeKey, pTemplate, ulCount, phKey);
+                }
+                if (rv != CKR_OK) {
                     WP11_Object_Free(pbeKey);
-                    rv = CKR_FUNCTION_FAILED;
                 }
             }
 
             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/pkcs11test.c

@@ -697,10 +697,12 @@ static CK_RV test_token(void* args)
         ret = funcList->C_InitToken(slot, soPin, soPinLen, NULL);
         CHECK_CKR_FAIL(ret, CKR_ARGUMENTS_BAD, "Init Token no label");
     }
+#if WP11_MIN_PIN_LEN > 3
     if (ret == CKR_OK) {
         ret = funcList->C_InitToken(slot, soPin, 3, label);
         CHECK_CKR_FAIL(ret, CKR_PIN_LEN_RANGE, "Init Token too short PIN");
     }
+#endif
     if (ret == CKR_OK) {
         ret = funcList->C_InitToken(slot, soPin, 33, label);
         CHECK_CKR_FAIL(ret, CKR_PIN_LEN_RANGE, "Init Token too long PIN");