security: modify configuration names in SE and TLS

Previous configuration names for SE are artik specific(ex. TLS_WITH_SSS...) As TizenRT would support various SE, these names can confuse developers. And some name doesn't look proper like SUPPORT_FULL_SECURITY which set Secure Storage support. Furthermore TLS and SE share configurations so it shows same options both SE and TLS menu. But TLS doesn't want to set H/W accelerator even though SE support it. For example if the SE couldn't support all key length algorithms, then software logic in TLS should be used.
kani73 · Jul 16, 2019 · 87864f9 · 87864f9
1 parent 087a253
commit 87864f9
Show file tree

Hide file tree

Showing 46 changed files with 434 additions and 2,089 deletions.
diff --git a/apps/examples/security_test/see_api/Kconfig b/apps/examples/security_test/see_api/Kconfig
@@ -4,7 +4,7 @@
 #
 config EXAMPLES_SECURITY_SEE_TEST
 	bool "Security SEE API Test"
-	depends on TLS_WITH_SSS && SUPPORT_FULL_SECURITY
+	depends on TLS_WITH_HW_ACCEL
 	default n
 
 if EXAMPLES_SECURITY_SEE_TEST

diff --git a/apps/examples/security_test/see_api/see_test_main.c b/apps/examples/security_test/see_api/see_test_main.c
@@ -1476,7 +1476,7 @@ pthread_addr_t see_test_cb(void *args)
 	argc = ((struct pthread_arg *)args)->argc;
 	argv = ((struct pthread_arg *)args)->argv;
 
-#if defined(CONFIG_TLS_WITH_SSS)
+#if defined(CONFIG_TLS_WITH_HW_ACCEL)
 	see_init();
 #endif
 
@@ -1604,7 +1604,7 @@ pthread_addr_t see_test_cb(void *args)
 	}
 
 	printf("=====SSS Block Test Finish=====\n");
-#if defined(CONFIG_TLS_WITH_SSS)
+#if defined(CONFIG_TLS_WITH_HW_ACCEL)
 	see_free();
 #endif
 

diff --git a/apps/examples/testcase/le_tc/tcp_tls/tcp_tls_stress.c b/apps/examples/testcase/le_tc/tcp_tls/tcp_tls_stress.c
@@ -236,7 +236,7 @@ static tcp_tls_result_e tcp_tls_create(mbedtls_config *tls)
 		return result;
 	}
 
-#if defined(CONFIG_TLS_WITH_SSS)
+#if defined(CONFIG_TLS_WITH_HW_ACCEL)
 	ret = see_init();
 	if (ret != 0) {
 		printf("failed : see_init returned %d\n\n", ret);
@@ -398,7 +398,7 @@ static tcp_tls_result_e tcp_tls_destroy(mbedtls_config *tls)
 	free(tls->entropy);
 	free(tls->timer);
 
-#if defined(CONFIG_TLS_WITH_SSS)
+#if defined(CONFIG_TLS_WITH_HW_ACCEL)
 	int ret = 0;
 
 	ret = see_free();

diff --git a/apps/examples/tls_client/Kconfig b/apps/examples/tls_client/Kconfig
@@ -19,7 +19,7 @@ menu option
 config EXAMPLES_TLS_ARTIK_KEY
 	bool "use artik cloud key"
 	default n
-	depends on TLS_WITH_SSS
+	depends on TLS_WITH_HW_ACCEL
 endmenu
 
 endif # EXAMPLE_TLS_CLIENT

diff --git a/apps/examples/tls_selftest/tls_selftest_main.c b/apps/examples/tls_selftest/tls_selftest_main.c
@@ -181,7 +181,7 @@ pthread_addr_t tls_selftest_cb(void *args)
  * Without HW entropy, there is no strong entropy source and
  * it will make failure the selftest.
  */
-#if defined(MBEDTLS_ENTROPY_C) && defined(CONFIG_HW_RNG)
+#if defined(MBEDTLS_ENTROPY_C) && defined(CONFIG_TLS_HW_RNG)
 	DO_TLS_TEST(mbedtls_entropy_self_test, v);
 #endif
 #if defined(MBEDTLS_PKCS5_C)

diff --git a/build/configs/artik053/avs_test/defconfig b/build/configs/artik053/avs_test/defconfig
@@ -791,8 +791,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_GRPC is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053/grpc/defconfig b/build/configs/artik053/grpc/defconfig
@@ -772,8 +772,7 @@ CONFIG_GRPC_PTHREAD_SIZE=16384
 CONFIG_TSI_MBEDTLS_LOG=0
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053/iotivity/defconfig b/build/configs/artik053/iotivity/defconfig
@@ -768,8 +768,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053/iotjs/defconfig b/build/configs/artik053/iotjs/defconfig
@@ -803,8 +803,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053/nettest/defconfig b/build/configs/artik053/nettest/defconfig
@@ -807,8 +807,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053/st_things/defconfig b/build/configs/artik053/st_things/defconfig
@@ -788,8 +788,7 @@ CONFIG_WGET_USERAGENT="TinyARA"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053/tc/defconfig b/build/configs/artik053/tc/defconfig
@@ -822,8 +822,7 @@ CONFIG_NETUTILS_WEBSOCKET=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053s/iotjs/defconfig b/build/configs/artik053s/iotjs/defconfig
@@ -803,8 +803,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
-CONFIG_SUPPORT_FULL_SECURITY=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053s/nettest/defconfig b/build/configs/artik053s/nettest/defconfig
@@ -764,8 +764,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
-CONFIG_SUPPORT_FULL_SECURITY=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik053s/st_things/defconfig b/build/configs/artik053s/st_things/defconfig
@@ -789,8 +789,7 @@ CONFIG_WGET_USERAGENT="TinyARA"
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
-CONFIG_SUPPORT_FULL_SECURITY=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #
@@ -808,7 +807,7 @@ CONFIG_HW_ECDH_PARAM=y
 # CONFIG_HW_RSA_VERIFICATION is not set
 CONFIG_HW_ECDSA_VERIFICATION=y
 CONFIG_HW_RSA_ENC=y
-CONFIG_SE_STORAGE=y
+CONFIG_HW_SE_STORAGE=y
 
 #
 # Wireless

diff --git a/build/configs/artik055s/audio/defconfig b/build/configs/artik055s/audio/defconfig
@@ -793,8 +793,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
 # CONFIG_GRPC is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
-# CONFIG_SUPPORT_FULL_SECURITY is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik055s/iotjs/defconfig b/build/configs/artik055s/iotjs/defconfig
@@ -818,8 +818,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
-CONFIG_SUPPORT_FULL_SECURITY=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik055s/nettest/defconfig b/build/configs/artik055s/nettest/defconfig
@@ -815,8 +815,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
-CONFIG_SUPPORT_FULL_SECURITY=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/artik055s/st_things/defconfig b/build/configs/artik055s/st_things/defconfig
@@ -762,8 +762,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
-CONFIG_SUPPORT_FULL_SECURITY=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 
 #
 # HW Selection

diff --git a/build/configs/esp_wrover_kit/security/defconfig b/build/configs/esp_wrover_kit/security/defconfig
@@ -742,7 +742,7 @@ CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-CONFIG_TLS_WITH_SSS=y
+CONFIG_TLS_WITH_HW_ACCEL=y
 CONFIG_TLS_MPI_MAX_SIZE=512
 
 #

diff --git a/build/configs/sidk_s5jt200/sidk_tash_aws/defconfig b/build/configs/sidk_s5jt200/sidk_tash_aws/defconfig
@@ -769,7 +769,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 
 #
 # Wireless

diff --git a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig
@@ -769,7 +769,7 @@ CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_MQTT is not set
 CONFIG_NET_SECURITY_TLS=y
-# CONFIG_TLS_WITH_SSS is not set
+# CONFIG_TLS_WITH_HW_ACCEL is not set
 
 #
 # Wireless

diff --git a/external/include/mbedtls/config.h b/external/include/mbedtls/config.h
@@ -2926,29 +2926,29 @@
  *
  * Uncomment to use your own hardware entropy collector.
  */
-#if defined(CONFIG_HW_RNG)
+#if defined(CONFIG_TLS_HW_RNG)
 #define MBEDTLS_ENTROPY_HARDWARE_ALT
 #endif
 
-#if defined(CONFIG_HW_DH_PARAM)
+#if defined(CONFIG_TLS_HW_DH_PARAM)
 #define MBEDTLS_DHM_ALT
 #endif
 
-#if defined(CONFIG_HW_ECDH_PARAM)
+#if defined(CONFIG_TLS_HW_ECDH_PARAM)
 #define MBEDTLS_ECDH_GEN_PUBLIC_ALT
 #define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
 #endif
 
-#if defined(CONFIG_HW_ECDSA_VERIFICATION)
+#if defined(CONFIG_TLS_HW_ECDSA_VERIFICATION)
 #define MBEDTLS_PK_ECDSA_VERIFY_ALT
 #endif
 
-#if defined(CONFIG_HW_RSA_VERIFICATION)
+#if defined(CONFIG_TLS_HW_RSA_VERIFICATION)
 #define MBEDTLS_PK_RSA_VERIFY_ALT
 #undef MBEDTLS_PK_RSA_ALT_SUPPORT
 #endif
 
-#if defined(CONFIG_HW_RSA_ENC)
+#if defined(CONFIG_TLS_HW_RSA_ENC)
 #define MBEDTLS_PK_RSA_ENCRYPT_ALT
 #undef MBEDTLS_PK_RSA_ALT_SUPPORT
 #endif