From 0b558d2ea34a40a21cf99068ad047329ceb423a8 Mon Sep 17 00:00:00 2001 From: brentru Date: Tue, 1 Oct 2019 14:22:13 -0400 Subject: [PATCH] move pers to h, add return code int --- arduino/libraries/WiFi/src/WiFiSSLClient.cpp | 9 +++++---- arduino/libraries/WiFi/src/WiFiSSLClient.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp index 20dc805..523c4ce 100644 --- a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp +++ b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp @@ -25,8 +25,6 @@ #include "WiFiSSLClient.h" -const char *pers = "esp32-tls"; - class __Guard { public: __Guard(SemaphoreHandle_t handle) { @@ -56,6 +54,7 @@ WiFiSSLClient::WiFiSSLClient() : int WiFiSSLClient::connect(const char* host, uint16_t port) { + int ret; synchronized { _netContext.fd = -1; _connected = false; @@ -75,8 +74,10 @@ int WiFiSSLClient::connect(const char* host, uint16_t port) ets_printf("*** connect drbgseed\n"); mbedtls_entropy_init(&_entropyContext); // Seeds and sets up CTR_DRBG for future reseeds, pers is device personalization (esp) - if (mbedtls_ctr_drbg_seed(&_ctrDrbgContext, mbedtls_entropy_func, - &_entropyContext, (const unsigned char *) pers, strlen(pers)) != 0) { + ret = mbedtls_ctr_drbg_seed(&_ctrDrbgContext, mbedtls_entropy_func, + &_entropyContext, (const unsigned char *) pers, strlen(pers)); + if (ret < 0) { + ets_printf("Unable to set up mbedtls_entropy.\n"); stop(); return 0; } diff --git a/arduino/libraries/WiFi/src/WiFiSSLClient.h b/arduino/libraries/WiFi/src/WiFiSSLClient.h index 70979fa..9d8cb83 100644 --- a/arduino/libraries/WiFi/src/WiFiSSLClient.h +++ b/arduino/libraries/WiFi/src/WiFiSSLClient.h @@ -58,6 +58,7 @@ public: virtual /*IPAddress*/uint32_t remoteIP(); virtual uint16_t remotePort(); + const char *pers = "esp32-tls"; private: static const char* ROOT_CAs;