Addressed copilot comments

Author: danielinux

test-app/CMakeLists.txt

@@ -122,6 +122,9 @@ endif()
 
 if(BUILD_TEST_APPS)
     message(STATUS "Building wolfBoot test apps")
+    if(WOLFCRYPT_TZ_PKCS11 AND NOT TZEN)
+        message(FATAL_ERROR "WOLFCRYPT_TZ_PKCS11 requires TZEN=ON for test-app builds")
+    endif()
     add_executable(image)
 
     target_sources(image PRIVATE ${APP_SOURCES})
@@ -176,7 +179,7 @@ if(BUILD_TEST_APPS)
         target_include_directories(image PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/wcs)
     endif()
 
-    if(WOLFCRYPT_TZ_PKCS11)
+    if(TZEN AND WOLFCRYPT_TZ_PKCS11)
         target_include_directories(image PRIVATE ../lib/wolfPKCS11)
     endif()
 
@@ -204,7 +207,7 @@ if(BUILD_TEST_APPS)
         list(APPEND TEST_APP_COMPILE_DEFINITIONS WOLFBOOT_SECURE_CALLS)
     endif()
 
-    if(WOLFCRYPT_TZ_PKCS11)
+    if(TZEN AND WOLFCRYPT_TZ_PKCS11)
         list(APPEND TEST_APP_COMPILE_DEFINITIONS
             WOLFBOOT_PKCS11_APP
             SECURE_PKCS11

test-app/test_pkcs11.c

@@ -481,6 +481,7 @@ int test_pkcs11_start(void)
     int key_state;
     int data_state;
     int result = PKCS11_TEST_FAIL;
+    int session_logged_in = 0;
 
     memset(&blob, 0, sizeof(blob));
 
@@ -513,6 +514,7 @@ int test_pkcs11_start(void)
         ret = -1;
         goto cleanup;
     }
+    session_logged_in = 1;
 
     key_state = test_pkcs11_find_keypair(session, &pub_obj, &priv_obj);
     if (key_state < 0) {
@@ -570,8 +572,11 @@ int test_pkcs11_start(void)
     }
 
 cleanup:
-    (void)wolfpkcs11nsFunctionList.C_Logout(session);
-    (void)wolfpkcs11nsFunctionList.C_CloseSession(session);
+    if (session != CK_INVALID_HANDLE) {
+        if (session_logged_in)
+            (void)wolfpkcs11nsFunctionList.C_Logout(session);
+        (void)wolfpkcs11nsFunctionList.C_CloseSession(session);
+    }
     (void)wolfpkcs11nsFunctionList.C_Finalize(NULL);
     (void)wolfCrypt_Cleanup();