Merge pull request #10539 from valeriosetti/issue10518

davidhorstmann-arm · web-flow · commit 216c1950f33c · 2025-12-15T10:26:57.000Z
Remove temporary fix for secp192 curves in `test_psa_crypto_without_heap`
diff --git a/framework b/framework
@@ -1 +1 @@
-Subproject commit f58263d00f287993d7ba4aeaef825385459fd02d
+Subproject commit 5ef7e74c537193912a31e1e03b56261116578896
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
@@ -92,13 +92,6 @@ component_test_psa_crypto_without_heap() {
     scripts/config.py unset-all "^PSA_WANT_ALG_RSA_"
     # EC-JPAKE use calloc/free in PSA core
     scripts/config.py unset PSA_WANT_ALG_JPAKE
-    # Curves p192[k|r]1 were disabled by default in TF-PSA-Crypto 1.0 so they
-    # were enabled here in order to get full test coverage. Support for these
-    # curves has completely been removed, but due to interdependency between
-    # CIs (mbedtls vs tf-psa-crypto) we still need to keep these lines here for
-    # a while. They will be removed in #10518
-    scripts/config.py set PSA_WANT_ECC_SECP_K1_192 || true
-    scripts/config.py set PSA_WANT_ECC_SECP_R1_192 || true
     scripts/config.py set TF_PSA_CRYPTO_ALLOW_REMOVED_MECHANISMS || true
 
     # Accelerate all PSA features (which are still enabled in CRYPTO_CONFIG_H).
diff --git a/tf-psa-crypto b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit cb9d0ed64831da3e7b85ea8741a57fdc27c010e6
+Subproject commit 85af1a8fdc7b1caa85d99380c1607c3ec11bf87d
