mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-17 20:42:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: add a companion test for another curve (x25519) and fix issues

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-03-24 16:51:17 +01:00
parent 1a6d96f59e
commit e4758aa34b
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/scripts/all.sh
View File

@ -2343,7 +2343,13 @@ component_test_psa_crypto_config_accel_ecc () {
make test make test
} }
component_test_psa_crypto_config_accel_all_curves_except_p192 () { # Helper function used in:
# - component_test_psa_crypto_config_accel_all_curves_except_p192
# - component_test_psa_crypto_config_accel_all_curves_except_x25519
# to build and test with all accelerated curves a part from the specified one.
psa_crypto_config_accel_all_curves_except_one () {
BUILTIN_CURVE=$1
msg "build: PSA_CRYPTO_CONFIG + all accelerated EC algs (excl secp192r1) + USE_PSA_CRYPTO" msg "build: PSA_CRYPTO_CONFIG + all accelerated EC algs (excl secp192r1) + USE_PSA_CRYPTO"
# Accelerate all EC algs (all EC curves are automatically accelerated as # Accelerate all EC algs (all EC curves are automatically accelerated as
@ -2402,9 +2408,7 @@ component_test_psa_crypto_config_accel_all_curves_except_p192 () {
# Explicitly disable all SW implementation for elliptic curves and enable # Explicitly disable all SW implementation for elliptic curves and enable
# their accelerated version (this excludes the built-in automatic inclusion # their accelerated version (this excludes the built-in automatic inclusion
# from "config_psa.h") # from "config_psa.h")
# Just leave SW implementation for the curve with the smallest bit size scripts/config.py unset MBEDTLS_ECP_DP_SECP192R1_ENABLED
# (MBEDTLS_ECP_DP_SECP192R1_ENABLED) for allowing to build with ECP_C.
# scripts/config.py unset MBEDTLS_ECP_DP_SECP192R1_ENABLED
scripts/config.py unset MBEDTLS_ECP_DP_SECP224R1_ENABLED scripts/config.py unset MBEDTLS_ECP_DP_SECP224R1_ENABLED
scripts/config.py unset MBEDTLS_ECP_DP_SECP256R1_ENABLED scripts/config.py unset MBEDTLS_ECP_DP_SECP256R1_ENABLED
scripts/config.py unset MBEDTLS_ECP_DP_SECP384R1_ENABLED scripts/config.py unset MBEDTLS_ECP_DP_SECP384R1_ENABLED
@ -2430,6 +2434,9 @@ component_test_psa_crypto_config_accel_all_curves_except_p192 () {
loc_accel_list="$loc_accel_list ECC_SECP_K1_224" loc_accel_list="$loc_accel_list ECC_SECP_K1_224"
loc_accel_list="$loc_accel_list ECC_SECP_R1_192" loc_accel_list="$loc_accel_list ECC_SECP_R1_192"
loc_accel_list="$loc_accel_list ECC_SECP_K1_192" loc_accel_list="$loc_accel_list ECC_SECP_K1_192"
# Just leave SW implementation for the curve with the smallest bit size
# (MBEDTLS_ECP_DP_SECP192R1_ENABLED) for allowing to build with ECP_C.
scripts/config.py set $BUILTIN_CURVE
# build and link with test drivers # build and link with test drivers
loc_accel_flags="$loc_accel_flags $( echo "$loc_accel_list" | sed 's/[^ ]* */-DMBEDTLS_PSA_ACCEL_&/g' )" loc_accel_flags="$loc_accel_flags $( echo "$loc_accel_list" | sed 's/[^ ]* */-DMBEDTLS_PSA_ACCEL_&/g' )"
@ -2439,6 +2446,13 @@ component_test_psa_crypto_config_accel_all_curves_except_p192 () {
not grep mbedtls_ecdh_ library/ecdh.o not grep mbedtls_ecdh_ library/ecdh.o
not grep mbedtls_ecdsa_ library/ecdsa.o not grep mbedtls_ecdsa_ library/ecdsa.o
not grep mbedtls_ecjpake_ library/ecjpake.o not grep mbedtls_ecjpake_ library/ecjpake.o
if [ $BUILTIN_CURVE == "MBEDTLS_ECP_DP_SECP192R1_ENABLED" ]; then
# The only built-in curve is Short Weierstrass, so ECP shouldn't have support for Montgomery curves.
# Functions with mxz in their name are specific to Montgomery curves.
not grep mxz library/ecp.o
else
not grep mbedtls_ecp_muladd library/ecp.o
fi
# Run the tests # Run the tests
# ------------- # -------------
@ -2446,6 +2460,14 @@ component_test_psa_crypto_config_accel_all_curves_except_p192 () {
make test make test
} }
component_test_psa_crypto_config_accel_all_curves_except_p192 () {
psa_crypto_config_accel_all_curves_except_one MBEDTLS_ECP_DP_SECP192R1_ENABLED
}
component_test_psa_crypto_config_accel_all_curves_except_x25519 () {
psa_crypto_config_accel_all_curves_except_one MBEDTLS_ECP_DP_CURVE25519_ENABLED
}
component_test_psa_crypto_config_accel_rsa_signature () { component_test_psa_crypto_config_accel_rsa_signature () {
msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated RSA signature" msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated RSA signature"

2
tests/suites/test_suite_ecp.function
View File

@ -1301,7 +1301,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS */ /* BEGIN_CASE depends_on:MBEDTLS_TEST_HOOKS:MBEDTLS_ECP_DP_SECP192R1_ENABLED */
void ecp_mod_p192_raw(char *input_N, void ecp_mod_p192_raw(char *input_N,
char *input_X, char *input_X,
char *result) char *result)