mirror of
https://github.com/ARMmbed/mbedtls.git
synced 2025-05-12 09:54:38 +08:00
Merge pull request #8443 from valeriosetti/issue8274
Clean up curves handling in libtestdriver1 config
This commit is contained in:
Gilles Peskine
GitHub
commit
e9f50bf161
@ -64,6 +64,110 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_384)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_384
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_384 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_512)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_512
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_512 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_MONTGOMERY_255)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_255)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_255
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_255 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_MONTGOMERY_448)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_448)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_448
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_448 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_K1_192)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_192)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_K1_192
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_K1_192 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_K1_224)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_224)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_K1_224
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_K1_224 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_K1_256)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_R1_192)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_192)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_R1_192
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_192 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_R1_224)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_224)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_R1_224
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_224 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_R1_256)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_256)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_R1_256
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_256 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_R1_384)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_384)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_R1_384
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_384 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PSA_WANT_ECC_SECP_R1_521)
|
||||||
|
#if defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_521)
|
||||||
|
#undef MBEDTLS_PSA_ACCEL_ECC_SECP_R1_521
|
||||||
|
#else
|
||||||
|
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_521 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
|
#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
|
||||||
#if defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA)
|
#if defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA)
|
||||||
#undef MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA
|
#undef MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA
|
||||||
@ -427,24 +531,6 @@
|
|||||||
#define MBEDTLS_PSA_ACCEL_ALG_RSA_OAEP 1
|
#define MBEDTLS_PSA_ACCEL_ALG_RSA_OAEP 1
|
||||||
#define MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_CRYPT 1
|
#define MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_CRYPT 1
|
||||||
|
|
||||||
#if defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) && \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_ALG_ECDH) && \
|
|
||||||
defined(MBEDTLS_PSA_ACCEL_ALG_JPAKE)
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_384 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_512 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_255 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_MONTGOMERY_448 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_K1_192 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_K1_224 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_192 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_224 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_256 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_384 1
|
|
||||||
#define MBEDTLS_PSA_ACCEL_ECC_SECP_R1_521 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MBEDTLS_PSA_ACCEL_KEY_TYPE_DERIVE 1
|
#define MBEDTLS_PSA_ACCEL_KEY_TYPE_DERIVE 1
|
||||||
#define MBEDTLS_PSA_ACCEL_KEY_TYPE_HMAC 1
|
#define MBEDTLS_PSA_ACCEL_KEY_TYPE_HMAC 1
|
||||||
#define MBEDTLS_PSA_ACCEL_KEY_TYPE_DES 1
|
#define MBEDTLS_PSA_ACCEL_KEY_TYPE_DES 1
|
||||||
|
|||||||
@ -2351,12 +2351,8 @@ component_test_psa_crypto_config_accel_ecdsa () {
|
|||||||
|
|
||||||
# Algorithms and key types to accelerate
|
# Algorithms and key types to accelerate
|
||||||
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Note: Those are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
@ -2381,7 +2377,7 @@ component_test_psa_crypto_config_accel_ecdsa () {
|
|||||||
|
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# Make sure this was not re-enabled by accident (additive config)
|
# Make sure this was not re-enabled by accident (additive config)
|
||||||
not grep mbedtls_ecdsa_ library/ecdsa.o
|
not grep mbedtls_ecdsa_ library/ecdsa.o
|
||||||
@ -2398,12 +2394,8 @@ component_test_psa_crypto_config_accel_ecdh () {
|
|||||||
|
|
||||||
# Algorithms and key types to accelerate
|
# Algorithms and key types to accelerate
|
||||||
loc_accel_list="ALG_ECDH \
|
loc_accel_list="ALG_ECDH \
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Note: Those are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
@ -2426,7 +2418,7 @@ component_test_psa_crypto_config_accel_ecdh () {
|
|||||||
|
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# Make sure this was not re-enabled by accident (additive config)
|
# Make sure this was not re-enabled by accident (additive config)
|
||||||
not grep mbedtls_ecdh_ library/ecdh.o
|
not grep mbedtls_ecdh_ library/ecdh.o
|
||||||
@ -2500,12 +2492,8 @@ component_test_psa_crypto_config_accel_pake() {
|
|||||||
msg "build: full with accelerated PAKE"
|
msg "build: full with accelerated PAKE"
|
||||||
|
|
||||||
loc_accel_list="ALG_JPAKE \
|
loc_accel_list="ALG_JPAKE \
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Note: Those are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
@ -2521,7 +2509,7 @@ component_test_psa_crypto_config_accel_pake() {
|
|||||||
|
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# Make sure this was not re-enabled by accident (additive config)
|
# Make sure this was not re-enabled by accident (additive config)
|
||||||
not grep mbedtls_ecjpake_init library/ecjpake.o
|
not grep mbedtls_ecjpake_init library/ecjpake.o
|
||||||
@ -2544,12 +2532,8 @@ component_test_psa_crypto_config_accel_ecc_some_key_types () {
|
|||||||
KEY_TYPE_ECC_PUBLIC_KEY \
|
KEY_TYPE_ECC_PUBLIC_KEY \
|
||||||
KEY_TYPE_ECC_KEY_PAIR_BASIC \
|
KEY_TYPE_ECC_KEY_PAIR_BASIC \
|
||||||
KEY_TYPE_ECC_KEY_PAIR_IMPORT \
|
KEY_TYPE_ECC_KEY_PAIR_IMPORT \
|
||||||
KEY_TYPE_ECC_KEY_PAIR_EXPORT"
|
KEY_TYPE_ECC_KEY_PAIR_EXPORT \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Note: Curves are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
@ -2582,7 +2566,7 @@ component_test_psa_crypto_config_accel_ecc_some_key_types () {
|
|||||||
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
|
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# ECP should be re-enabled but not the others
|
# ECP should be re-enabled but not the others
|
||||||
not grep mbedtls_ecdh_ library/ecdh.o
|
not grep mbedtls_ecdh_ library/ecdh.o
|
||||||
@ -2611,12 +2595,6 @@ common_test_psa_crypto_config_accel_ecc_some_curves () {
|
|||||||
|
|
||||||
msg "build: crypto_full minus PK with accelerated EC algs and $desc curves"
|
msg "build: crypto_full minus PK with accelerated EC algs and $desc curves"
|
||||||
|
|
||||||
# Algorithms and key types to accelerate
|
|
||||||
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
|
||||||
ALG_ECDH \
|
|
||||||
ALG_JPAKE \
|
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
|
||||||
|
|
||||||
# Note: Curves are handled in a special way by the libtestdriver machinery,
|
# Note: Curves are handled in a special way by the libtestdriver machinery,
|
||||||
# so we only want to include them in the accel list when building the main
|
# so we only want to include them in the accel list when building the main
|
||||||
# libraries, hence the use of a separate variable.
|
# libraries, hence the use of a separate variable.
|
||||||
@ -2640,6 +2618,13 @@ common_test_psa_crypto_config_accel_ecc_some_curves () {
|
|||||||
loc_curve_list=$loc_non_weierstrass_list
|
loc_curve_list=$loc_non_weierstrass_list
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Algorithms and key types to accelerate
|
||||||
|
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
||||||
|
ALG_ECDH \
|
||||||
|
ALG_JPAKE \
|
||||||
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$loc_curve_list"
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
|
|
||||||
@ -2681,7 +2666,7 @@ common_test_psa_crypto_config_accel_ecc_some_curves () {
|
|||||||
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
|
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# We expect ECDH to be re-enabled for the missing curves
|
# We expect ECDH to be re-enabled for the missing curves
|
||||||
grep mbedtls_ecdh_ library/ecdh.o
|
grep mbedtls_ecdh_ library/ecdh.o
|
||||||
@ -2759,12 +2744,8 @@ component_test_psa_crypto_config_accel_ecc_ecp_light_only () {
|
|||||||
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
||||||
ALG_ECDH \
|
ALG_ECDH \
|
||||||
ALG_JPAKE \
|
ALG_JPAKE \
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Note: Those are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
@ -2784,7 +2765,7 @@ component_test_psa_crypto_config_accel_ecc_ecp_light_only () {
|
|||||||
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
|
ALG_SHA3_224 ALG_SHA3_256 ALG_SHA3_384 ALG_SHA3_512"
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# Make sure any built-in EC alg was not re-enabled by accident (additive config)
|
# Make sure any built-in EC alg was not re-enabled by accident (additive config)
|
||||||
not grep mbedtls_ecdsa_ library/ecdsa.o
|
not grep mbedtls_ecdsa_ library/ecdsa.o
|
||||||
@ -2867,12 +2848,8 @@ component_test_psa_crypto_config_accel_ecc_no_ecp_at_all () {
|
|||||||
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
||||||
ALG_ECDH \
|
ALG_ECDH \
|
||||||
ALG_JPAKE \
|
ALG_JPAKE \
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Note: Those are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
@ -2892,7 +2869,7 @@ component_test_psa_crypto_config_accel_ecc_no_ecp_at_all () {
|
|||||||
|
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# Make sure any built-in EC alg was not re-enabled by accident (additive config)
|
# Make sure any built-in EC alg was not re-enabled by accident (additive config)
|
||||||
not grep mbedtls_ecdsa_ library/ecdsa.o
|
not grep mbedtls_ecdsa_ library/ecdsa.o
|
||||||
@ -3038,7 +3015,8 @@ common_test_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
|
|||||||
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
loc_accel_list="ALG_ECDSA ALG_DETERMINISTIC_ECDSA \
|
||||||
ALG_ECDH \
|
ALG_ECDH \
|
||||||
ALG_JPAKE \
|
ALG_JPAKE \
|
||||||
$(helper_get_psa_key_type_list "ECC")"
|
$(helper_get_psa_key_type_list "ECC") \
|
||||||
|
$(helper_get_psa_curve_list)"
|
||||||
# Optionally we can also add DH to the list of accelerated items
|
# Optionally we can also add DH to the list of accelerated items
|
||||||
if [ "$test_target" = "ECC_DH" ]; then
|
if [ "$test_target" = "ECC_DH" ]; then
|
||||||
loc_accel_list="$loc_accel_list \
|
loc_accel_list="$loc_accel_list \
|
||||||
@ -3046,11 +3024,6 @@ common_test_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
|
|||||||
$(helper_get_psa_key_type_list "DH")"
|
$(helper_get_psa_key_type_list "DH")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Note: Those are handled in a special way by the libtestdriver machinery,
|
|
||||||
# so we only want to include them in the accel list when building the main
|
|
||||||
# libraries, hence the use of a separate variable.
|
|
||||||
loc_curve_list="$(helper_get_psa_curve_list)"
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
# ---------
|
# ---------
|
||||||
|
|
||||||
@ -3069,7 +3042,7 @@ common_test_psa_crypto_config_accel_ecc_ffdh_no_bignum () {
|
|||||||
|
|
||||||
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
helper_libtestdriver1_make_drivers "$loc_accel_list" "$loc_extra_list"
|
||||||
|
|
||||||
helper_libtestdriver1_make_main "$loc_accel_list $loc_curve_list"
|
helper_libtestdriver1_make_main "$loc_accel_list"
|
||||||
|
|
||||||
# Make sure any built-in EC alg was not re-enabled by accident (additive config)
|
# Make sure any built-in EC alg was not re-enabled by accident (additive config)
|
||||||
not grep mbedtls_ecdsa_ library/ecdsa.o
|
not grep mbedtls_ecdsa_ library/ecdsa.o
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user