tests: crypto: use IS_ENABLED() for conditional logic instead of #if

Refactor psa_crypto_test to use IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)
inside the test function for better readability and maintainability.

- Replaced #if / #endif blocks inside functions with IS_ENABLED() checks
  so conditions can be expressed as normal C expressions.
- Retained #if only for global constant definitions where IS_ENABLED()
  cannot be used by the preprocessor.
- Added <zephyr/sys/util.h> include to access IS_ENABLED().
- Ensures dead code is optimized out by the compiler without runtime cost.

Signed-off-by: Aasim Shaik <[email protected]>

Author: Aasimshaik11

tests/crypto/psa_crypto/src/cipher.c

@@ -6,7 +6,7 @@
 
 #include <zephyr/ztest.h>
 #include <psa/crypto.h>
-
+#include <zephyr/sys/util.h>   /* for IS_ENABLED() */
 #include "test_vectors.h"
 
 uint8_t key_256[32] = {
@@ -40,15 +40,15 @@ ZTEST(psa_crypto_test, test_cipher_aes_cbc_256_multipart)
 	psa_set_key_algorithm(&attributes, alg);
 	psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
 	psa_set_key_bits(&attributes, 256);
-	#if  (CONFIG_TEST_WRAPPED_KEYS)
+	if (IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)) {
 		psa_set_key_lifetime(&attributes, PSA_KEY_LIFETIME_FROM_PERSISTENCE_AND_LOCATION(
 							PSA_KEY_PERSISTENCE_VOLATILE, 0));
 		zassert_equal(psa_generate_key(&attributes, &key_id), PSA_SUCCESS,
 				"Failed to generate key");
-	# else
+	} else {
 		zassert_equal(psa_import_key(&attributes, key_256, sizeof(key_256), &key_id),
 				PSA_SUCCESS, "Failed to import key");
-	#endif
+	}
 	psa_reset_key_attributes(&attributes);
 	zassert_equal(psa_cipher_encrypt_setup(&operation, key_id, alg), PSA_SUCCESS,
 			"Failed to begin encrypt operation");
@@ -95,15 +95,15 @@ ZTEST(psa_crypto_test, test_cipher_aes_cbc_256_single)
 	psa_set_key_algorithm(&attributes, alg);
 	psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
 	psa_set_key_bits(&attributes, 256);
-	#if  (CONFIG_TEST_WRAPPED_KEYS)
+	if (IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)) {
 		psa_set_key_lifetime(&attributes, PSA_KEY_LIFETIME_FROM_PERSISTENCE_AND_LOCATION(
 							PSA_KEY_PERSISTENCE_VOLATILE, 1));
 		zassert_equal(psa_generate_key(&attributes, &key_id), PSA_SUCCESS,
 				"Failed to generate key");
-	# else
+	} else {
 		zassert_equal(psa_import_key(&attributes, key_256, sizeof(key_256), &key_id),
 				PSA_SUCCESS, "Failed to import key");
-	#endif
+	}
 	psa_reset_key_attributes(&attributes);
 
 	zassert_equal(psa_cipher_encrypt(key_id, alg, plaintext, sizeof(plaintext),
@@ -133,16 +133,16 @@ ZTEST(psa_crypto_test, test_cipher_aes_ecb_128_single)
 	psa_set_key_algorithm(&attributes, alg);
 	psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
 	psa_set_key_bits(&attributes, 128);
-	#if  (CONFIG_TEST_WRAPPED_KEYS)
+	if (IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)) {
 		psa_set_key_lifetime(&attributes, PSA_KEY_LIFETIME_FROM_PERSISTENCE_AND_LOCATION(
 							PSA_KEY_PERSISTENCE_VOLATILE, 1));
 
 		zassert_equal(psa_generate_key(&attributes, &key_id), PSA_SUCCESS,
 				  "Failed to generate key");
-	# else
+	} else {
 		zassert_equal(psa_import_key(&attributes, key_128, sizeof(key_128), &key_id),
 				  PSA_SUCCESS, "Failed to import key");
-	#endif
+	}
 	psa_reset_key_attributes(&attributes);
 
 	zassert_equal(psa_cipher_encrypt(key_id, alg, plaintext, sizeof(plaintext), ciphertext,

tests/crypto/psa_crypto/src/key_agreement.c

@@ -6,6 +6,7 @@
 
 #include <zephyr/ztest.h>
 #include <psa/crypto.h>
+#include <zephyr/sys/util.h>   /* for IS_ENABLED() */
 
 static const uint8_t client_private_key[] = {
 	0xB0, 0x76, 0x51, 0xEA, 0x20, 0xF0, 0x28, 0xA8, 0x16, 0xEE, 0x01,
@@ -27,7 +28,7 @@ static const uint8_t server_public_key[] = {
 	0x8D, 0x49, 0x85, 0x8C, 0x7A, 0x9F, 0xC1, 0x46, 0xDA, 0xCC, 0x96,
 	0xEF, 0x6E, 0xD4, 0xDA, 0x71, 0xBF, 0xED, 0x32, 0x0D, 0x76,
 };
-#if  (!CONFIG_TEST_WRAPPED_KEYS)
+#if  !IS_ENABLE(CONFIG_TEST_WRAPPED_KEYS)
 	static const uint8_t expected_shared_secret[] = {
 		0xF2, 0xE6, 0x0E, 0x1C, 0xB7, 0x64, 0xBC, 0x48, 0xF2, 0x9D, 0xBB,
 		0x12, 0xFB, 0x12, 0x17, 0x31, 0x32, 0x1D, 0x79, 0xAF, 0x0A, 0x9F,
@@ -45,10 +46,10 @@ ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 	psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_MONTGOMERY));
 	psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DERIVE);
 	psa_set_key_algorithm(&attributes, PSA_ALG_ECDH);
-	#if  (CONFIG_TEST_WRAPPED_KEYS)
+	if (IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)){
 		psa_set_key_lifetime(&attributes, PSA_KEY_LIFETIME_FROM_PERSISTENCE_AND_LOCATION(
 							PSA_KEY_PERSISTENCE_VOLATILE, 0));
-	#endif
+	}
 	zassert_equal(psa_import_key(&attributes, client_private_key, sizeof(client_private_key),
 					&key_id),
 			PSA_SUCCESS, "Failed to import client key");
@@ -66,10 +67,10 @@ ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 	psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_MONTGOMERY));
 	psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DERIVE);
 	psa_set_key_algorithm(&attributes, PSA_ALG_ECDH);
-	#if  (CONFIG_TEST_WRAPPED_KEYS)
+	if (IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)) {
 		psa_set_key_lifetime(&attributes, PSA_KEY_LIFETIME_FROM_PERSISTENCE_AND_LOCATION(
 							PSA_KEY_PERSISTENCE_VOLATILE, 0));
-	#endif
+	}
 	zassert_equal(psa_import_key(&attributes, server_private_key, sizeof(server_private_key),
 					&key_id),
 			PSA_SUCCESS, "Failed to import server key");
@@ -81,10 +82,10 @@ ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 			PSA_SUCCESS, "Failed to perform key agreement with client");
 
 	zassert_equal(psa_destroy_key(key_id), PSA_SUCCESS, "Failed to destroy server key");
-	#if  (!CONFIG_TEST_WRAPPED_KEYS)
+	if (!IS_ENABLED(CONFIG_TEST_WRAPPED_KEYS)) {
 		/* Verify shared secret */
 		zassert_mem_equal(shared_secret_buf, expected_shared_secret,
 				sizeof(expected_shared_secret),
 				"Key agreement did not resolve the correct shared secret");
-	#endif
+	}
 }