Copy key and cert to malloc()ed memory. Needed for persistency, but also because PROGMEM key/cert are not always supported by esp32_https_server.

Author: jackjansen

src/ESPWebServerSecure.cpp

@@ -4,7 +4,9 @@
 ESPWebServerSecure::ESPWebServerSecure(IPAddress addr, int port)
 : ESPWebServer(new httpsserver::HTTPSServer(&_sslCert, port, 4, addr)),
   _underlyingServer(this),
-  _sslCert()
+  _sslCert(),
+  keyStore(NULL),
+  certStore(NULL)
 {}
 
 ESPWebServerSecure::ESPWebServerSecure(int port)
@@ -14,8 +16,18 @@ ESPWebServerSecure::ESPWebServerSecure(int port)
 {}
 
 void ESPWebServerSecure::setServerKeyAndCert(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen) {
-  _sslCert.setPK((unsigned char *)key, keyLen);
-  _sslCert.setCert((unsigned char *)cert, certLen);
+  if (keyStore) free(keyStore);
+  if (certStore) free(certStore);
+  keyStore = (uint8_t *)malloc(keyLen);
+  certStore = (uint8_t *)malloc(certLen);
+  if (keyStore == NULL || certStore == NULL) {
+    HTTPS_LOGE("Out of memory for key and cert");
+    return;
+  }
+  memcpy_P(keyStore, key, keyLen);
+  memcpy_P(certStore, cert, certLen);
+  _sslCert.setPK(keyStore, keyLen);
+  _sslCert.setCert(certStore, certLen);
 }
 
 void ESPWebServerSecure::setServerKeyAndCert_P(const uint8_t *key, int keyLen, const uint8_t *cert, int certLen) {

src/ESPWebServerSecure.hpp

@@ -31,6 +31,8 @@ class ESPWebServerSecure : public ESPWebServer {
 protected:
   ESPWebServerUnderlyingServer _underlyingServer;
   httpsserver::SSLCert _sslCert;
+  uint8_t* keyStore;
+  uint8_t* certStore;
 };
 
 #endif //ESPWEBSERVERSECURE_H