alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

esp-tls: Added _esp_tls_net_init to init fd for both mbedtls/wolfssl

Browse Source
This commit is contained in:
David Cermak 2021-02-10 13:25:09 +01:00
parent 4375f888fa
commit 5cfa545d08
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp-tls/esp_tls.c
View File

@ -45,6 +45,7 @@ static const char *TAG = "esp-tls";
#define _esp_tls_read esp_mbedtls_read #define _esp_tls_read esp_mbedtls_read
#define _esp_tls_write esp_mbedtls_write #define _esp_tls_write esp_mbedtls_write
#define _esp_tls_conn_delete esp_mbedtls_conn_delete #define _esp_tls_conn_delete esp_mbedtls_conn_delete
#define _esp_tls_net_init esp_mbedtls_net_init
#ifdef CONFIG_ESP_TLS_SERVER #ifdef CONFIG_ESP_TLS_SERVER
#define _esp_tls_server_session_create esp_mbedtls_server_session_create #define _esp_tls_server_session_create esp_mbedtls_server_session_create
#define _esp_tls_server_session_delete esp_mbedtls_server_session_delete #define _esp_tls_server_session_delete esp_mbedtls_server_session_delete
@ -60,6 +61,7 @@ static const char *TAG = "esp-tls";
#define _esp_tls_read esp_wolfssl_read #define _esp_tls_read esp_wolfssl_read
#define _esp_tls_write esp_wolfssl_write #define _esp_tls_write esp_wolfssl_write
#define _esp_tls_conn_delete esp_wolfssl_conn_delete #define _esp_tls_conn_delete esp_wolfssl_conn_delete
#define _esp_tls_net_init esp_wolfssl_net_init
#ifdef CONFIG_ESP_TLS_SERVER #ifdef CONFIG_ESP_TLS_SERVER
#define _esp_tls_server_session_create esp_wolfssl_server_session_create #define _esp_tls_server_session_create esp_wolfssl_server_session_create
#define _esp_tls_server_session_delete esp_wolfssl_server_session_delete #define _esp_tls_server_session_delete esp_wolfssl_server_session_delete
@ -126,9 +128,7 @@ esp_tls_t *esp_tls_init(void)
free(tls); free(tls);
return NULL; return NULL;
} }
#ifdef CONFIG_ESP_TLS_USING_MBEDTLS _esp_tls_net_init(tls);
tls->server_fd.fd = -1;
#endif
tls->sockfd = -1; tls->sockfd = -1;
return tls; return tls;
} }
@ -353,9 +353,7 @@ static int esp_tls_low_level_conn(const char *hostname, int hostlen, int port, c
case ESP_TLS_INIT: case ESP_TLS_INIT:
tls->sockfd = -1; tls->sockfd = -1;
if (cfg != NULL && cfg->is_plain_tcp == false) { if (cfg != NULL && cfg->is_plain_tcp == false) {
#ifdef CONFIG_ESP_TLS_USING_MBEDTLS _esp_tls_net_init(tls);
mbedtls_net_init(&tls->server_fd);
#endif
tls->is_tls = true; tls->is_tls = true;
} }
if ((esp_ret = esp_tcp_connect(hostname, hostlen, port, &tls->sockfd, tls, cfg)) != ESP_OK) { if ((esp_ret = esp_tcp_connect(hostname, hostlen, port, &tls->sockfd, tls, cfg)) != ESP_OK) {

8
components/esp-tls/private_include/esp_tls_mbedtls.h
View File

@ -55,6 +55,14 @@ ssize_t esp_mbedtls_get_bytes_avail(esp_tls_t *tls);
*/ */
esp_err_t esp_create_mbedtls_handle(const char *hostname, size_t hostlen, const void *cfg, esp_tls_t *tls); esp_err_t esp_create_mbedtls_handle(const char *hostname, size_t hostlen, const void *cfg, esp_tls_t *tls);
/**
* mbedTLS function for Initializing socket wrappers
*/
static inline void esp_mbedtls_net_init(esp_tls_t *tls)
{
mbedtls_net_init(&tls->server_fd);
}
#ifdef CONFIG_ESP_TLS_SERVER #ifdef CONFIG_ESP_TLS_SERVER
/** /**
* Internal Callback for set_server_config * Internal Callback for set_server_config

7
components/esp-tls/private_include/esp_tls_wolfssl.h
View File

@ -71,6 +71,13 @@ void esp_wolfssl_free_global_ca_store(void);
*/ */
esp_err_t esp_wolfssl_init_global_ca_store(void); esp_err_t esp_wolfssl_init_global_ca_store(void);
/**
* wolfSSL function for Initializing socket wrappers (no-operation for wolfSSL)
*/
static inline void esp_wolfssl_net_init(esp_tls_t *tls)
{
}
#ifdef CONFIG_ESP_TLS_SERVER #ifdef CONFIG_ESP_TLS_SERVER
/** /**