feat(tls): update esp-tls and tcp_transport from idf

Commit ID:88bf21b2

components/tcp_transport/include/esp_transport.h

@@ -133,7 +133,7 @@ esp_err_t esp_transport_set_default_port(esp_transport_handle_t t, int port);
  * @param      t           The transport handle
  * @param[in]  host        Hostname
  * @param[in]  port        Port
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates wait forever)
  *
  * @return
  * - socket for will use by this transport
@@ -147,7 +147,7 @@ int esp_transport_connect(esp_transport_handle_t t, const char *host, int port,
  * @param      t           The transport handle
  * @param[in]  host        Hostname
  * @param[in]  port        Port
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates wait forever)
  *
  * @return
  * - socket for will use by this transport
@@ -161,7 +161,7 @@ int esp_transport_connect_async(esp_transport_handle_t t, const char *host, int
  * @param      t           The transport handle
  * @param      buffer      The buffer
  * @param[in]  len         The length
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates wait forever)
  *
  * @return
  *  - Number of bytes was read
@@ -173,7 +173,7 @@ int esp_transport_read(esp_transport_handle_t t, char *buffer, int len, int time
  * @brief      Poll the transport until readable or timeout
  *
  * @param[in]  t           The transport handle
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates wait forever)
  *
  * @return
  *     - 0      Timeout
@@ -188,7 +188,7 @@ int esp_transport_poll_read(esp_transport_handle_t t, int timeout_ms);
  * @param      t           The transport handle
  * @param      buffer      The buffer
  * @param[in]  len         The length
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates wait forever)
  *
  * @return
  *  - Number of bytes was written
@@ -200,7 +200,7 @@ int esp_transport_write(esp_transport_handle_t t, const char *buffer, int len, i
  * @brief      Poll the transport until writeable or timeout
  *
  * @param[in]  t           The transport handle
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates wait forever)
  *
  * @return
  *     - 0      Timeout

components/tcp_transport/include/esp_transport_ssl.h

@@ -92,6 +92,16 @@ void esp_transport_ssl_set_client_cert_data_der(esp_transport_handle_t t, const
  */
 void esp_transport_ssl_set_client_key_data(esp_transport_handle_t t, const char *data, int len);
 
+/**
+ * @brief      Set SSL client key password if the key is password protected. The configured
+ *             password is passed to the underlying TLS stack to decrypt the client key
+ *
+ * @param      t     ssl transport
+ * @param[in]  password  Pointer to the password
+ * @param[in]  password_len   Password length
+ */
+void esp_transport_ssl_set_client_key_password(esp_transport_handle_t t, const char *password, int password_len);
+
 /**
  * @brief      Set SSL client key data for mutual authentication (as DER format).
  *             Note that, this function stores the pointer to data, rather than making a copy.
@@ -103,6 +113,16 @@ void esp_transport_ssl_set_client_key_data(esp_transport_handle_t t, const char
  */
 void esp_transport_ssl_set_client_key_data_der(esp_transport_handle_t t, const char *data, int len);
 
+/**
+ * @brief      Set the list of supported application protocols to be used with ALPN.
+ *             Note that, this function stores the pointer to data, rather than making a copy.
+ *             So this data must remain valid until after the connection is cleaned up
+ *
+ * @param      t            ssl transport
+ * @param[in]  alpn_porot   The list of ALPN protocols, the last entry must be NULL
+ */
+void esp_transport_ssl_set_alpn_protocol(esp_transport_handle_t t, const char **alpn_protos);
+
 /**
  * @brief      Skip validation of certificate's common name field
  *

components/tcp_transport/include/esp_transport_utils.h

@@ -1,44 +0,0 @@
-// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef _ESP_TRANSPORT_UTILS_H_
-#define _ESP_TRANSPORT_UTILS_H_
-#include <sys/time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief      Utility macro to be used for NULL ptr check after malloc
- *
- */
-#define ESP_TRANSPORT_MEM_CHECK(TAG, a, action) if (!(a)) {                                         \
-        ESP_LOGE(TAG,"%s:%d (%s): %s", __FILE__, __LINE__, __FUNCTION__, "Memory exhausted");       \
-        action;                                                                                     \
-        }
-
-/**
- * @brief      Convert milliseconds to timeval struct
- *
- * @param[in]  timeout_ms  The timeout milliseconds
- * @param[out] tv          Timeval struct
- */
-void esp_transport_utils_ms_to_timeval(int timeout_ms, struct timeval *tv);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _ESP_TRANSPORT_UTILS_H_ */

components/tcp_transport/include/esp_transport_ws.h

@@ -14,6 +14,7 @@ extern "C" {
 #endif
 
 typedef enum ws_transport_opcodes {
+    WS_TRANSPORT_OPCODES_CONT =  0x00,
     WS_TRANSPORT_OPCODES_TEXT =  0x01,
     WS_TRANSPORT_OPCODES_BINARY = 0x02,
     WS_TRANSPORT_OPCODES_CLOSE = 0x08,
@@ -50,6 +51,30 @@ void esp_transport_ws_set_path(esp_transport_handle_t t, const char *path);
  */
 esp_err_t esp_transport_ws_set_subprotocol(esp_transport_handle_t t, const char *sub_protocol);
 
+/**
+ * @brief               Set websocket user-agent header
+ *
+ * @param t             websocket transport handle
+ * @param sub_protocol  user-agent string
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - One of the error codes
+ */
+esp_err_t esp_transport_ws_set_user_agent(esp_transport_handle_t t, const char *user_agent);
+
+/**
+ * @brief               Set websocket additional headers
+ *
+ * @param t             websocket transport handle
+ * @param sub_protocol  additional header strings each terminated with \r\n
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - One of the error codes
+ */
+esp_err_t esp_transport_ws_set_headers(esp_transport_handle_t t, const char *headers);
+
 /**
  * @brief               Sends websocket raw message with custom opcode and payload
  *
@@ -63,7 +88,7 @@ esp_err_t esp_transport_ws_set_subprotocol(esp_transport_handle_t t, const char
  * @param[in]  opcode      ws operation code
  * @param[in]  buffer      The buffer
  * @param[in]  len         The length
- * @param[in]  timeout_ms  The timeout milliseconds
+ * @param[in]  timeout_ms  The timeout milliseconds (-1 indicates block forever)
  *
  * @return
  *  - Number of bytes was written
@@ -81,6 +106,16 @@ int esp_transport_ws_send_raw(esp_transport_handle_t t, ws_transport_opcodes_t o
  */
 ws_transport_opcodes_t esp_transport_ws_get_read_opcode(esp_transport_handle_t t);
 
+/**
+ * @brief               Returns payload length of the last received data
+ *
+ * @param t             websocket transport handle
+ *
+ * @return
+ *      - Number of bytes in the payload
+ */
+int esp_transport_ws_get_read_payload_len(esp_transport_handle_t t);
+
 
 #ifdef __cplusplus
 }