From 559cd57ea653890f4cbe0bee7a6725e8975f036b Mon Sep 17 00:00:00 2001
From: Maximilian Schmidt <maximilian@schmidt.so>
Date: Tue, 3 Dec 2019 12:22:06 +0100
Subject: [PATCH] Support MutualAuthentication in HTTPsServer

---
 .../include/esp_https_server.h                |  8 ++++++++
 .../esp_https_server/src/https_server.c       | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/components/esp_https_server/include/esp_https_server.h b/components/esp_https_server/include/esp_https_server.h
index d41b36245f..ad2ef1f158 100644
--- a/components/esp_https_server/include/esp_https_server.h
+++ b/components/esp_https_server/include/esp_https_server.h
@@ -47,6 +47,12 @@ struct httpd_ssl_config {
     /** CA certificate byte length */
     size_t cacert_len;
 
+    /** Server certificate */
+    const uint8_t *servercert_pem;
+
+    /** Server certificate byte length */
+    size_t servercert_len;
+
     /** Private key */
     const uint8_t *prvtkey_pem;
 
@@ -100,6 +106,8 @@ typedef struct httpd_ssl_config httpd_ssl_config_t;
     },                                            \
     .cacert_pem = NULL,                           \
     .cacert_len = 0,                              \
+    .servercert_pem = NULL,                       \
+    .servercert_len = 0,                          \
     .prvtkey_pem = NULL,                          \
     .prvtkey_len = 0,                             \
     .transport_mode = HTTPD_SSL_TRANSPORT_SECURE, \
diff --git a/components/esp_https_server/src/https_server.c b/components/esp_https_server/src/https_server.c
index 47c2abcb0f..4d2d3ccc69 100644
--- a/components/esp_https_server/src/https_server.c
+++ b/components/esp_https_server/src/https_server.c
@@ -135,6 +135,9 @@ static void free_secure_context(void *ctx)
     assert(ctx != NULL);
     esp_tls_cfg_server_t *cfg = (esp_tls_cfg_server_t *)ctx;
     ESP_LOGI(TAG, "Server shuts down, releasing SSL context");
+    if (cfg->cacert_buf) {
+        free((void *)cfg->cacert_buf);
+    }
     if (cfg->servercert_buf) {
         free((void *)cfg->servercert_buf);
     }
@@ -150,17 +153,27 @@ static esp_tls_cfg_server_t *create_secure_context(const struct httpd_ssl_config
     if (!cfg) {
         return NULL;
     }
-    cfg->servercert_buf = (unsigned char *)malloc(config->cacert_len);
-    if (!cfg->servercert_buf) {
+    cfg->cacert_buf = (unsigned char *)malloc(config->cacert_len);
+    if (!cfg->cacert_buf) {
         free(cfg);
         return NULL;
     }
-    memcpy((char *)cfg->servercert_buf, config->cacert_pem, config->cacert_len);
+    memcpy((char *)cfg->cacert_buf, config->cacert_pem, config->cacert_len);
+    cfg->cacert_bytes = config->cacert_len;
+
+    cfg->servercert_buf = (unsigned char *)malloc(config->cacert_len);
+    if (!cfg->servercert_buf) {
+        free((void *)cfg->cacert_buf);
+        free(cfg);
+        return NULL;
+    }
+    memcpy((char *)cfg->servercert_buf, config->servercert_pem, config->servercert_len);
     cfg->servercert_bytes = config->cacert_len;
 
     cfg->serverkey_buf = (unsigned char *)malloc(config->prvtkey_len);
     if (!cfg->serverkey_buf) {
         free((void *)cfg->servercert_buf);
+        free((void *)cfg->cacert_buf);
         free(cfg);
         return NULL;
     }