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

test: use full config as test starting point and solve issues

Browse source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-03-24 14:10:24 +01:00
parent 659aa686c8
commit 1a6d96f59e
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mbedtls/check_config.h
View file

@ -370,7 +370,8 @@
#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) && \ #if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) && \
( !defined(MBEDTLS_PK_HAVE_JPAKE) || \ ( !defined(MBEDTLS_PK_HAVE_JPAKE) || \
!defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) ) !(defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) || \
defined(PSA_WANT_ECC_SECP_R1_256) ) )
#error "MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED defined, but not all prerequisites" #error "MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED defined, but not all prerequisites"
#endif #endif

12
tests/scripts/all.sh
View file

@ -2373,10 +2373,16 @@ component_test_psa_crypto_config_accel_all_curves_except_p192 () {
# Configure and build the main libraries # Configure and build the main libraries
# --------------------------------------- # ---------------------------------------
# start with default + driver support + USE_PSA_CRYPTO # full config + USE_PSA_CRYPTO
scripts/config.py set MBEDTLS_PSA_CRYPTO_DRIVERS scripts/config.py full
scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG
scripts/config.py set MBEDTLS_USE_PSA_CRYPTO
# Dynamic secure element support is a deprecated feature and needs to be disabled here.
# This is done to have the same form of psa_key_attributes_s for libdriver and library.
scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C
# restartable is not yet supported in PSA
scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
# disable modules for which we have drivers # disable modules for which we have drivers
scripts/config.py unset MBEDTLS_ECDSA_C scripts/config.py unset MBEDTLS_ECDSA_C

6
tests/suites/test_suite_ecp.function
View file

@ -1344,7 +1344,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS */ /* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_ECP_DP_SECP224R1_ENABLED */
void ecp_mod_p224_raw(char *input_N, void ecp_mod_p224_raw(char *input_N,
char *input_X, char *input_X,
char *result) char *result)
@ -1387,7 +1387,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS */ /* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_ECP_DP_SECP256R1_ENABLED */
void ecp_mod_p256_raw(char *input_N, void ecp_mod_p256_raw(char *input_N,
char *input_X, char *input_X,
char *result) char *result)
@ -1473,7 +1473,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS */ /* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_ECP_DP_SECP521R1_ENABLED */
void ecp_mod_p521_raw(char *input_N, void ecp_mod_p521_raw(char *input_N,
char *input_X, char *input_X,
char *result) char *result)