From dbd0f424b0d2f91a8432ac1cc22335fd93d7436b Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Sat, 14 Sep 2024 11:27:44 +0200
Subject: [PATCH] Move config-symmetric-only.h testing to separate all.sh
components
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
.../components-configuration-crypto.sh | 40 +++++++++++++++++++
tests/scripts/test-ref-configs.pl | 2 -
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index 83188aed10..15b0f397d1 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -535,6 +535,46 @@ component_test_full_no_ccm_star_no_tag () {
make test
}
+component_test_config_symmetric_only_legacy () {
+ msg "build: configs/config-symmetric-only.h"
+ cp configs/config-symmetric-only.h "$CONFIG_H"
+ # test-ref-configs works by overwriting mbedtls_config.h; this makes cmake
+ # want to re-generate generated files that depend on it, quite correctly.
+ # However this doesn't work as the generation script expects a specific
+ # format for mbedtls_config.h, which the other files don't follow. Also,
+ # cmake can't know this, but re-generation is actually not necessary as
+ # the generated files only depend on the list of available options, not
+ # whether they're on or off. So, disable cmake's (over-sensitive here)
+ # dependency resolution for generated files and just rely on them being
+ # present (thanks to pre_generate_files) by turning GEN_FILES off.
+ CC=$ASAN_CC cmake -D GEN_FILES=Off -D CMAKE_BUILD_TYPE:String=Asan .
+ make
+
+ msg "test: configs/config-symmetric-only.h - unit tests"
+ make test
+}
+
+component_test_config_symmetric_only_psa () {
+ msg "build: configs/config-symmetric-only.h + USE_PSA_CRYPTO"
+ cp configs/config-symmetric-only.h "$CONFIG_H"
+ scripts/config.py set MBEDTLS_PSA_CRYPTO_C
+ scripts/config.py set MBEDTLS_USE_PSA_CRYPTO
+ # test-ref-configs works by overwriting mbedtls_config.h; this makes cmake
+ # want to re-generate generated files that depend on it, quite correctly.
+ # However this doesn't work as the generation script expects a specific
+ # format for mbedtls_config.h, which the other files don't follow. Also,
+ # cmake can't know this, but re-generation is actually not necessary as
+ # the generated files only depend on the list of available options, not
+ # whether they're on or off. So, disable cmake's (over-sensitive here)
+ # dependency resolution for generated files and just rely on them being
+ # present (thanks to pre_generate_files) by turning GEN_FILES off.
+ CC=$ASAN_CC cmake -D GEN_FILES=Off -D CMAKE_BUILD_TYPE:String=Asan .
+ make
+
+ msg "test: configs/config-symmetric-only.h + USE_PSA_CRYPTO - unit tests"
+ make test
+}
+
component_test_full_no_bignum () {
msg "build: full minus bignum"
scripts/config.py full
diff --git a/tests/scripts/test-ref-configs.pl b/tests/scripts/test-ref-configs.pl
index 269fb2130e..e6a499da9b 100755
--- a/tests/scripts/test-ref-configs.pl
+++ b/tests/scripts/test-ref-configs.pl
@@ -16,8 +16,6 @@ use warnings;
use strict;
my %configs = (
- 'config-symmetric-only.h' => {
- },
'config-tfm.h' => {
},
);