Merge branch 'contrib/github_pr_10130' into 'master'

allow https server to accept and pass thru alpn protocols (GitHub PR) Closes IDFGH-8686 See merge request espressif/esp-idf!21008
espressif · Nov 11, 2022 · 5ac2bb7 · 5ac2bb7
2 parents c093224 + 3223012
commit 5ac2bb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/esp_https_server/include/esp_https_server.h b/components/esp_https_server/include/esp_https_server.h
@@ -99,6 +99,8 @@ struct httpd_ssl_config {
 
     void *ssl_userdata; /*!< user data to add to the ssl context  */
     esp_tls_handshake_callback cert_select_cb; /*!< Certificate selection callback to use */
+
+    const char** alpn_protos; /*!< Application protocols the server supports in order of prefernece. Used for negotiating during the TLS handshake, first one the client supports is selected. The data structure must live as long as the https server itself! */
 };
 
 typedef struct httpd_ssl_config httpd_ssl_config_t;
@@ -149,7 +151,8 @@ typedef struct httpd_ssl_config httpd_ssl_config_t;
     .use_secure_element = false,                  \
     .user_cb = NULL,                              \
     .ssl_userdata = NULL,                         \
-    .cert_select_cb = NULL                        \
+    .cert_select_cb = NULL,                       \
+    .alpn_protos = NULL,                          \
 }
 
 /**

diff --git a/components/esp_https_server/src/https_server.c b/components/esp_https_server/src/https_server.c
@@ -212,6 +212,9 @@ static httpd_ssl_ctx_t *create_secure_context(const struct httpd_ssl_config *con
 
     cfg->userdata = config->ssl_userdata;
 
+
+    cfg->alpn_protos = config->alpn_protos;
+
 #if defined(CONFIG_ESP_TLS_SERVER_CERT_SELECT_HOOK)
     cfg->cert_select_cb = config->cert_select_cb;
 #endif