mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/remove_sha384_hash_for_bigger_certs_v4.4' into 'release/v4.4'
esp_wifi: remove sha384 hash for cert size > 2k (v4.4) See merge request espressif/esp-idf!21964
This commit is contained in:
commit
cdb87a514f
@ -254,9 +254,6 @@ static void tls_enable_sha1_config(tls_context_t *tls)
|
||||
static const int eap_ciphersuite_preference[] =
|
||||
{
|
||||
#if defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
|
||||
#if defined(MBEDTLS_SHA512_C) && defined(MBEDTLS_GCM_C)
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
|
||||
#endif
|
||||
#if defined(MBEDTLS_CCM_C)
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM,
|
||||
#endif
|
||||
@ -264,9 +261,6 @@ static const int eap_ciphersuite_preference[] =
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
|
||||
#endif
|
||||
#if defined(MBEDTLS_GCM_C)
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384,
|
||||
#endif
|
||||
#if defined(MBEDTLS_CIPHER_MODE_CBC)
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
|
||||
MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
||||
@ -287,9 +281,7 @@ static const int eap_ciphersuite_preference[] =
|
||||
#endif
|
||||
#endif
|
||||
#if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED)
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM,
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM_8,
|
||||
|
||||
@ -298,9 +290,6 @@ static const int eap_ciphersuite_preference[] =
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
|
||||
MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM_8,
|
||||
#endif
|
||||
#if defined(MBEDTLS_SHA512_C) && defined(MBEDTLS_GCM_C)
|
||||
MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384,
|
||||
#endif
|
||||
#if defined(MBEDTLS_CCM_C)
|
||||
MBEDTLS_TLS_RSA_WITH_AES_256_CCM,
|
||||
#endif
|
||||
@ -349,14 +338,10 @@ static const int eap_ciphersuite_preference[] =
|
||||
MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
|
||||
#endif
|
||||
/* The PSK suites */
|
||||
#if defined(MBEDTLS_GCM_C)
|
||||
MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384,
|
||||
#endif
|
||||
#if defined(MBEDTLS_CCM_C)
|
||||
MBEDTLS_TLS_PSK_WITH_AES_256_CCM,
|
||||
#endif
|
||||
#if defined(MBEDTLS_CIPHER_MODE_CBC)
|
||||
MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA384,
|
||||
MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA,
|
||||
#endif
|
||||
#if defined(MBEDTLS_CCM_C)
|
||||
|
Loading…
x
Reference in New Issue
Block a user