1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00

Fix basic SSL server definitions (#6402)

A typo was present in several ifdefs which would allow a server to negotiate
an EC connection even when in basic SSL mode.  When this happened, a crash
would occur (since there were no EC or advanced AES modes installed).

Fix the typo, fixes #6397
This commit is contained in:
Earle F. Philhower, III 2019-08-08 21:54:59 -07:00 committed by GitHub
parent ea17a06bc8
commit adfc28d7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -819,7 +819,7 @@ extern "C" {
BR_TLS_RSA_WITH_3DES_EDE_CBC_SHA
#endif
};
#ifndef BEARSSL_BASIC
#ifndef BEARSSL_SSL_BASIC
// Server w/EC has one set, not possible with basic SSL config
static const uint16_t suites_server_ec_P [] PROGMEM = {
BR_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
@ -852,7 +852,7 @@ extern "C" {
#endif
static const uint16_t suites_server_rsa_P[] PROGMEM = {
#ifndef BEARSSL_BASIC
#ifndef BEARSSL_SSL_BASIC
BR_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
BR_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
@ -871,7 +871,7 @@ extern "C" {
BR_TLS_RSA_WITH_AES_256_CBC_SHA256,
BR_TLS_RSA_WITH_AES_128_CBC_SHA,
BR_TLS_RSA_WITH_AES_256_CBC_SHA,
#ifndef BEARSSL_BASIC
#ifndef BEARSSL_SSL_BASIC
BR_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
BR_TLS_RSA_WITH_3DES_EDE_CBC_SHA
#endif