Merge pull request #86 from SmartThingsCommunity/master_rel_1_5_11

stdk-scm · web-flow · commit f4783a07b2a3 · 2021-03-31T17:00:45.000+09:00
Master rel 1 5 11
diff --git a/apps/capability_sample/caps_button.c b/apps/capability_sample/caps_button.c
@@ -122,6 +122,9 @@ static void caps_button_set_button_value(caps_button_data_t *caps_data, const ch
 static void caps_button_attr_button_send(caps_button_data_t *caps_data)
 {
     int sequence_no = -1;
+    IOT_EVENT *attr = NULL;
+    iot_cap_val_t value;
+    iot_cap_attr_option_t attr_option = { 0 };
 
     if (!caps_data || !caps_data->handle) {
         printf("fail to get handle\n");
@@ -132,12 +135,16 @@ static void caps_button_attr_button_send(caps_button_data_t *caps_data)
         return;
     }
 
-    ST_CAP_SEND_ATTR_STRING(caps_data->handle,
-            (char *)caps_helper_button.attr_button.name,
-            caps_data->button_value,
-            NULL,
-            NULL,
-            sequence_no);
+    value.type = IOT_CAP_VAL_TYPE_STRING;
+    value.string = caps_data->button_value;
+
+    attr_option.state_change = true;
+
+    attr = st_cap_create_attr_with_option(caps_data->handle, (char *)caps_helper_button.attr_button.name, &value, NULL, NULL, &attr_option);
+    if (attr != NULL){
+        sequence_no = st_cap_send_attr(&attr, 1);
+        st_cap_free_attr(attr);
+    }
 
     if (sequence_no < 0)
         printf("fail to send button value\n");
@@ -146,7 +153,6 @@ static void caps_button_attr_button_send(caps_button_data_t *caps_data)
 
 }
 
-
 static int caps_button_get_numberOfButtons_value(caps_button_data_t *caps_data)
 {
     if (!caps_data) {
diff --git a/build.py b/build.py
@@ -23,8 +23,8 @@ def print_usage():
 
     try:
         usage_buf = ""
-        for bsp_dir in os.listdir(os.path.join(STDK_REF_PATH, "bsp")):
-            if (os.path.isdir(os.path.join(STDK_REF_PATH, "bsp", bsp_dir))
+        for bsp_dir in os.listdir(os.path.join(STDK_REF_PATH, "apps")):
+            if (os.path.isdir(os.path.join(STDK_REF_PATH, "apps", bsp_dir))
                    and os.path.isdir(os.path.join(STDK_REF_PATH, "apps", bsp_dir))):
                 app_list = ""
                 for dir in os.listdir(os.path.join(STDK_REF_PATH, "apps", bsp_dir)):
diff --git a/doc/getting_started.md b/doc/getting_started.md
@@ -516,7 +516,7 @@ The SmartThings App should be used to control an IoT device that is running with
 
 1. **Enable developer mode**  
 You need to enable the ***Developer Mode*** in the SmartThings app before start testing.  
-Please refer [here](https://smartthings.developer.samsung.com/docs/testing/developer-mode.htm) for more details.  
+Please refer [here](https://smartthings.developer.samsung.com/docs/testing/developer-mode.html) for more details.  
 ![developer mode](./res/developer_mode.png)
 
 2. **Add device**  
diff --git a/iot-core b/iot-core
@@ -1 +1 @@
-Subproject commit f839cc3cca6549330f268ea172c88cf904501c58
+Subproject commit c1958abbde51c7487c273b662c073a413c031bdb
diff --git a/patches/esp32/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch b/patches/esp32/1001-mbedtls-esp_config-add-MBEDTLS_SSL_ASYNC_PRIVATE.patch
@@ -0,0 +1,37 @@
+From e38e879f7e71d417a96337dd0c56c2ce35cf79a8 Mon Sep 17 00:00:00 2001
+From: Sanghee Kim <sh0130.kim@samsung.com>
+Date: Tue, 2 Feb 2021 18:07:14 +0900
+Subject: [PATCH] mbedtls: esp_config: add MBEDTLS_SSL_ASYNC_PRIVATE
+
+It has been added from v2.11.0.
+---
+ .../mbedtls/port/include/mbedtls/esp_config.h       | 13 +++++++++++++
+ 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
+--- a/components/mbedtls/port/include/mbedtls/esp_config.h
++++ b/components/mbedtls/port/include/mbedtls/esp_config.h
+@@ -786,6 +786,19 @@
+  */
+ #define MBEDTLS_SSL_ALL_ALERT_MESSAGES
+ 
++/**
++ * \def MBEDTLS_SSL_ASYNC_PRIVATE
++ *
++ * Enable asynchronous external private key operations in SSL. This allows
++ * you to configure an SSL connection to call an external cryptographic
++ * module to perform private key operations instead of performing the
++ * operation inside the library.
++ *
++ */
++#ifdef CONFIG_MBEDTLS_SSL_ASYNC_PRIVATE
++#define MBEDTLS_SSL_ASYNC_PRIVATE
++#endif
++
+ /** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
+  *
+  * Enable support for Encrypt-then-MAC, RFC 7366.
+-- 
+2.17.1
+
diff --git a/patches/esp32/1002-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch b/patches/esp32/1002-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch
@@ -0,0 +1,32 @@
+From 8cd8a0f16683160791fa4b426c70ed1d9f009f26 Mon Sep 17 00:00:00 2001
+From: Sanghee Kim <sh0130.kim@samsung.com>
+Date: Tue, 2 Feb 2021 19:20:41 +0900
+Subject: [PATCH] mbedtls: Kconfig: add option for MBEDTLS_SSL_ASYNC_PRIVATE
+
+For certificate-based onboarding
+---
+ components/mbedtls/Kconfig | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
+index 7514d7621..68b5902fe 100644
+--- a/components/mbedtls/Kconfig
++++ b/components/mbedtls/Kconfig
+@@ -462,6 +462,14 @@ menu "mbedTLS"
+         help
+             Enable the RIPEMD-160 hash algorithm.
+ 
++    config MBEDTLS_SSL_ASYNC_PRIVATE
++        bool "Enable asynchronous external private key"
++        default n
++        help
++	    This allows you to configure an SSL connection to call
++	    an external cryptographic module to perform private key operations
++	    instead of performing the operation inside the library.
++
+     menu "Certificates"
+ 
+         config MBEDTLS_PEM_PARSE_C
+-- 
+2.17.1
+
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
@@ -0,0 +1,37 @@
+From e38e879f7e71d417a96337dd0c56c2ce35cf79a8 Mon Sep 17 00:00:00 2001
+From: Sanghee Kim <sh0130.kim@samsung.com>
+Date: Tue, 2 Feb 2021 18:07:14 +0900
+Subject: [PATCH] mbedtls: esp_config: add MBEDTLS_SSL_ASYNC_PRIVATE
+
+It has been added from v2.11.0.
+---
+ .../mbedtls/port/include/mbedtls/esp_config.h       | 13 +++++++++++++
+ 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
+--- a/components/mbedtls/port/include/mbedtls/esp_config.h
++++ b/components/mbedtls/port/include/mbedtls/esp_config.h
+@@ -786,6 +786,19 @@
+  */
+ #define MBEDTLS_SSL_ALL_ALERT_MESSAGES
+ 
++/**
++ * \def MBEDTLS_SSL_ASYNC_PRIVATE
++ *
++ * Enable asynchronous external private key operations in SSL. This allows
++ * you to configure an SSL connection to call an external cryptographic
++ * module to perform private key operations instead of performing the
++ * operation inside the library.
++ *
++ */
++#ifdef CONFIG_MBEDTLS_SSL_ASYNC_PRIVATE
++#define MBEDTLS_SSL_ASYNC_PRIVATE
++#endif
++
+ /** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
+  *
+  * Enable support for Encrypt-then-MAC, RFC 7366.
+-- 
+2.17.1
+
diff --git a/patches/esp32_v3.3/1002-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch b/patches/esp32_v3.3/1002-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch
@@ -0,0 +1,32 @@
+From a5b1fe8d9ab7063432bc647fef9e84b1d0be0457 Mon Sep 17 00:00:00 2001
+From: Sanghee Kim <sh0130.kim@samsung.com>
+Date: Wed, 3 Feb 2021 10:19:39 +0900
+Subject: [PATCH] mbedtls: Kconfig: add option for MBEDTLS_SSL_ASYNC_PRIVATE
+
+For certificate-based onboarding
+---
+ components/mbedtls/Kconfig | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
+index 1d9f93d21..4e69e42a1 100644
+--- a/components/mbedtls/Kconfig
++++ b/components/mbedtls/Kconfig
+@@ -426,6 +426,14 @@ menu "mbedTLS"
+         help
+             Enable the RIPEMD-160 hash algorithm.
+ 
++    config MBEDTLS_SSL_ASYNC_PRIVATE
++        bool "Enable asynchronous external private key"
++        default n
++        help
++	    This allows you to configure an SSL connection to call
++	    an external cryptographic module to perform private key operations
++	    instead of performing the operation inside the library.
++
+     menu "Certificates"
+ 
+         config MBEDTLS_PEM_PARSE_C
+-- 
+2.17.1
+
diff --git a/patches/esp8266/1005-mbedtls-esp-add-MBEDTLS_SSL_ASYNC_PRIVATE-in-configu.patch b/patches/esp8266/1005-mbedtls-esp-add-MBEDTLS_SSL_ASYNC_PRIVATE-in-configu.patch
@@ -0,0 +1,37 @@
+From 23bfbd1ba6ff0e4f845c6279242b743e6b3a1e40 Mon Sep 17 00:00:00 2001
+From: Sanghee Kim <sh0130.kim@samsung.com>
+Date: Tue, 2 Feb 2021 17:58:02 +0900
+Subject: [PATCH] mbedtls: esp: add MBEDTLS_SSL_ASYNC_PRIVATE in configuration
+
+It has been added from v2.11.0.
+---
+ .../mbedtls/port/include/mbedtls/esp_config.h       | 13 +++++++++++++
+ 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 7cc51003..617670cc 100644
+--- a/components/mbedtls/port/include/mbedtls/esp_config.h
++++ b/components/mbedtls/port/include/mbedtls/esp_config.h
+@@ -726,6 +726,19 @@
+  */
+ #define MBEDTLS_SSL_ALL_ALERT_MESSAGES
+ 
++/**
++ * \def MBEDTLS_SSL_ASYNC_PRIVATE
++ *
++ * Enable asynchronous external private key operations in SSL. This allows
++ * you to configure an SSL connection to call an external cryptographic
++ * module to perform private key operations instead of performing the
++ * operation inside the library.
++ *
++ */
++#ifdef CONFIG_MBEDTLS_SSL_ASYNC_PRIVATE
++#define MBEDTLS_SSL_ASYNC_PRIVATE
++#endif
++
+ /** \def MBEDTLS_SSL_ENCRYPT_THEN_MAC
+  *
+  * Enable support for Encrypt-then-MAC, RFC 7366.
+-- 
+2.17.1
+
diff --git a/patches/esp8266/1006-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch b/patches/esp8266/1006-mbedtls-Kconfig-add-option-for-MBEDTLS_SSL_ASYNC_PRI.patch
@@ -0,0 +1,32 @@
+From e8cce8de38737d55c140ebb1be260834373ca665 Mon Sep 17 00:00:00 2001
+From: Sanghee Kim <sh0130.kim@samsung.com>
+Date: Wed, 3 Feb 2021 10:38:22 +0900
+Subject: [PATCH] mbedtls: Kconfig: add option for MBEDTLS_SSL_ASYNC_PRIVATE
+
+For certificate-based onboarding
+---
+ components/mbedtls/Kconfig | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
+index 10949c96..b1920b85 100644
+--- a/components/mbedtls/Kconfig
++++ b/components/mbedtls/Kconfig
+@@ -439,6 +439,14 @@ menu "mbedTLS"
+         help
+             Enable the RIPEMD-160 hash algorithm.
+ 
++    config MBEDTLS_SSL_ASYNC_PRIVATE
++        bool "Enable asynchronous external private key"
++        default n
++        help
++	    This allows you to configure an SSL connection to call
++	    an external cryptographic module to perform private key operations
++	    instead of performing the operation inside the library.
++
+     menu "Certificates"
+ 
+         config MBEDTLS_PEM_PARSE_C
+-- 
+2.17.1
+
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import sys
 
 REPLACE_LIST = [
-    ["from", "to"]
+	["from", "to"]
 ]
 
 STDK_REF_PATH = os.path.dirname(os.path.abspath(__file__))
@@ -17,70 +17,71 @@
 
 
 def print_usage():
-    print("")
-    print("Usage: python setup.py [BSP_NAME]")
-    print("--------------------------------------------------")
-    for dir in os.listdir(os.path.join(STDK_REF_PATH, "bsp")):
-        if (os.path.isdir(os.path.join(STDK_REF_PATH, "bsp", dir))
-                and os.path.isdir(os.path.join(STDK_REF_PATH, "tools", dir))):
-            print("  ex) python setup.py " + dir)
-    print("")
+	print("")
+	print("Usage: python setup.py [BSP_NAME]")
+	print("--------------------------------------------------")
+	for dir in os.listdir(os.path.join(STDK_REF_PATH, "tools")):
+		dirpath = os.path.join(STDK_REF_PATH, "tools", dir)
+		if (os.path.exists(os.path.join(dirpath, "setup_"+ dir + ".py")) or
+				os.path.exists(os.path.join(dirpath, "setup_"+ dir + ".sh"))):
+			print("  ex) python setup.py " + dir)
+	print("")
 
 
 def find_setup_script(bsp_name):
-    if os.path.exists(os.path.join("tools", bsp_name, "setup_" + bsp_name + ".py")):
-        return "python " + os.path.join("tools", bsp_name, "setup_" + bsp_name + ".py")
-    if "SHELL" in os.environ:
-        if os.path.exists(os.path.join("tools", bsp_name, "setup_" + bsp_name + ".sh")):
-            return os.path.join("tools", bsp_name, "setup_" + bsp_name + ".sh")
-    print("Fail to find setup script")
-    print_usage()
-    exit(1)
+	if os.path.exists(os.path.join("tools", bsp_name, "setup_" + bsp_name + ".py")):
+		return "python " + os.path.join("tools", bsp_name, "setup_" + bsp_name + ".py")
+	if "SHELL" in os.environ:
+		if os.path.exists(os.path.join("tools", bsp_name, "setup_" + bsp_name + ".sh")):
+			return os.path.join("tools", bsp_name, "setup_" + bsp_name + ".sh")
+	print("Fail to find setup script")
+	print_usage()
+	exit(1)
 
 def update_submodule(path):
-    cwd = os.getcwd()
-    try:
-        print("Update submodule " + path)
-        os.system("git submodule sync " + path)
-        os.system("git submodule init " + path)
-        os.system("git submodule update " + path)
-        os.chdir(path)
-        os.system("git reset --hard HEAD")
-    except:
-        print("Failed to update submodule " + path)
-    os.chdir(cwd)
+	cwd = os.getcwd()
+	try:
+		print("Update submodule " + path)
+		os.system("git submodule sync " + path)
+		os.system("git submodule init " + path)
+		os.system("git submodule update " + path)
+		os.chdir(path)
+		os.system("git reset --hard HEAD")
+	except:
+		print("Failed to update submodule " + path)
+	os.chdir(cwd)
 
 update_submodule(STDK_CORE_PATH)
 
 if len(sys.argv) == 1:
-    print_usage()
-    exit(1)
+	print_usage()
+	exit(1)
 
 BSP_NAME = sys.argv[1]
 EXTRA_ARGS = sys.argv[2:]
 
 for item in REPLACE_LIST:
-    if BSP_NAME == item[0]:
-        BSP_NAME = item[1]
+	if BSP_NAME == item[0]:
+		BSP_NAME = item[1]
 
 setup_script = find_setup_script(BSP_NAME)
 
 BSP_PATH = os.path.join(STDK_REF_PATH, "bsp", BSP_NAME)
 if BSP_PATH and os.path.isdir(BSP_PATH):
-    update_submodule(BSP_PATH)
+	update_submodule(BSP_PATH)
 
 setup_cmd = setup_script + " " + BSP_NAME
 for args in EXTRA_ARGS:
-    setup_cmd = setup_cmd + " " + args
+	setup_cmd = setup_cmd + " " + args
 ret_val = os.system(setup_cmd)
 if ret_val:
-    print_usage()
-    exit(1)
+	print_usage()
+	exit(1)
 else:
-    print("")
-    print("======================================================================")
-    print("")
-    print("To use SmartThings Device SDK build script, run following command:")
-    print("")
-    print("    python build.py " + BSP_NAME + " [APP_NAME]")
-    print("")
+	print("")
+	print("======================================================================")
+	print("")
+	print("To use SmartThings Device SDK build script, run following command:")
+	print("")
+	print("    python build.py " + BSP_NAME + " [APP_NAME]")
+	print("")
