Revert "[nrf noup] tests: secure_storage: Fix issues"

tomi-font · tomi-font · commit c377bff4343e · 2025-02-13T16:30:52.000+02:00
This reverts commit fcb4238. We shouldn't have noups to fix things that can and should be fixed elsewhere/differently.
diff --git a/tests/subsys/secure_storage/psa/crypto/prj.conf b/tests/subsys/secure_storage/psa/crypto/prj.conf
@@ -2,6 +2,3 @@ CONFIG_ZTEST=y
 
 CONFIG_PSA_WANT_KEY_TYPE_AES=y
 CONFIG_PSA_WANT_ALG_CBC_NO_PADDING=y
-
-# native_sim requires ECB cipher to be enabled
-CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
diff --git a/tests/subsys/secure_storage/psa/crypto/src/main.c b/tests/subsys/secure_storage/psa/crypto/src/main.c
@@ -76,12 +76,7 @@ ZTEST(secure_storage_psa_crypto, test_its_caller_isolation)
 
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
 	zassert_equal(ret, PSA_SUCCESS);
-	zassert_equal(key_attributes.private_bits, retrieved_key_attributes.private_bits);
-	zassert_equal(key_attributes.private_id, retrieved_key_attributes.private_id);
-	zassert_equal(key_attributes.private_lifetime, retrieved_key_attributes.private_lifetime);
-	zassert_mem_equal(&key_attributes.private_policy, &retrieved_key_attributes.private_policy,
-			  sizeof(key_attributes.private_policy));
-
+	zassert_mem_equal(&retrieved_key_attributes, &key_attributes, sizeof(key_attributes));
 	ret = psa_destroy_key(ID);
 	zassert_equal(ret, PSA_SUCCESS);
 	ret = psa_get_key_attributes(ID, &retrieved_key_attributes);
diff --git a/tests/subsys/secure_storage/psa/crypto/testcase.yaml b/tests/subsys/secure_storage/psa/crypto/testcase.yaml
@@ -10,8 +10,5 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
   secure_storage.psa.crypto.tfm:
     filter: CONFIG_BUILD_WITH_TFM
-    extra_args:
-      - CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
-      - CONFIG_PSA_WANT_GENERATE_RANDOM=y
     integration_platforms:
       - nrf9151dk/nrf9151/ns
diff --git a/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf b/tests/subsys/secure_storage/psa/its/overlay-secure_storage.conf
@@ -2,7 +2,3 @@ CONFIG_ZTEST_STACK_SIZE=3072
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_SECURE_STORAGE=y
-
-# native_sim requires ECB cipher to be enabled
-CONFIG_PSA_WANT_ALG_ECB_NO_PADDING=y
-CONFIG_PSA_WANT_KEY_TYPE_AES=y
diff --git a/tests/subsys/secure_storage/psa/its/overlay-tfm.conf b/tests/subsys/secure_storage/psa/its/overlay-tfm.conf
@@ -1,3 +1,2 @@
 CONFIG_TFM_ITS_MAX_ASSET_SIZE_OVERRIDE=y
-CONFIG_TFM_ITS_MAX_ASSET_SIZE=512
-CONFIG_TFM_PROFILE_TYPE_MEDIUM=y
+CONFIG_TFM_ITS_MAX_ASSET_SIZE=256
diff --git a/tests/subsys/secure_storage/psa/its/prj.conf b/tests/subsys/secure_storage/psa/its/prj.conf
@@ -1,2 +1 @@
 CONFIG_ZTEST=y
-CONFIG_ZTEST_STACK_SIZE=3072

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`CONFIG_ZTEST=y`
`2`		`-CONFIG_ZTEST_STACK_SIZE=3072`