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

Fix error when debug enabled but no port chosen (#7648)

Browse Source 
When the debug level for the device includes SSL but the debug port is
chosen as "None," don't attempt to write debug messages.

Fixes #7638
This commit is contained in:
Earle F. Philhower, III 2020-10-09 15:54:39 -07:00 committed by GitHub
parent bc2b13ae16
commit 200e47fc7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ESP8266WiFi/src/CertStoreBearSSL.cpp
View File

@ -21,7 +21,7 @@
#include <memory> #include <memory>
#ifdef DEBUG_ESP_SSL #if defined(DEBUG_ESP_SSL) && defined(DEBUG_ESP_PORT)
#define DEBUG_BSSL(fmt, ...) DEBUG_ESP_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__) #define DEBUG_BSSL(fmt, ...) DEBUG_ESP_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__)
#else #else
#define DEBUG_BSSL(...) #define DEBUG_BSSL(...)

4
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View File

@ -59,7 +59,7 @@ extern "C" {
#endif #endif
#ifdef DEBUG_ESP_SSL #if defined(DEBUG_ESP_SSL) && defined(DEBUG_ESP_PORT)
#define DEBUG_BSSL(fmt, ...) DEBUG_ESP_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__) #define DEBUG_BSSL(fmt, ...) DEBUG_ESP_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__)
#else #else
#define DEBUG_BSSL(...) #define DEBUG_BSSL(...)
@ -664,7 +664,7 @@ extern "C" {
if (!xc->done_cert) { if (!xc->done_cert) {
br_sha1_update(&xc->sha1_cert, buf, len); br_sha1_update(&xc->sha1_cert, buf, len);
br_x509_decoder_push(&xc->ctx, (const void*)buf, len); br_x509_decoder_push(&xc->ctx, (const void*)buf, len);
#ifdef DEBUG_ESP_SSL #if defined(DEBUG_ESP_SSL) && defined(DEBUG_ESP_PORT)
DEBUG_BSSL("CERT: "); DEBUG_BSSL("CERT: ");
for (size_t i=0; i<len; i++) { for (size_t i=0; i<len; i++) {
DEBUG_ESP_PORT.printf_P(PSTR("%02x "), buf[i] & 0xff); DEBUG_ESP_PORT.printf_P(PSTR("%02x "), buf[i] & 0xff);