Skip to content

Develop rel 1 7 0 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 14, 2021
Merged

Develop rel 1 7 0 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d803efd
Merge pull request #577 from STDK/develop_rel_1_6_3
YongsulOh Jul 7, 2021
167b615
patch:esp32_v3.3:modify mbedtls patch for esp32_v3.3
hdlee27 Jul 8, 2021
1728a87
Sync-up with iot-core 1.7.0
stdk-scm Jul 14, 2021
91cb99e
Merge remote-tracking branch 'internal/develop_rel_1_7_0' into develop
stdk-scm Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iot-core
Open in desktop
Submodule iot-core updated 8 files
+2 −0 src/include/iot_internal.h
+2 −0 src/include/iot_main.h
+10 −0 src/include/st_dev.h
+2 −2 src/include/st_dev_version.h
+1 −1 src/iot_api.c
+53 −0 src/iot_capability.c
+59 −1 src/iot_main.c
+24 −0 src/iot_serialize.c
8 changes: 4 additions & 4 deletions patches/esp32_v3.3/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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