yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-25 14:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update how MBEDTLS_PSA_CRYPTO_CONFIG is handled

Browse source 
Originally, MBEDTLS_PSA_CRYPTO_CONFIG was being used to allow
inclusion of mbedlts/config_psa.h, but that needed to be updated
so that mbedtls/config_psa.h is always included and the definitions
specific to PSA configuration are now guarded by
MBEDTLS_PSA_CRYPTO_CONFIG. This will allow for the standard setup
to continue working while new PSA configuration items to also work.

Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>
This commit is contained in:
John Durkop 2020-09-24 04:30:10 -07:00
parent d8959390c5
commit 2dfaf9ca23
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mbedtls/config.h
View file

@ -3824,10 +3824,7 @@
* \name SECTION: PSA Crypto settings * \name SECTION: PSA Crypto settings
* *
*/ */
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
#include "mbedtls/config_psa.h" #include "mbedtls/config_psa.h"
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
#include "mbedtls/check_config.h" #include "mbedtls/check_config.h"

23
include/mbedtls/config_psa.h
View file

@ -32,22 +32,25 @@
extern "C" { extern "C" {
#endif #endif
//#define PSA_WANT_ALG_ECDSA #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
//#define MBEDTLS_PSA_ACCEL_ALG_ECDSA
//#define PSA_WANT_ALG_ECDSA_DETERMINISTIC
//#define MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC
#if defined(PSA_WANT_ALG_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) #if defined(PSA_WANT_ALG_ECDSA)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)
#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA #define MBEDTLS_PSA_BUILTIN_ALG_ECDSA
#else /* defined(PSA_WANT_ALG_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)*/ #else /* !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) */
#define MBEDTLS_ECDSA_C #define MBEDTLS_ECDSA_C
#endif /* defined(PSA_WANT_ALG_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA)*/ #endif /* !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) */
#endif /* defined(PSA_WANT_ALG_ECDSA) */
#if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) #if defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA #define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA
#else /* defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */ #else /* && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */
#define MBEDTLS_ECDSA_DETERMINISTIC #define MBEDTLS_ECDSA_DETERMINISTIC
#endif /* defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) && !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */ #endif /* !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC) */
#endif /* defined(PSA_WANT_ALG_DETERMINISTIC_ECDSA) */
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
#ifdef __cplusplus #ifdef __cplusplus
} }

7
include/psa/crypto_config.h
View file

@ -30,6 +30,13 @@
extern "C" { extern "C" {
#endif #endif
#define PSA_WANT_ALG_ECDSA
#define PSA_WANT_ALG_ECDSA_DETERMINISTIC
//#define MBEDTLS_PSA_ACCEL_ALG_ECDSA
//#define MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif