Skip to content

Commit b65bd59

Browse files
stdk-scmstdk-scm
authored
Merge pull request #83 from SmartThingsCommunity/develop_rel_1_5_10
Develop rel 1 5 10
2 parents 8be21f0 + 41d9705 commit b65bd59

7 files changed

+208
-1
lines changed

‎iot-core‎

‎patches/esp32/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From e38e879f7e71d417a96337dd0c56c2ce35cf79a8 Mon Sep 17 00:00:00 2001
2+
From: Sanghee Kim <sh0130.kim@samsung.com>
3+
Date: Tue, 2 Feb 2021 18:07:14 +0900
4+
Subject: [PATCH] mbedtls: esp_config: add MBEDTLS_SSL_ASYNC_PRIVATE
5+
6+
It has been added from v2.11.0.
7+
---
8+
.../mbedtls/port/include/mbedtls/esp_config.h | 13 +++++++++++++
9+
1 file changed, 13 insertions(+)
10+
11+
diff --git a/components/mbedtls/port/include/mbedtls/esp_config.h b/components/mbedtls/port/include/mbedtls/esp_config.h
12+
index 9c6323276..1bea5f1c4 100644
13+
--- a/components/mbedtls/port/include/mbedtls/esp_config.h
14+
+++ b/components/mbedtls/port/include/mbedtls/esp_config.h
15+
@@ -786,6 +786,19 @@
16+
*/
17+
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
18+
19+
+/**
20+
+ * \def MBEDTLS_SSL_ASYNC_PRIVATE
21+
+ *
22+
+ * Enable asynchronous external private key operations in SSL. This allows
23+
+ * you to configure an SSL connection to call an external cryptographic
24+
+ * module to perform private key operations instead of performing the
25+
+ * operation inside the library.
26+
+ *
27+
+ */
28+
+#ifdef CONFIG_MBEDTLS_SSL_ASYNC_PRIVATE
29+
+#define MBEDTLS_SSL_ASYNC_PRIVATE
30+
+#endif
31+
+
32+
/** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
33+
*
34+
* Enable support for Encrypt-then-MAC, RFC 7366.
35+
--
36+
2.17.1
37+

‎patches/esp32/1002-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 8cd8a0f16683160791fa4b426c70ed1d9f009f26 Mon Sep 17 00:00:00 2001
2+
From: Sanghee Kim <sh0130.kim@samsung.com>
3+
Date: Tue, 2 Feb 2021 19:20:41 +0900
4+
Subject: [PATCH] mbedtls: Kconfig: add option for MBEDTLS_SSL_ASYNC_PRIVATE
5+
6+
For certificate-based onboarding
7+
---
8+
components/mbedtls/Kconfig | 8 ++++++++
9+
1 file changed, 8 insertions(+)
10+
11+
diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
12+
index 7514d7621..68b5902fe 100644
13+
--- a/components/mbedtls/Kconfig
14+
+++ b/components/mbedtls/Kconfig
15+
@@ -462,6 +462,14 @@ menu "mbedTLS"
16+
help
17+
Enable the RIPEMD-160 hash algorithm.
18+
19+
+ config MBEDTLS_SSL_ASYNC_PRIVATE
20+
+ bool "Enable asynchronous external private key"
21+
+ default n
22+
+ help
23+
+ This allows you to configure an SSL connection to call
24+
+ an external cryptographic module to perform private key operations
25+
+ instead of performing the operation inside the library.
26+
+
27+
menu "Certificates"
28+
29+
config MBEDTLS_PEM_PARSE_C
30+
--
31+
2.17.1
32+

‎patches/esp32_v3.3/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From e38e879f7e71d417a96337dd0c56c2ce35cf79a8 Mon Sep 17 00:00:00 2001
2+
From: Sanghee Kim <sh0130.kim@samsung.com>
3+
Date: Tue, 2 Feb 2021 18:07:14 +0900
4+
Subject: [PATCH] mbedtls: esp_config: add MBEDTLS_SSL_ASYNC_PRIVATE
5+
6+
It has been added from v2.11.0.
7+
---
8+
.../mbedtls/port/include/mbedtls/esp_config.h | 13 +++++++++++++
9+
1 file changed, 13 insertions(+)
10+
11+
diff --git a/components/mbedtls/port/include/mbedtls/esp_config.h b/components/mbedtls/port/include/mbedtls/esp_config.h
12+
index 9c6323276..1bea5f1c4 100644
13+
--- a/components/mbedtls/port/include/mbedtls/esp_config.h
14+
+++ b/components/mbedtls/port/include/mbedtls/esp_config.h
15+
@@ -786,6 +786,19 @@
16+
*/
17+
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
18+
19+
+/**
20+
+ * \def MBEDTLS_SSL_ASYNC_PRIVATE
21+
+ *
22+
+ * Enable asynchronous external private key operations in SSL. This allows
23+
+ * you to configure an SSL connection to call an external cryptographic
24+
+ * module to perform private key operations instead of performing the
25+
+ * operation inside the library.
26+
+ *
27+
+ */
28+
+#ifdef CONFIG_MBEDTLS_SSL_ASYNC_PRIVATE
29+
+#define MBEDTLS_SSL_ASYNC_PRIVATE
30+
+#endif
31+
+
32+
/** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
33+
*
34+
* Enable support for Encrypt-then-MAC, RFC 7366.
35+
--
36+
2.17.1
37+

‎patches/esp32_v3.3/1002-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From a5b1fe8d9ab7063432bc647fef9e84b1d0be0457 Mon Sep 17 00:00:00 2001
2+
From: Sanghee Kim <sh0130.kim@samsung.com>
3+
Date: Wed, 3 Feb 2021 10:19:39 +0900
4+
Subject: [PATCH] mbedtls: Kconfig: add option for MBEDTLS_SSL_ASYNC_PRIVATE
5+
6+
For certificate-based onboarding
7+
---
8+
components/mbedtls/Kconfig | 8 ++++++++
9+
1 file changed, 8 insertions(+)
10+
11+
diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
12+
index 1d9f93d21..4e69e42a1 100644
13+
--- a/components/mbedtls/Kconfig
14+
+++ b/components/mbedtls/Kconfig
15+
@@ -426,6 +426,14 @@ menu "mbedTLS"
16+
help
17+
Enable the RIPEMD-160 hash algorithm.
18+
19+
+ config MBEDTLS_SSL_ASYNC_PRIVATE
20+
+ bool "Enable asynchronous external private key"
21+
+ default n
22+
+ help
23+
+ This allows you to configure an SSL connection to call
24+
+ an external cryptographic module to perform private key operations
25+
+ instead of performing the operation inside the library.
26+
+
27+
menu "Certificates"
28+
29+
config MBEDTLS_PEM_PARSE_C
30+
--
31+
2.17.1
32+

‎patches/esp8266/1005-mbedtls-esp-add-MBEDTLS_SSL_ASYNC_PRIVATE-in-configu.patch‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From 23bfbd1ba6ff0e4f845c6279242b743e6b3a1e40 Mon Sep 17 00:00:00 2001
2+
From: Sanghee Kim <sh0130.kim@samsung.com>
3+
Date: Tue, 2 Feb 2021 17:58:02 +0900
4+
Subject: [PATCH] mbedtls: esp: add MBEDTLS_SSL_ASYNC_PRIVATE in configuration
5+
6+
It has been added from v2.11.0.
7+
---
8+
.../mbedtls/port/include/mbedtls/esp_config.h | 13 +++++++++++++
9+
1 file changed, 13 insertions(+)
10+
11+
diff --git a/components/mbedtls/port/include/mbedtls/esp_config.h b/components/mbedtls/port/include/mbedtls/esp_config.h
12+
index 7cc51003..617670cc 100644
13+
--- a/components/mbedtls/port/include/mbedtls/esp_config.h
14+
+++ b/components/mbedtls/port/include/mbedtls/esp_config.h
15+
@@ -726,6 +726,19 @@
16+
*/
17+
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
18+
19+
+/**
20+
+ * \def MBEDTLS_SSL_ASYNC_PRIVATE
21+
+ *
22+
+ * Enable asynchronous external private key operations in SSL. This allows
23+
+ * you to configure an SSL connection to call an external cryptographic
24+
+ * module to perform private key operations instead of performing the
25+
+ * operation inside the library.
26+
+ *
27+
+ */
28+
+#ifdef CONFIG_MBEDTLS_SSL_ASYNC_PRIVATE
29+
+#define MBEDTLS_SSL_ASYNC_PRIVATE
30+
+#endif
31+
+
32+
/** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
33+
*
34+
* Enable support for Encrypt-then-MAC, RFC 7366.
35+
--
36+
2.17.1
37+

‎patches/esp8266/1006-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From e8cce8de38737d55c140ebb1be260834373ca665 Mon Sep 17 00:00:00 2001
2+
From: Sanghee Kim <sh0130.kim@samsung.com>
3+
Date: Wed, 3 Feb 2021 10:38:22 +0900
4+
Subject: [PATCH] mbedtls: Kconfig: add option for MBEDTLS_SSL_ASYNC_PRIVATE
5+
6+
For certificate-based onboarding
7+
---
8+
components/mbedtls/Kconfig | 8 ++++++++
9+
1 file changed, 8 insertions(+)
10+
11+
diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
12+
index 10949c96..b1920b85 100644
13+
--- a/components/mbedtls/Kconfig
14+
+++ b/components/mbedtls/Kconfig
15+
@@ -439,6 +439,14 @@ menu "mbedTLS"
16+
help
17+
Enable the RIPEMD-160 hash algorithm.
18+
19+
+ config MBEDTLS_SSL_ASYNC_PRIVATE
20+
+ bool "Enable asynchronous external private key"
21+
+ default n
22+
+ help
23+
+ This allows you to configure an SSL connection to call
24+
+ an external cryptographic module to perform private key operations
25+
+ instead of performing the operation inside the library.
26+
+
27+
menu "Certificates"
28+
29+
config MBEDTLS_PEM_PARSE_C
30+
--
31+
2.17.1
32+

0 commit comments

Comments
 (0)