feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_10130' into 'master'

Browse Source 
allow https server to accept and pass thru alpn protocols (GitHub PR)

Closes IDFGH-8686

See merge request espressif/esp-idf!21008
This commit is contained in:
Mahavir Jain
2022-11-11 14:10:31 +08:00
parent c09322430a 322301238f
commit 5ac2bb77a1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_https_server/include/esp_https_server.h
View File

@@ -99,6 +99,8 @@ struct httpd_ssl_config {
void *ssl_userdata; /*!< user data to add to the ssl context */ void *ssl_userdata; /*!< user data to add to the ssl context */
esp_tls_handshake_callback cert_select_cb; /*!< Certificate selection callback to use */ 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; 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, \ .use_secure_element = false, \
.user_cb = NULL, \ .user_cb = NULL, \
.ssl_userdata = NULL, \ .ssl_userdata = NULL, \
.cert_select_cb = NULL \ .cert_select_cb = NULL, \
.alpn_protos = NULL, \
} }
/** /**

3
components/esp_https_server/src/https_server.c
View File

@@ -212,6 +212,9 @@ static httpd_ssl_ctx_t *create_secure_context(const struct httpd_ssl_config *con
cfg->userdata = config->ssl_userdata; cfg->userdata = config->ssl_userdata;
cfg->alpn_protos = config->alpn_protos;
#if defined(CONFIG_ESP_TLS_SERVER_CERT_SELECT_HOOK) #if defined(CONFIG_ESP_TLS_SERVER_CERT_SELECT_HOOK)
cfg->cert_select_cb = config->cert_select_cb; cfg->cert_select_cb = config->cert_select_cb;
#endif #endif