Merge pull request #95 from SmartThingsCommunity/develop_rel_1_7_0

stdk-scm · web-flow · commit fa65948a2cf4 · 2021-07-14T18:10:37.000+09:00
Develop rel 1 7 0
diff --git a/iot-core b/iot-core
@@ -1 +1 @@
-Subproject commit 0b13e848820db9d6a14558b2247a52eaa1367aba
+Subproject commit 90a2e8e106e4aed4704ec75d48327664ea4a66f3
diff --git a/patches/esp32_v3.3/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch b/patches/esp32_v3.3/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch
@@ -9,10 +9,10 @@ It has been added from v2.11.0.
  1 file changed, 13 insertions(+)
 
 diff --git a/components/mbedtls/port/include/mbedtls/esp_config.h b/components/mbedtls/port/include/mbedtls/esp_config.h
-index 9c6323276..1bea5f1c4 100644
+index 85f2abe37..cb2c7f3fe 100644
 --- a/components/mbedtls/port/include/mbedtls/esp_config.h
 +++ b/components/mbedtls/port/include/mbedtls/esp_config.h
-@@ -786,6 +786,19 @@
+@@ -1042,6 +1042,19 @@
   */
  #define MBEDTLS_SSL_ALL_ALERT_MESSAGES
  
@@ -29,9 +29,9 @@ index 9c6323276..1bea5f1c4 100644
 +#define MBEDTLS_SSL_ASYNC_PRIVATE
 +#endif
 +
- /** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
+ /**
+  * \def MBEDTLS_SSL_DEBUG_ALL
   *
-  * Enable support for Encrypt-then-MAC, RFC 7366.
 -- 
 2.17.1
 
