mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-08-05 19:35:48 +03:00
config_psa: moving PSA_WANT auto-enabling code
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
committed by
Manuel Pégourié-Gonnard
Manuel Pégourié-Gonnard
parent
e6f65a951f
commit
b2219f633d
@@ -28,100 +28,6 @@
|
|||||||
#ifndef MBEDTLS_CONFIG_ADJUST_LEGACY_FROM_PSA_H
|
#ifndef MBEDTLS_CONFIG_ADJUST_LEGACY_FROM_PSA_H
|
||||||
#define MBEDTLS_CONFIG_ADJUST_LEGACY_FROM_PSA_H
|
#define MBEDTLS_CONFIG_ADJUST_LEGACY_FROM_PSA_H
|
||||||
|
|
||||||
/* Ensure that the PSA's supported curves (PSA_WANT_ECC_xxx) are always a
|
|
||||||
* superset of the builtin ones (MBEDTLS_ECP_DP_xxx). */
|
|
||||||
#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
|
||||||
#define PSA_WANT_ECC_BRAINPOOL_P_R1_256
|
|
||||||
#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_256 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
|
|
||||||
#define PSA_WANT_ECC_BRAINPOOL_P_R1_384
|
|
||||||
#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_384 */
|
|
||||||
#endif /*MBEDTLS_ECP_DP_BP384R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
|
|
||||||
#define PSA_WANT_ECC_BRAINPOOL_P_R1_512
|
|
||||||
#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_512 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_MONTGOMERY_255)
|
|
||||||
#define PSA_WANT_ECC_MONTGOMERY_255
|
|
||||||
#endif /* PSA_WANT_ECC_MONTGOMERY_255 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_MONTGOMERY_448)
|
|
||||||
#define PSA_WANT_ECC_MONTGOMERY_448
|
|
||||||
#endif /* PSA_WANT_ECC_MONTGOMERY_448 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_R1_192)
|
|
||||||
#define PSA_WANT_ECC_SECP_R1_192
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_R1_192 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_R1_224)
|
|
||||||
#define PSA_WANT_ECC_SECP_R1_224
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_R1_224 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_R1_256)
|
|
||||||
#define PSA_WANT_ECC_SECP_R1_256
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_R1_256 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_R1_384)
|
|
||||||
#define PSA_WANT_ECC_SECP_R1_384
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_R1_384 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_R1_521)
|
|
||||||
#define PSA_WANT_ECC_SECP_R1_521
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_R1_521 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_K1_192)
|
|
||||||
#define PSA_WANT_ECC_SECP_K1_192
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_K1_192 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
|
|
||||||
|
|
||||||
/* SECP224K1 is buggy via the PSA API (https://github.com/Mbed-TLS/mbedtls/issues/3541) */
|
|
||||||
#if 0 && defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_K1_224)
|
|
||||||
#define PSA_WANT_ECC_SECP_K1_224
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_K1_224 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
|
|
||||||
#define MBEDTLS_SOME_BUILTIN_EC
|
|
||||||
#if !defined(PSA_WANT_ECC_SECP_K1_256)
|
|
||||||
#define PSA_WANT_ECC_SECP_K1_256
|
|
||||||
#endif /* PSA_WANT_ECC_SECP_K1_256 */
|
|
||||||
#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
|
|
||||||
|
|
||||||
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
||||||
#if !defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256)
|
#if !defined(MBEDTLS_PSA_ACCEL_ECC_BRAINPOOL_P_R1_256)
|
||||||
#define MBEDTLS_ECP_DP_BP256R1_ENABLED
|
#define MBEDTLS_ECP_DP_BP256R1_ENABLED
|
||||||
|
|||||||
@@ -70,4 +70,98 @@
|
|||||||
#define PSA_WANT_ALG_SHA3_512 1
|
#define PSA_WANT_ALG_SHA3_512 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Ensure that the PSA's supported curves (PSA_WANT_ECC_xxx) are always a
|
||||||
|
* superset of the builtin ones (MBEDTLS_ECP_DP_xxx). */
|
||||||
|
#if defined(MBEDTLS_ECP_DP_BP256R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256)
|
||||||
|
#define PSA_WANT_ECC_BRAINPOOL_P_R1_256
|
||||||
|
#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_256 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_BP256R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_BP384R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
|
||||||
|
#define PSA_WANT_ECC_BRAINPOOL_P_R1_384
|
||||||
|
#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_384 */
|
||||||
|
#endif /*MBEDTLS_ECP_DP_BP384R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512)
|
||||||
|
#define PSA_WANT_ECC_BRAINPOOL_P_R1_512
|
||||||
|
#endif /* PSA_WANT_ECC_BRAINPOOL_P_R1_512 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_MONTGOMERY_255)
|
||||||
|
#define PSA_WANT_ECC_MONTGOMERY_255
|
||||||
|
#endif /* PSA_WANT_ECC_MONTGOMERY_255 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_CURVE25519_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_MONTGOMERY_448)
|
||||||
|
#define PSA_WANT_ECC_MONTGOMERY_448
|
||||||
|
#endif /* PSA_WANT_ECC_MONTGOMERY_448 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_CURVE448_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_R1_192)
|
||||||
|
#define PSA_WANT_ECC_SECP_R1_192
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_R1_192 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_R1_224)
|
||||||
|
#define PSA_WANT_ECC_SECP_R1_224
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_R1_224 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP224R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_R1_256)
|
||||||
|
#define PSA_WANT_ECC_SECP_R1_256
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_R1_256 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP256R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_R1_384)
|
||||||
|
#define PSA_WANT_ECC_SECP_R1_384
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_R1_384 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP384R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_R1_521)
|
||||||
|
#define PSA_WANT_ECC_SECP_R1_521
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_R1_521 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_K1_192)
|
||||||
|
#define PSA_WANT_ECC_SECP_K1_192
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_K1_192 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
|
||||||
|
|
||||||
|
/* SECP224K1 is buggy via the PSA API (https://github.com/Mbed-TLS/mbedtls/issues/3541) */
|
||||||
|
#if 0 && defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_K1_224)
|
||||||
|
#define PSA_WANT_ECC_SECP_K1_224
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_K1_224 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
|
||||||
|
#define MBEDTLS_SOME_BUILTIN_EC
|
||||||
|
#if !defined(PSA_WANT_ECC_SECP_K1_256)
|
||||||
|
#define PSA_WANT_ECC_SECP_K1_256
|
||||||
|
#endif /* PSA_WANT_ECC_SECP_K1_256 */
|
||||||
|
#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
|
||||||
|
|
||||||
#endif /* MBEDTLS_CONFIG_ADJUST_PSA_SUPERSET_LEGACY_H */
|
#endif /* MBEDTLS_CONFIG_ADJUST_PSA_SUPERSET_LEGACY_H */
|
||||||
|
|||||||
Reference in New Issue
Block a user