commit 84f4ff1dd3cbc2903b793bd647cb5a6fc6935ba7
author Przemek Stekiel <przemyslaw.stekiel@mobica.com> Tue Jul 04 12:35:31 2023 +0200
committer Przemek Stekiel <przemyslaw.stekiel@mobica.com> Wed Jul 05 09:12:08 2023 +0200
tree f817c1f32da230871cb5dd6ada7203a900f36817
parent 85b644262d80a2ecfaf4be00232769d9093f8861

Minor adaptations after ffdh was enabled for tls1.3

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index d7875ce..703594c 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -2254,9 +2254,6 @@
 component_test_psa_crypto_config_accel_ffdh () {
     msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH"
 
-    # Start with full
-    scripts/config.py full
-
     # Algorithms and key types to accelerate
     loc_accel_list="ALG_FFDH KEY_TYPE_DH_KEY_PAIR KEY_TYPE_DH_PUBLIC_KEY"
 
@@ -2264,7 +2261,7 @@
     # ---------
 
     # Start from default config (no TLS 1.3, no USE_PSA)
-    helper_libtestdriver1_adjust_config "default"
+    helper_libtestdriver1_adjust_config "full"
 
     # Disable the module that's accelerated
     scripts/config.py unset MBEDTLS_DHM_C
@@ -2288,6 +2285,9 @@
 
     msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH"
     make test
+
+    msg "ssl-opt: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH alg"
+    tests/ssl-opt.sh -f "ffdh"
 }
 
 component_test_psa_crypto_config_reference_ffdh () {
@@ -2307,7 +2307,7 @@
     # Disable things that are not supported
     scripts/config.py unset MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
     scripts/config.py unset MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
-    scripts/config.py unset MBEDTLS_DHM_C
+    scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C
 
     make
 
@@ -2315,7 +2315,7 @@
     make test
 
     msg "ssl-opt: MBEDTLS_PSA_CRYPTO_CONFIG with non-accelerated FFDH alg + USE_PSA"
-    tests/ssl-opt.sh -f "FFDH"
+    tests/ssl-opt.sh -f "ffdh"
 }
 
 component_test_psa_crypto_config_accel_pake() {

tests/scripts/analyze_outcomes.py

diff --git a/tests/scripts/analyze_outcomes.py b/tests/scripts/analyze_outcomes.py
index 4a8ddf5..2fca751 100755
--- a/tests/scripts/analyze_outcomes.py
+++ b/tests/scripts/analyze_outcomes.py
@@ -333,10 +333,8 @@
         'args': {
             'component_ref': 'test_psa_crypto_config_reference_ffdh',
             'component_driver': 'test_psa_crypto_config_accel_ffdh',
-            'ignored_suites': [
-            ],
-            'ignored_tests': {
-            }
+            'ignored_suites': ['dhm'],
+            'ignored_tests': {'test_suite_pkparse': ['DH group family: RFC 7919']}
         }
     },
 }