psa: config: Add MBEDTLS_PSA_CRYPTO_SPM
We failed check-names.sh due to using a define which wasn't described or defined anywhere. Even though we won't realistically enable MBEDTLS_PSA_CRYPTO_SPM via the configuration system (and will do it from PSA Crypto SPM tooling instead), add a description of the configuration to config.h as good practice. Exclude MBEDTLS_PSA_CRYPTO_SPM from the "full" configuration as well.
This commit is contained in:
parent
b4fa8c9c6d
commit
67a9351bc5
5 changed files with 36 additions and 0 deletions
|
@ -696,6 +696,20 @@
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PKCS1_V21
|
#define MBEDTLS_PKCS1_V21
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \def MBEDTLS_PSA_CRYPTO_SPM
|
||||||
|
*
|
||||||
|
* When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
|
||||||
|
* Partition Manager) integration which separates the code into two parts: a
|
||||||
|
* NSPE (Non-Secure Process Environment) and an SPE (Secure Process
|
||||||
|
* Environment).
|
||||||
|
*
|
||||||
|
* Module: library/psa_crypto.c
|
||||||
|
* Requires: MBEDTLS_PSA_CRYPTO_C
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
//#define MBEDTLS_PSA_CRYPTO_SPM
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \def MBEDTLS_RSA_NO_CRT
|
* \def MBEDTLS_RSA_NO_CRT
|
||||||
*
|
*
|
||||||
|
|
|
@ -492,6 +492,10 @@
|
||||||
#error "MBEDTLS_PSA_CRYPTO_C defined, but not all prerequisites"
|
#error "MBEDTLS_PSA_CRYPTO_C defined, but not all prerequisites"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_PSA_CRYPTO_SPM) && !defined(MBEDTLS_PSA_CRYPTO_C)
|
||||||
|
#error "MBEDTLS_PSA_CRYPTO_SPM defined, but not all prerequisites"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_RSA_C) && ( !defined(MBEDTLS_BIGNUM_C) || \
|
#if defined(MBEDTLS_RSA_C) && ( !defined(MBEDTLS_BIGNUM_C) || \
|
||||||
!defined(MBEDTLS_OID_C) )
|
!defined(MBEDTLS_OID_C) )
|
||||||
#error "MBEDTLS_RSA_C defined, but not all prerequisites"
|
#error "MBEDTLS_RSA_C defined, but not all prerequisites"
|
||||||
|
|
|
@ -1126,6 +1126,20 @@
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PKCS1_V21
|
#define MBEDTLS_PKCS1_V21
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \def MBEDTLS_PSA_CRYPTO_SPM
|
||||||
|
*
|
||||||
|
* When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
|
||||||
|
* Partition Manager) integration which separates the code into two parts: a
|
||||||
|
* NSPE (Non-Secure Process Environment) and an SPE (Secure Process
|
||||||
|
* Environment).
|
||||||
|
*
|
||||||
|
* Module: library/psa_crypto.c
|
||||||
|
* Requires: MBEDTLS_PSA_CRYPTO_C
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
//#define MBEDTLS_PSA_CRYPTO_SPM
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \def MBEDTLS_RSA_NO_CRT
|
* \def MBEDTLS_RSA_NO_CRT
|
||||||
*
|
*
|
||||||
|
|
|
@ -414,6 +414,9 @@ static const char *features[] = {
|
||||||
#if defined(MBEDTLS_PKCS1_V21)
|
#if defined(MBEDTLS_PKCS1_V21)
|
||||||
"MBEDTLS_PKCS1_V21",
|
"MBEDTLS_PKCS1_V21",
|
||||||
#endif /* MBEDTLS_PKCS1_V21 */
|
#endif /* MBEDTLS_PKCS1_V21 */
|
||||||
|
#if defined(MBEDTLS_PSA_CRYPTO_SPM)
|
||||||
|
"MBEDTLS_PSA_CRYPTO_SPM",
|
||||||
|
#endif /* MBEDTLS_PSA_CRYPTO_SPM */
|
||||||
#if defined(MBEDTLS_RSA_NO_CRT)
|
#if defined(MBEDTLS_RSA_NO_CRT)
|
||||||
"MBEDTLS_RSA_NO_CRT",
|
"MBEDTLS_RSA_NO_CRT",
|
||||||
#endif /* MBEDTLS_RSA_NO_CRT */
|
#endif /* MBEDTLS_RSA_NO_CRT */
|
||||||
|
|
|
@ -96,6 +96,7 @@ MBEDTLS_ZLIB_SUPPORT
|
||||||
MBEDTLS_PKCS11_C
|
MBEDTLS_PKCS11_C
|
||||||
MBEDTLS_NO_UDBL_DIVISION
|
MBEDTLS_NO_UDBL_DIVISION
|
||||||
MBEDTLS_NO_64BIT_MULTIPLICATION
|
MBEDTLS_NO_64BIT_MULTIPLICATION
|
||||||
|
MBEDTLS_PSA_CRYPTO_SPM
|
||||||
_ALT\s*$
|
_ALT\s*$
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue