mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-29 11:41:15 +03:00
Correct use of MBEDTLS_PSA_BUILTIN_ALG_xxx in crypto library
The psa crypto library was generically using PSA_WANT_ALG_xxx, but should have been using the correct MBEDTLS_PSA_BUILTIN_ALG_xxx definition since that code is the builtin version. There were also a couple of spots that needed to ensure the code block was enabled for either ECDSA or DETERMINISTIC_ECDSA, not just one of them. Fixed all the new ALG_ECDSA_DETERMINISTIC names to be ALG_DETERMINISTIC_ECDSA instead. Fixed test to use correct definitions. Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
This commit is contained in:
@ -47,11 +47,11 @@ extern "C" {
|
||||
#endif /* !MBEDTLS_PSA_ACCEL_ALG_ECDSA */
|
||||
#endif /* PSA_WANT_ALG_ECDSA */
|
||||
|
||||
#if defined(PSA_WANT_ALG_ECDSA_DETERMINISTIC)
|
||||
#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
|
||||
#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA_DETERMINISTIC 1
|
||||
#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
|
||||
#if !defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA)
|
||||
#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA 1
|
||||
#define MBEDTLS_ECDSA_DETERMINISTIC
|
||||
#endif /* MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC */
|
||||
#endif /* MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA */
|
||||
#endif /* PSA_WANT_ALG_DETERMINISTIC_ECDSA */
|
||||
|
||||
#else /* MBEDTLS_PSA_CRYPTO_CONFIG */
|
||||
@ -61,11 +61,11 @@ extern "C" {
|
||||
* is not defined
|
||||
*/
|
||||
#if defined(MBEDTLS_ECDSA_C)
|
||||
#define PSA_WANT_ALG_ECDSA
|
||||
#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA
|
||||
#endif /* MBEDTLS_ECDSA_C */
|
||||
|
||||
#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
|
||||
#define PSA_WANT_ALG_ECDSA_DETERMINISTIC
|
||||
#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA
|
||||
#endif /* MBEDTLS_ECDSA_DETERMINISTIC */
|
||||
|
||||
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
|
||||
|
@ -50,7 +50,7 @@
|
||||
#ifndef PSA_CRYPTO_CONFIG_H
|
||||
#define PSA_CRYPTO_CONFIG_H
|
||||
|
||||
#define PSA_WANT_ALG_ECDSA 1
|
||||
#define PSA_WANT_ALG_ECDSA_DETERMINISTIC 1
|
||||
#define PSA_WANT_ALG_ECDSA 1
|
||||
#define PSA_WANT_ALG_DETERMINISTIC_ECDSA 1
|
||||
|
||||
#endif /* PSA_CRYPTO_CONFIG_H */
|
||||
|
Reference in New Issue
Block a user