commit 4aa974f7c73a1012b85d7e47678177d3c793805c
author Gabor Mezei <gabor.mezei@arm.com> Wed Apr 23 17:04:18 2025 +0200
committer Gabor Mezei <gabor.mezei@arm.com> Tue Jun 03 17:49:23 2025 +0200
tree 4f264589206e03f0595a9983d38bd38f1f1c4df7
parent 591d854b1a695dfd817826fd534f53091f032789

Remove `MBEDTLS_SHA3_C` config option

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>

programs/test/selftest.c

diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 5157573..8516f3a 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -290,7 +290,10 @@
 #if defined(MBEDTLS_SHA512_C)
     { "sha512", mbedtls_sha512_self_test },
 #endif
-#if defined(MBEDTLS_SHA3_C)
+#if defined(PSA_WANT_ALG_SHA3_224) || \
+    defined(PSA_WANT_ALG_SHA3_256) || \
+    defined(PSA_WANT_ALG_SHA3_384) || \
+    defined(PSA_WANT_ALG_SHA3_512)
     { "sha3", mbedtls_sha3_self_test },
 #endif
 #if defined(MBEDTLS_DES_C)

tests/scripts/components-configuration-crypto.sh

diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index a06ef1d..16a399a 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -1557,7 +1557,7 @@
     scripts/config.py unset MBEDTLS_SHA256_C
     scripts/config.py unset MBEDTLS_SHA384_C
     scripts/config.py unset MBEDTLS_SHA512_C
-    scripts/config.py unset MBEDTLS_SHA3_C
+    scripts/config.py unset-all 'PSA_WANT_ALG_SHA3_*'
 
     # Build
     # -----
@@ -1597,7 +1597,7 @@
         scripts/config.py unset MBEDTLS_SHA384_C
         scripts/config.py unset MBEDTLS_SHA512_C
         scripts/config.py unset MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT
-        scripts/config.py unset MBEDTLS_SHA3_C
+        scripts/config.py unset-all 'PSA_WANT_ALG_SHA3_*'
     fi
 }
 
@@ -1680,6 +1680,7 @@
         # Disable also the builtin hashes since they are supported by the driver
         # and MD module is able to perform PSA dispathing.
         scripts/config.py unset-all MBEDTLS_SHA
+        scripts/config.py unset-all 'PSA_WANT_ALG_SHA3_*'
         scripts/config.py unset MBEDTLS_MD5_C
         scripts/config.py unset MBEDTLS_RIPEMD160_C
     fi

tests/scripts/depends.py

diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index cfd9f40..1386313 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -348,10 +348,6 @@
     'MBEDTLS_SHA512_C': ['MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT',
                          'MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY',
                          'PSA_WANT_ALG_SHA_512'],
-    'MBEDTLS_SHA3_C' : ['PSA_WANT_ALG_SHA3_224',
-                        'PSA_WANT_ALG_SHA3_256',
-                        'PSA_WANT_ALG_SHA3_384',
-                        'PSA_WANT_ALG_SHA3_512'],
     'PSA_WANT_ALG_ECB_NO_PADDING' : ['MBEDTLS_NIST_KW_C'],
 }