|
1 | 1 | diff --git a/components/mbedtls/mbedtls/include/mbedtls/check_config.h b/components/mbedtls/mbedtls/include/mbedtls/check_config.h
|
| 2 | +index b3c038dd2e93..34cabd1f9463 100644 |
2 | 3 | --- a/components/mbedtls/mbedtls/include/mbedtls/check_config.h
|
3 | 4 | +++ b/components/mbedtls/mbedtls/include/mbedtls/check_config.h
|
4 |
| -@@ -142,7 +142,6 @@ |
5 |
| - ( !defined(MBEDTLS_ECP_C) || \ |
6 |
| - !( defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) || \ |
7 |
| - defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) || \ |
| 5 | +@@ -138,24 +138,6 @@ |
| 6 | + #error "MBEDTLS_ECDH_C defined, but not all prerequisites" |
| 7 | + #endif |
| 8 | + |
| 9 | +-#if defined(MBEDTLS_ECDSA_C) && \ |
| 10 | +- ( !defined(MBEDTLS_ECP_C) || \ |
| 11 | +- !( defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) || \ |
| 12 | +- defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) || \ |
8 | 13 | - defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) || \
|
9 |
| - defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || \ |
10 |
| - defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) || \ |
11 |
| - defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) || \ |
12 |
| -@@ -193,7 +192,6 @@ |
13 |
| - #if defined(MBEDTLS_ECP_LIGHT) && ( !defined(MBEDTLS_BIGNUM_C) || ( \ |
14 |
| - !defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) && \ |
15 |
| - !defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) && \ |
| 14 | +- defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) || \ |
| 15 | +- defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) || \ |
| 16 | +- defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) || \ |
| 17 | +- defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) || \ |
| 18 | +- defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED) || \ |
| 19 | +- defined(MBEDTLS_ECP_DP_BP256R1_ENABLED) || \ |
| 20 | +- defined(MBEDTLS_ECP_DP_BP384R1_ENABLED) || \ |
| 21 | +- defined(MBEDTLS_ECP_DP_BP512R1_ENABLED) ) || \ |
| 22 | +- !defined(MBEDTLS_ASN1_PARSE_C) || \ |
| 23 | +- !defined(MBEDTLS_ASN1_WRITE_C) ) |
| 24 | +-#error "MBEDTLS_ECDSA_C defined, but not all prerequisites" |
| 25 | +-#endif |
| 26 | +- |
| 27 | + #if defined(MBEDTLS_PK_C) && defined(MBEDTLS_USE_PSA_CRYPTO) |
| 28 | + #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) && !defined(MBEDTLS_ASN1_WRITE_C) |
| 29 | + #error "MBEDTLS_PK_C with MBEDTLS_USE_PSA_CRYPTO needs MBEDTLS_ASN1_WRITE_C for ECDSA signature" |
| 30 | +@@ -190,23 +172,6 @@ |
| 31 | + #error "MBEDTLS_ECDSA_DETERMINISTIC defined, but not all prerequisites" |
| 32 | + #endif |
| 33 | + |
| 34 | +-#if defined(MBEDTLS_ECP_LIGHT) && ( !defined(MBEDTLS_BIGNUM_C) || ( \ |
| 35 | +- !defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) && \ |
| 36 | +- !defined(MBEDTLS_ECP_DP_SECP224R1_ENABLED) && \ |
16 | 37 | - !defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) && \
|
17 |
| - !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) && \ |
18 |
| - !defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) && \ |
19 |
| - !defined(MBEDTLS_ECP_DP_BP256R1_ENABLED) && \ |
20 |
| -@@ -361,8 +359,7 @@ |
| 38 | +- !defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED) && \ |
| 39 | +- !defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) && \ |
| 40 | +- !defined(MBEDTLS_ECP_DP_BP256R1_ENABLED) && \ |
| 41 | +- !defined(MBEDTLS_ECP_DP_BP384R1_ENABLED) && \ |
| 42 | +- !defined(MBEDTLS_ECP_DP_BP512R1_ENABLED) && \ |
| 43 | +- !defined(MBEDTLS_ECP_DP_SECP192K1_ENABLED) && \ |
| 44 | +- !defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) && \ |
| 45 | +- !defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED) && \ |
| 46 | +- !defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED) && \ |
| 47 | +- !defined(MBEDTLS_ECP_DP_CURVE448_ENABLED) ) ) |
| 48 | +-#error "MBEDTLS_ECP_C defined (or a subset enabled), but not all prerequisites" |
| 49 | +-#endif |
| 50 | +- |
| 51 | + #if defined(MBEDTLS_ENTROPY_C) && \ |
| 52 | + !(defined(MBEDTLS_MD_CAN_SHA512) || defined(MBEDTLS_MD_CAN_SHA256)) |
| 53 | + #error "MBEDTLS_ENTROPY_C defined, but not all prerequisites" |
| 54 | +@@ -361,8 +326,7 @@ |
21 | 55 | #endif
|
22 | 56 | #else /* MBEDTLS_USE_PSA_CRYPTO */
|
23 | 57 | #if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) && \
|
|
0 commit comments