yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor adaptations after ffdh was enabled for tls1.3

Browse source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-07-04 12:35:31 +02:00
parent 85b644262d
commit 84f4ff1dd3
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/scripts/all.sh
View file

@ -2254,9 +2254,6 @@ component_test_psa_crypto_config_accel_ecdh () {
component_test_psa_crypto_config_accel_ffdh () { component_test_psa_crypto_config_accel_ffdh () {
msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH" msg "build: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH"
# Start with full
scripts/config.py full
# Algorithms and key types to accelerate # Algorithms and key types to accelerate
loc_accel_list="ALG_FFDH KEY_TYPE_DH_KEY_PAIR KEY_TYPE_DH_PUBLIC_KEY" loc_accel_list="ALG_FFDH KEY_TYPE_DH_KEY_PAIR KEY_TYPE_DH_PUBLIC_KEY"
@ -2264,7 +2261,7 @@ component_test_psa_crypto_config_accel_ffdh () {
# --------- # ---------
# Start from default config (no TLS 1.3, no USE_PSA) # 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 # Disable the module that's accelerated
scripts/config.py unset MBEDTLS_DHM_C scripts/config.py unset MBEDTLS_DHM_C
@ -2288,6 +2285,9 @@ component_test_psa_crypto_config_accel_ffdh () {
msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH" msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated FFDH"
make test 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 () { component_test_psa_crypto_config_reference_ffdh () {
@ -2307,7 +2307,7 @@ component_test_psa_crypto_config_reference_ffdh () {
# Disable things that are not supported # Disable things that are not supported
scripts/config.py unset MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED 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_KEY_EXCHANGE_DHE_RSA_ENABLED
scripts/config.py unset MBEDTLS_DHM_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C
make make
@ -2315,7 +2315,7 @@ component_test_psa_crypto_config_reference_ffdh () {
make test make test
msg "ssl-opt: MBEDTLS_PSA_CRYPTO_CONFIG with non-accelerated FFDH alg + USE_PSA" 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() { component_test_psa_crypto_config_accel_pake() {

6
tests/scripts/analyze_outcomes.py
View file

@ -333,10 +333,8 @@ TASKS = {
'args': { 'args': {
'component_ref': 'test_psa_crypto_config_reference_ffdh', 'component_ref': 'test_psa_crypto_config_reference_ffdh',
'component_driver': 'test_psa_crypto_config_accel_ffdh', 'component_driver': 'test_psa_crypto_config_accel_ffdh',
'ignored_suites': [ 'ignored_suites': ['dhm'],
], 'ignored_tests': {'test_suite_pkparse': ['DH group family: RFC 7919']}
'ignored_tests': {
}
} }
}, },
} }

2
tests/suites/test_suite_psa_crypto_metadata.function
View file

@ -699,7 +699,7 @@ void ecc_key_family(int curve_arg)
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_DHM_C */ /* BEGIN_CASE depends_on:PSA_KEY_TYPE_DH_PUBLIC_KEY:PSA_KEY_TYPE_DH_KEY_PAIR */
void dh_key_family(int group_arg) void dh_key_family(int group_arg)
{ {
psa_dh_family_t group = group_arg; psa_dh_family_t group = group_arg;