Improved test + build (copilot's review)

Author: danielinux

test-app/CMakeLists.txt

@@ -205,7 +205,11 @@ if(BUILD_TEST_APPS)
     endif()
 
     if(WOLFCRYPT_TZ_PKCS11)
-        list(APPEND TEST_APP_COMPILE_DEFINITIONS WOLFBOOT_PKCS11_APP SECURE_PKCS11 WOLFPKCS11_USER_SETTINGS)
+        list(APPEND TEST_APP_COMPILE_DEFINITIONS
+            WOLFBOOT_PKCS11_APP
+            SECURE_PKCS11
+            WOLFBOOT_TZ_PKCS11
+            WOLFPKCS11_USER_SETTINGS)
         if(PKCS11_TESTAPP)
             list(APPEND TEST_APP_COMPILE_DEFINITIONS WOLFBOOT_PKCS11_TESTAPP)
         endif()

test-app/test_pkcs11.c

@@ -242,6 +242,8 @@ static int test_pkcs11_open_user_session(CK_SESSION_HANDLE *session)
 {
     CK_RV rv;
 
+    *session = CK_INVALID_HANDLE;
+
     rv = wolfpkcs11nsFunctionList.C_OpenSession(TEST_PKCS11_SLOT_ID,
         CKF_SERIAL_SESSION | CKF_RW_SESSION, NULL, NULL, session);
     if (test_pkcs11_ck_ok("C_OpenSession(USER)", rv) < 0)
@@ -254,11 +256,13 @@ static int test_pkcs11_open_user_session(CK_SESSION_HANDLE *session)
 
     if (rv == CKR_USER_PIN_NOT_INITIALIZED) {
         (void)wolfpkcs11nsFunctionList.C_CloseSession(*session);
+        *session = CK_INVALID_HANDLE;
         return -2;
     }
 
     test_pkcs11_dump_rv("C_Login(USER)", rv);
     (void)wolfpkcs11nsFunctionList.C_CloseSession(*session);
+    *session = CK_INVALID_HANDLE;
     return -1;
 }
 
@@ -398,6 +402,7 @@ static int test_pkcs11_load_blob(CK_SESSION_HANDLE session,
     CK_OBJECT_HANDLE data_obj, struct test_pkcs11_blob *blob)
 {
     CK_ULONG len = sizeof(*blob);
+    CK_ULONG expected_len;
     int ret;
 
     ret = test_pkcs11_get_attr(session, data_obj, CKA_VALUE, (CK_BYTE *)blob, &len);
@@ -412,6 +417,11 @@ static int test_pkcs11_load_blob(CK_SESSION_HANDLE session,
         blob->payload_len + blob->sig_len > sizeof(blob->data))
         return -1;
 
+    expected_len = (CK_ULONG)(sizeof(*blob) - sizeof(blob->data) +
+        blob->payload_len + blob->sig_len);
+    if (len < expected_len)
+        return -1;
+
     printf("pkcs11: restored blob payload_len=%lu sig_len=%lu\r\n",
         (unsigned long)blob->payload_len, (unsigned long)blob->sig_len);
     test_pkcs11_log_blob_checksum(blob, "restored");