|
| 1 | +diff --git a/components/mbedtls/mbedtls/include/mbedtls/check_config.h b/components/mbedtls/mbedtls/include/mbedtls/check_config.h |
| 2 | +--- a/components/mbedtls/mbedtls/include/mbedtls/check_config.h |
| 3 | ++++ 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) || \ |
| 8 | +- 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) && \ |
| 16 | +- !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 @@ |
| 21 | + #endif |
| 22 | + #else /* MBEDTLS_USE_PSA_CRYPTO */ |
| 23 | + #if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) && \ |
| 24 | +- ( !defined(MBEDTLS_ECJPAKE_C) || \ |
| 25 | +- !defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED) ) |
| 26 | ++ ( !defined(MBEDTLS_ECJPAKE_C) ) |
| 27 | + #error "MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED defined, but not all prerequisites" |
| 28 | + #endif |
| 29 | + #endif /* MBEDTLS_USE_PSA_CRYPTO */ |
1 | 30 | diff --git a/components/mbedtls/mbedtls/include/mbedtls/mbedtls_config.h b/components/mbedtls/mbedtls/include/mbedtls/mbedtls_config.h
|
2 | 31 | index 35921412c6e6..d3abe4007b83 100644
|
3 | 32 | --- a/components/mbedtls/mbedtls/include/mbedtls/mbedtls_config.h
|
4 |
| -+++ a/components/mbedtls/mbedtls/include/mbedtls/mbedtls_config.h |
| 33 | ++++ b/components/mbedtls/mbedtls/include/mbedtls/mbedtls_config.h |
5 | 34 | @@ -759,7 +759,6 @@
|
6 | 35 | /* Short Weierstrass curves (supporting ECP, ECDH, ECDSA) */
|
7 | 36 | #define MBEDTLS_ECP_DP_SECP192R1_ENABLED
|
|
0 commit comments