ARMmbed · 0xc0170 · Aug 12, 2020 · Jul 31, 2020 · Jul 31, 2020 · Jul 31, 2020
diff --git a/.astyleignore b/.astyleignore
@@ -5,13 +5,14 @@
 ^connectivity/libraries/mbed-coap
 ^connectivity/libraries/ppp
 ^connectivity/drivers/emac
+^connectivity/drivers/mbedtls
+^connectivity/mbedtls
 ^features/cryptocell
 ^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
 ^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
 ^features/frameworks
 ^connectivity/lwipstack/lwip
 ^connectivity/lwipstack/lwip-sys
-^features/mbedtls
 ^connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
 ^connectivity/nanostack/sal-stack-nanostack-eventloop
 ^storage/filesystem/fat/ChaN

diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
@@ -7,6 +7,8 @@
         "psa",
         "psa-services",
         "mbedtls",
+        "mbedtls-stm",
+        "mbedtls-nuvoton",
         "psa-compliance-framework",
         "filesystem",
         "littlefs",

diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
@@ -151,8 +151,8 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/phy"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
-  "${PROJECT_SOURCE_DIR}/../features/mbedtls"
-  "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
+  "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls"
+  "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include"
 )
 
 # Create a list for test suites.

diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
@@ -6,8 +6,8 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/mbedtls/inc/mbedtls/
-  ../features/mbedtls/platform/inc/
+  ../connectivity/mbedtls/include/mbedtls/
+  ../connectivity/mbedtls/platform/inc/
   ../features/frameworks/mbed-trace/mbed-trace/
 )
 

diff --git a/...ET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h → ...ET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h b/...ET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h → ...ET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h
diff --git a/..._MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h b/..._MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h
diff --git a/..._MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h b/..._MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h
diff --git a/...ET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h → ...ET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h b/...ET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h → ...ET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h
diff --git a/..._MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h b/..._MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h
diff --git a/..._MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h b/..._MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h → ..._MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h
diff --git a/.../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c → .../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c b/.../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c → .../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c
diff --git a/.../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h → .../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h b/.../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h → .../TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h
diff --git a/...T_Cypress/TARGET_MXCRYPTO/crypto_common.c → ...T_Cypress/TARGET_MXCRYPTO/crypto_common.c b/...T_Cypress/TARGET_MXCRYPTO/crypto_common.c → ...T_Cypress/TARGET_MXCRYPTO/crypto_common.c
diff --git a/...T_Cypress/TARGET_MXCRYPTO/crypto_common.h → ...T_Cypress/TARGET_MXCRYPTO/crypto_common.h b/...T_Cypress/TARGET_MXCRYPTO/crypto_common.h → ...T_Cypress/TARGET_MXCRYPTO/crypto_common.h
diff --git a/...ARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c → ...ARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c b/...ARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c → ...ARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c
diff --git a/.../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c → .../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c b/.../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c → .../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c
diff --git a/.../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h → .../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h b/.../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h → .../TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h
diff --git a/..._Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c → ..._Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c b/..._Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c → ..._Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c
diff --git a/..._Cypress/TARGET_MXCRYPTO/mbedtls_device.h → ..._Cypress/TARGET_MXCRYPTO/mbedtls_device.h b/..._Cypress/TARGET_MXCRYPTO/mbedtls_device.h → ..._Cypress/TARGET_MXCRYPTO/mbedtls_device.h
diff --git a/...TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c → ...TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c b/...TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c → ...TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c
diff --git a/...RGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c → ...RGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c b/...RGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c → ...RGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c
diff --git a/...RGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c → ...RGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c b/...RGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c → ...RGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c
diff --git a/connectivity/drivers/mbedtls/TARGET_Cypress/mbed_lib.json b/connectivity/drivers/mbedtls/TARGET_Cypress/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "mbedtls-cypress"
+}
diff --git a/.../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c → .../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c b/.../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c → .../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c
diff --git a/.../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h → .../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h b/.../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h → .../TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h
diff --git a/.../TARGET_NUVOTON/TARGET_M480/des/des_alt.c → .../TARGET_NUVOTON/TARGET_M480/des/des_alt.c b/.../TARGET_NUVOTON/TARGET_M480/des/des_alt.c → .../TARGET_NUVOTON/TARGET_M480/des/des_alt.c
diff --git a/.../TARGET_NUVOTON/TARGET_M480/des/des_alt.h → .../TARGET_NUVOTON/TARGET_M480/des/des_alt.h b/.../TARGET_NUVOTON/TARGET_M480/des/des_alt.h → .../TARGET_NUVOTON/TARGET_M480/des/des_alt.h
diff --git a/...UVOTON/TARGET_M480/ecp/ecp_internal_alt.c → ...UVOTON/TARGET_M480/ecp/ecp_internal_alt.c b/...UVOTON/TARGET_M480/ecp/ecp_internal_alt.c → ...UVOTON/TARGET_M480/ecp/ecp_internal_alt.c
@@ -214,7 +214,7 @@ unsigned char mbedtls_internal_ecp_grp_capable( const mbedtls_ecp_group *grp )
 {
     /* Support only short Weierstrass type
      * 
-     * ECP type is checked by referring to mbed-os/features/mbedtls/src/ecp.c > ecp_get_type
+     * ECP type is checked by referring to mbed-os/connectivity/mbedtls/src/ecp.c > ecp_get_type
      */
     if (grp->G.X.p == NULL || grp->G.Y.p == NULL) {
         return 0;

diff --git a/...RGET_NUVOTON/TARGET_M480/mbedtls_device.h → ...RGET_NUVOTON/TARGET_M480/mbedtls_device.h b/...RGET_NUVOTON/TARGET_M480/mbedtls_device.h → ...RGET_NUVOTON/TARGET_M480/mbedtls_device.h
diff --git a/...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c → ...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c b/...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c → ...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c
diff --git a/...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h → ...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h b/...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h → ...TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h
diff --git a/...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c → ...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c b/...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c → ...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c
diff --git a/...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h → ...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h b/...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h → ...GET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h
diff --git a/...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.c → ...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.c b/...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.c → ...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.c
diff --git a/...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.h → ...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.h b/...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.h → ...RGET_NUVOTON/TARGET_M480/sha/sha256_alt.h
diff --git a/...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c → ...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c b/...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c → ...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c
diff --git a/...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h → ...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h b/...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h → ...T_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h
diff --git a/...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.c → ...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.c b/...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.c → ...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.c
diff --git a/...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.h → ...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.h b/...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.h → ...RGET_NUVOTON/TARGET_M480/sha/sha512_alt.h
diff --git a/...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c → ...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c b/...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c → ...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c
diff --git a/...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h → ...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h b/...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h → ...T_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h
diff --git a/...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c → ...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c b/...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c → ...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c
diff --git a/...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h → ...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h b/...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h → ...RGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h
diff --git a/...ARGET_NUMAKER_PFM_NUC472/mbedtls_device.h → ...ARGET_NUMAKER_PFM_NUC472/mbedtls_device.h b/...ARGET_NUMAKER_PFM_NUC472/mbedtls_device.h → ...ARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
diff --git a/...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c → ...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c b/...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c → ...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
diff --git a/...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h → ...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h b/...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h → ...ARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h
diff --git a/...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.c → ...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.c b/...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.c → ...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.c
diff --git a/...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.h → ...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.h b/...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.h → ...ARGET_NUVOTON/TARGET_NUC472/des/des_alt.h
diff --git a/...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c → ...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c b/...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c → ...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c
diff --git a/...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h → ...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h b/...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h → ...RGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h
diff --git a/...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c → ...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c b/...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c → ...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c
diff --git a/...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h → ...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h b/...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h → ...T_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h
diff --git a/...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c → ...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c b/...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c → ...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c
diff --git a/...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h → ...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h b/...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h → ...ET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h
diff --git a/...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c → ...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c b/...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c → ...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c
diff --git a/...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h → ...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h b/...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h → ...NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h
diff --git a/...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c → ...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c b/...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c → ...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c
diff --git a/...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h → ...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h b/...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h → ...ET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h
diff --git a/connectivity/drivers/mbedtls/TARGET_NUVOTON/mbed_lib.json b/connectivity/drivers/mbedtls/TARGET_NUVOTON/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "mbedtls-nuvoton"
+}
diff --git a/...T_STM/TARGET_STM32F437xG/mbedtls_device.h → ...T_STM/TARGET_STM32F437xG/mbedtls_device.h b/...T_STM/TARGET_STM32F437xG/mbedtls_device.h → ...T_STM/TARGET_STM32F437xG/mbedtls_device.h
diff --git a/...T_STM/TARGET_STM32F439xI/mbedtls_device.h → ...T_STM/TARGET_STM32F439xI/mbedtls_device.h b/...T_STM/TARGET_STM32F439xI/mbedtls_device.h → ...T_STM/TARGET_STM32F439xI/mbedtls_device.h
diff --git a/...T_STM/TARGET_STM32F756xG/mbedtls_device.h → ...T_STM/TARGET_STM32F756xG/mbedtls_device.h b/...T_STM/TARGET_STM32F756xG/mbedtls_device.h → ...T_STM/TARGET_STM32F756xG/mbedtls_device.h
diff --git a/...T_STM/TARGET_STM32L443xC/mbedtls_device.h → ...T_STM/TARGET_STM32L443xC/mbedtls_device.h b/...T_STM/TARGET_STM32L443xC/mbedtls_device.h → ...T_STM/TARGET_STM32L443xC/mbedtls_device.h
diff --git a/...T_STM/TARGET_STM32L486xG/mbedtls_device.h → ...T_STM/TARGET_STM32L486xG/mbedtls_device.h b/...T_STM/TARGET_STM32L486xG/mbedtls_device.h → ...T_STM/TARGET_STM32L486xG/mbedtls_device.h
diff --git a/...T_STM/TARGET_STM32L562xx/mbedtls_device.h → ...T_STM/TARGET_STM32L562xx/mbedtls_device.h b/...T_STM/TARGET_STM32L562xx/mbedtls_device.h → ...T_STM/TARGET_STM32L562xx/mbedtls_device.h
diff --git a/...T_STM/TARGET_STM32WB55xx/mbedtls_device.h → ...T_STM/TARGET_STM32WB55xx/mbedtls_device.h b/...T_STM/TARGET_STM32WB55xx/mbedtls_device.h → ...T_STM/TARGET_STM32WB55xx/mbedtls_device.h
diff --git a/...es/mbedtls/targets/TARGET_STM/aes_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/aes_alt.cpp b/...es/mbedtls/targets/TARGET_STM/aes_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/aes_alt.cpp
diff --git a/...ures/mbedtls/targets/TARGET_STM/aes_alt.h → ...vity/drivers/mbedtls/TARGET_STM/aes_alt.h b/...ures/mbedtls/targets/TARGET_STM/aes_alt.h → ...vity/drivers/mbedtls/TARGET_STM/aes_alt.h
diff --git a/...dtls/targets/TARGET_STM/aes_alt_stm32l4.c → ...vers/mbedtls/TARGET_STM/aes_alt_stm32l4.c b/...dtls/targets/TARGET_STM/aes_alt_stm32l4.c → ...vers/mbedtls/TARGET_STM/aes_alt_stm32l4.c
diff --git a/...dtls/targets/TARGET_STM/aes_alt_stm32l4.h → ...vers/mbedtls/TARGET_STM/aes_alt_stm32l4.h b/...dtls/targets/TARGET_STM/aes_alt_stm32l4.h → ...vers/mbedtls/TARGET_STM/aes_alt_stm32l4.h
diff --git a/...es/mbedtls/targets/TARGET_STM/ccm_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/ccm_alt.cpp b/...es/mbedtls/targets/TARGET_STM/ccm_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/ccm_alt.cpp
diff --git a/...ures/mbedtls/targets/TARGET_STM/ccm_alt.h → ...vity/drivers/mbedtls/TARGET_STM/ccm_alt.h b/...ures/mbedtls/targets/TARGET_STM/ccm_alt.h → ...vity/drivers/mbedtls/TARGET_STM/ccm_alt.h
diff --git a/...s/mbedtls/targets/TARGET_STM/cryp_stm32.c → ...y/drivers/mbedtls/TARGET_STM/cryp_stm32.c b/...s/mbedtls/targets/TARGET_STM/cryp_stm32.c → ...y/drivers/mbedtls/TARGET_STM/cryp_stm32.c
diff --git a/...s/mbedtls/targets/TARGET_STM/cryp_stm32.h → ...y/drivers/mbedtls/TARGET_STM/cryp_stm32.h b/...s/mbedtls/targets/TARGET_STM/cryp_stm32.h → ...y/drivers/mbedtls/TARGET_STM/cryp_stm32.h
diff --git a/...es/mbedtls/targets/TARGET_STM/gcm_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/gcm_alt.cpp b/...es/mbedtls/targets/TARGET_STM/gcm_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/gcm_alt.cpp
diff --git a/...ures/mbedtls/targets/TARGET_STM/gcm_alt.h → ...vity/drivers/mbedtls/TARGET_STM/gcm_alt.h b/...ures/mbedtls/targets/TARGET_STM/gcm_alt.h → ...vity/drivers/mbedtls/TARGET_STM/gcm_alt.h
diff --git a/...s/mbedtls/targets/TARGET_STM/hash_stm32.c → ...y/drivers/mbedtls/TARGET_STM/hash_stm32.c b/...s/mbedtls/targets/TARGET_STM/hash_stm32.c → ...y/drivers/mbedtls/TARGET_STM/hash_stm32.c
diff --git a/...s/mbedtls/targets/TARGET_STM/hash_stm32.h → ...y/drivers/mbedtls/TARGET_STM/hash_stm32.h b/...s/mbedtls/targets/TARGET_STM/hash_stm32.h → ...y/drivers/mbedtls/TARGET_STM/hash_stm32.h
diff --git a/connectivity/drivers/mbedtls/TARGET_STM/mbed_lib.json b/connectivity/drivers/mbedtls/TARGET_STM/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "mbedtls-stm"
+}
diff --git a/...es/mbedtls/targets/TARGET_STM/md5_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/md5_alt.cpp b/...es/mbedtls/targets/TARGET_STM/md5_alt.cpp → ...ty/drivers/mbedtls/TARGET_STM/md5_alt.cpp
diff --git a/...ures/mbedtls/targets/TARGET_STM/md5_alt.h → ...vity/drivers/mbedtls/TARGET_STM/md5_alt.h b/...ures/mbedtls/targets/TARGET_STM/md5_alt.h → ...vity/drivers/mbedtls/TARGET_STM/md5_alt.h
diff --git a/...s/mbedtls/targets/TARGET_STM/sha1_alt.cpp → ...y/drivers/mbedtls/TARGET_STM/sha1_alt.cpp b/...s/mbedtls/targets/TARGET_STM/sha1_alt.cpp → ...y/drivers/mbedtls/TARGET_STM/sha1_alt.cpp
diff --git a/...res/mbedtls/targets/TARGET_STM/sha1_alt.h → ...ity/drivers/mbedtls/TARGET_STM/sha1_alt.h b/...res/mbedtls/targets/TARGET_STM/sha1_alt.h → ...ity/drivers/mbedtls/TARGET_STM/sha1_alt.h
diff --git a/...mbedtls/targets/TARGET_STM/sha256_alt.cpp → ...drivers/mbedtls/TARGET_STM/sha256_alt.cpp b/...mbedtls/targets/TARGET_STM/sha256_alt.cpp → ...drivers/mbedtls/TARGET_STM/sha256_alt.cpp
diff --git a/...s/mbedtls/targets/TARGET_STM/sha256_alt.h → ...y/drivers/mbedtls/TARGET_STM/sha256_alt.h b/...s/mbedtls/targets/TARGET_STM/sha256_alt.h → ...y/drivers/mbedtls/TARGET_STM/sha256_alt.h
diff --git a/connectivity/drivers/mbedtls/TARGET_Samsung/mbed_lib.json b/connectivity/drivers/mbedtls/TARGET_Samsung/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "mbedtls-samsung"
+}
diff --git a/...s/targets/TARGET_Samsung/mbedtls_device.h → ...s/mbedtls/TARGET_Samsung/mbedtls_device.h b/...s/targets/TARGET_Samsung/mbedtls_device.h → ...s/mbedtls/TARGET_Samsung/mbedtls_device.h
diff --git a/...s/targets/TARGET_Samsung/sha/sha256_alt.c → ...s/mbedtls/TARGET_Samsung/sha/sha256_alt.c b/...s/targets/TARGET_Samsung/sha/sha256_alt.c → ...s/mbedtls/TARGET_Samsung/sha/sha256_alt.c
diff --git a/...s/targets/TARGET_Samsung/sha/sha256_alt.h → ...s/mbedtls/TARGET_Samsung/sha/sha256_alt.h b/...s/targets/TARGET_Samsung/sha/sha256_alt.h → ...s/mbedtls/TARGET_Samsung/sha/sha256_alt.h
diff --git a/...s/targets/TARGET_Samsung/sha/sha512_alt.c → ...s/mbedtls/TARGET_Samsung/sha/sha512_alt.c b/...s/targets/TARGET_Samsung/sha/sha512_alt.c → ...s/mbedtls/TARGET_Samsung/sha/sha512_alt.c
diff --git a/...s/targets/TARGET_Samsung/sha/sha512_alt.h → ...s/mbedtls/TARGET_Samsung/sha/sha512_alt.h b/...s/targets/TARGET_Samsung/sha/sha512_alt.h → ...s/mbedtls/TARGET_Samsung/sha/sha512_alt.h
diff --git a/...tls/targets/TARGET_Silicon_Labs/aes_aes.c → ...ers/mbedtls/TARGET_Silicon_Labs/aes_aes.c b/...tls/targets/TARGET_Silicon_Labs/aes_aes.c → ...ers/mbedtls/TARGET_Silicon_Labs/aes_aes.c
diff --git a/...tls/targets/TARGET_Silicon_Labs/aes_alt.h → ...ers/mbedtls/TARGET_Silicon_Labs/aes_alt.h b/...tls/targets/TARGET_Silicon_Labs/aes_alt.h → ...ers/mbedtls/TARGET_Silicon_Labs/aes_alt.h
diff --git a/.../targets/TARGET_Silicon_Labs/crypto_aes.c → .../mbedtls/TARGET_Silicon_Labs/crypto_aes.c b/.../targets/TARGET_Silicon_Labs/crypto_aes.c → .../mbedtls/TARGET_Silicon_Labs/crypto_aes.c
diff --git a/.../targets/TARGET_Silicon_Labs/crypto_ecp.c → .../mbedtls/TARGET_Silicon_Labs/crypto_ecp.c b/.../targets/TARGET_Silicon_Labs/crypto_ecp.c → .../mbedtls/TARGET_Silicon_Labs/crypto_ecp.c
diff --git a/...s/TARGET_Silicon_Labs/crypto_management.c → ...s/TARGET_Silicon_Labs/crypto_management.c b/...s/TARGET_Silicon_Labs/crypto_management.c → ...s/TARGET_Silicon_Labs/crypto_management.c
diff --git a/...s/TARGET_Silicon_Labs/crypto_management.h → ...s/TARGET_Silicon_Labs/crypto_management.h b/...s/TARGET_Silicon_Labs/crypto_management.h → ...s/TARGET_Silicon_Labs/crypto_management.h
diff --git a/.../targets/TARGET_Silicon_Labs/crypto_sha.c → .../mbedtls/TARGET_Silicon_Labs/crypto_sha.c b/.../targets/TARGET_Silicon_Labs/crypto_sha.c → .../mbedtls/TARGET_Silicon_Labs/crypto_sha.c
diff --git a/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/mbed_lib.json b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "mbedtls-siliconlabs"
+}
diff --git a/...gets/TARGET_Silicon_Labs/mbedtls_device.h → ...dtls/TARGET_Silicon_Labs/mbedtls_device.h b/...gets/TARGET_Silicon_Labs/mbedtls_device.h → ...dtls/TARGET_Silicon_Labs/mbedtls_device.h
diff --git a/...ls/targets/TARGET_Silicon_Labs/sha1_alt.h → ...rs/mbedtls/TARGET_Silicon_Labs/sha1_alt.h b/...ls/targets/TARGET_Silicon_Labs/sha1_alt.h → ...rs/mbedtls/TARGET_Silicon_Labs/sha1_alt.h
diff --git a/.../targets/TARGET_Silicon_Labs/sha256_alt.h → .../mbedtls/TARGET_Silicon_Labs/sha256_alt.h b/.../targets/TARGET_Silicon_Labs/sha256_alt.h → .../mbedtls/TARGET_Silicon_Labs/sha256_alt.h
diff --git a/features/mbedtls/LICENSE → connectivity/mbedtls/LICENSE b/features/mbedtls/LICENSE → connectivity/mbedtls/LICENSE
diff --git a/features/mbedtls/README.md → connectivity/mbedtls/README.md b/features/mbedtls/README.md → connectivity/mbedtls/README.md
diff --git a/features/mbedtls/VERSION.txt → connectivity/mbedtls/VERSION.txt b/features/mbedtls/VERSION.txt → connectivity/mbedtls/VERSION.txt
diff --git a/features/mbedtls/apache-2.0.txt → connectivity/mbedtls/apache-2.0.txt b/features/mbedtls/apache-2.0.txt → connectivity/mbedtls/apache-2.0.txt
diff --git a/features/mbedtls/inc/mbedtls/aes.h → connectivity/mbedtls/include/mbedtls/aes.h b/features/mbedtls/inc/mbedtls/aes.h → connectivity/mbedtls/include/mbedtls/aes.h
diff --git a/features/mbedtls/inc/mbedtls/aesni.h → connectivity/mbedtls/include/mbedtls/aesni.h b/features/mbedtls/inc/mbedtls/aesni.h → connectivity/mbedtls/include/mbedtls/aesni.h
diff --git a/features/mbedtls/inc/mbedtls/arc4.h → connectivity/mbedtls/include/mbedtls/arc4.h b/features/mbedtls/inc/mbedtls/arc4.h → connectivity/mbedtls/include/mbedtls/arc4.h
diff --git a/features/mbedtls/inc/mbedtls/aria.h → connectivity/mbedtls/include/mbedtls/aria.h b/features/mbedtls/inc/mbedtls/aria.h → connectivity/mbedtls/include/mbedtls/aria.h
diff --git a/features/mbedtls/inc/mbedtls/asn1.h → connectivity/mbedtls/include/mbedtls/asn1.h b/features/mbedtls/inc/mbedtls/asn1.h → connectivity/mbedtls/include/mbedtls/asn1.h
diff --git a/features/mbedtls/inc/mbedtls/asn1write.h → ...ivity/mbedtls/include/mbedtls/asn1write.h b/features/mbedtls/inc/mbedtls/asn1write.h → ...ivity/mbedtls/include/mbedtls/asn1write.h
diff --git a/features/mbedtls/inc/mbedtls/base64.h → ...ectivity/mbedtls/include/mbedtls/base64.h b/features/mbedtls/inc/mbedtls/base64.h → ...ectivity/mbedtls/include/mbedtls/base64.h
diff --git a/features/mbedtls/inc/mbedtls/bignum.h → ...ectivity/mbedtls/include/mbedtls/bignum.h b/features/mbedtls/inc/mbedtls/bignum.h → ...ectivity/mbedtls/include/mbedtls/bignum.h
diff --git a/features/mbedtls/inc/mbedtls/blowfish.h → ...tivity/mbedtls/include/mbedtls/blowfish.h b/features/mbedtls/inc/mbedtls/blowfish.h → ...tivity/mbedtls/include/mbedtls/blowfish.h
diff --git a/features/mbedtls/inc/mbedtls/bn_mul.h → ...ectivity/mbedtls/include/mbedtls/bn_mul.h b/features/mbedtls/inc/mbedtls/bn_mul.h → ...ectivity/mbedtls/include/mbedtls/bn_mul.h
diff --git a/features/mbedtls/inc/mbedtls/camellia.h → ...tivity/mbedtls/include/mbedtls/camellia.h b/features/mbedtls/inc/mbedtls/camellia.h → ...tivity/mbedtls/include/mbedtls/camellia.h
diff --git a/features/mbedtls/inc/mbedtls/ccm.h → connectivity/mbedtls/include/mbedtls/ccm.h b/features/mbedtls/inc/mbedtls/ccm.h → connectivity/mbedtls/include/mbedtls/ccm.h
diff --git a/features/mbedtls/inc/mbedtls/certs.h → connectivity/mbedtls/include/mbedtls/certs.h b/features/mbedtls/inc/mbedtls/certs.h → connectivity/mbedtls/include/mbedtls/certs.h
diff --git a/features/mbedtls/inc/mbedtls/chacha20.h → ...tivity/mbedtls/include/mbedtls/chacha20.h b/features/mbedtls/inc/mbedtls/chacha20.h → ...tivity/mbedtls/include/mbedtls/chacha20.h
diff --git a/features/mbedtls/inc/mbedtls/chachapoly.h → ...vity/mbedtls/include/mbedtls/chachapoly.h b/features/mbedtls/inc/mbedtls/chachapoly.h → ...vity/mbedtls/include/mbedtls/chachapoly.h
diff --git a/features/mbedtls/inc/mbedtls/check_config.h → ...ty/mbedtls/include/mbedtls/check_config.h b/features/mbedtls/inc/mbedtls/check_config.h → ...ty/mbedtls/include/mbedtls/check_config.h
diff --git a/features/mbedtls/inc/mbedtls/cipher.h → ...ectivity/mbedtls/include/mbedtls/cipher.h b/features/mbedtls/inc/mbedtls/cipher.h → ...ectivity/mbedtls/include/mbedtls/cipher.h
diff --git a/...res/mbedtls/inc/mbedtls/cipher_internal.h → ...mbedtls/include/mbedtls/cipher_internal.h b/...res/mbedtls/inc/mbedtls/cipher_internal.h → ...mbedtls/include/mbedtls/cipher_internal.h
diff --git a/features/mbedtls/inc/mbedtls/cmac.h → connectivity/mbedtls/include/mbedtls/cmac.h b/features/mbedtls/inc/mbedtls/cmac.h → connectivity/mbedtls/include/mbedtls/cmac.h
diff --git a/features/mbedtls/inc/mbedtls/compat-1.3.h → ...vity/mbedtls/include/mbedtls/compat-1.3.h b/features/mbedtls/inc/mbedtls/compat-1.3.h → ...vity/mbedtls/include/mbedtls/compat-1.3.h
diff --git a/...s/mbedtls/inc/mbedtls/config-no-entropy.h → ...edtls/include/mbedtls/config-no-entropy.h b/...s/mbedtls/inc/mbedtls/config-no-entropy.h → ...edtls/include/mbedtls/config-no-entropy.h
diff --git a/features/mbedtls/inc/mbedtls/config.h → ...ectivity/mbedtls/include/mbedtls/config.h b/features/mbedtls/inc/mbedtls/config.h → ...ectivity/mbedtls/include/mbedtls/config.h
diff --git a/features/mbedtls/inc/mbedtls/ctr_drbg.h → ...tivity/mbedtls/include/mbedtls/ctr_drbg.h b/features/mbedtls/inc/mbedtls/ctr_drbg.h → ...tivity/mbedtls/include/mbedtls/ctr_drbg.h
diff --git a/features/mbedtls/inc/mbedtls/debug.h → connectivity/mbedtls/include/mbedtls/debug.h b/features/mbedtls/inc/mbedtls/debug.h → connectivity/mbedtls/include/mbedtls/debug.h
diff --git a/features/mbedtls/inc/mbedtls/des.h → connectivity/mbedtls/include/mbedtls/des.h b/features/mbedtls/inc/mbedtls/des.h → connectivity/mbedtls/include/mbedtls/des.h
diff --git a/features/mbedtls/inc/mbedtls/dhm.h → connectivity/mbedtls/include/mbedtls/dhm.h b/features/mbedtls/inc/mbedtls/dhm.h → connectivity/mbedtls/include/mbedtls/dhm.h
diff --git a/features/mbedtls/inc/mbedtls/ecdh.h → connectivity/mbedtls/include/mbedtls/ecdh.h b/features/mbedtls/inc/mbedtls/ecdh.h → connectivity/mbedtls/include/mbedtls/ecdh.h
diff --git a/features/mbedtls/inc/mbedtls/ecdsa.h → connectivity/mbedtls/include/mbedtls/ecdsa.h b/features/mbedtls/inc/mbedtls/ecdsa.h → connectivity/mbedtls/include/mbedtls/ecdsa.h
diff --git a/features/mbedtls/inc/mbedtls/ecjpake.h → ...ctivity/mbedtls/include/mbedtls/ecjpake.h b/features/mbedtls/inc/mbedtls/ecjpake.h → ...ctivity/mbedtls/include/mbedtls/ecjpake.h
diff --git a/features/mbedtls/inc/mbedtls/ecp.h → connectivity/mbedtls/include/mbedtls/ecp.h b/features/mbedtls/inc/mbedtls/ecp.h → connectivity/mbedtls/include/mbedtls/ecp.h
diff --git a/features/mbedtls/inc/mbedtls/ecp_internal.h → ...ty/mbedtls/include/mbedtls/ecp_internal.h b/features/mbedtls/inc/mbedtls/ecp_internal.h → ...ty/mbedtls/include/mbedtls/ecp_internal.h
diff --git a/features/mbedtls/inc/mbedtls/entropy.h → ...ctivity/mbedtls/include/mbedtls/entropy.h b/features/mbedtls/inc/mbedtls/entropy.h → ...ctivity/mbedtls/include/mbedtls/entropy.h
diff --git a/features/mbedtls/inc/mbedtls/entropy_poll.h → ...ty/mbedtls/include/mbedtls/entropy_poll.h b/features/mbedtls/inc/mbedtls/entropy_poll.h → ...ty/mbedtls/include/mbedtls/entropy_poll.h
diff --git a/features/mbedtls/inc/mbedtls/error.h → connectivity/mbedtls/include/mbedtls/error.h b/features/mbedtls/inc/mbedtls/error.h → connectivity/mbedtls/include/mbedtls/error.h
diff --git a/features/mbedtls/inc/mbedtls/gcm.h → connectivity/mbedtls/include/mbedtls/gcm.h b/features/mbedtls/inc/mbedtls/gcm.h → connectivity/mbedtls/include/mbedtls/gcm.h
diff --git a/features/mbedtls/inc/mbedtls/havege.h → ...ectivity/mbedtls/include/mbedtls/havege.h b/features/mbedtls/inc/mbedtls/havege.h → ...ectivity/mbedtls/include/mbedtls/havege.h
diff --git a/features/mbedtls/inc/mbedtls/hkdf.h → connectivity/mbedtls/include/mbedtls/hkdf.h b/features/mbedtls/inc/mbedtls/hkdf.h → connectivity/mbedtls/include/mbedtls/hkdf.h
diff --git a/features/mbedtls/inc/mbedtls/hmac_drbg.h → ...ivity/mbedtls/include/mbedtls/hmac_drbg.h b/features/mbedtls/inc/mbedtls/hmac_drbg.h → ...ivity/mbedtls/include/mbedtls/hmac_drbg.h
diff --git a/features/mbedtls/inc/mbedtls/md.h → connectivity/mbedtls/include/mbedtls/md.h b/features/mbedtls/inc/mbedtls/md.h → connectivity/mbedtls/include/mbedtls/md.h
diff --git a/features/mbedtls/inc/mbedtls/md2.h → connectivity/mbedtls/include/mbedtls/md2.h b/features/mbedtls/inc/mbedtls/md2.h → connectivity/mbedtls/include/mbedtls/md2.h
diff --git a/features/mbedtls/inc/mbedtls/md4.h → connectivity/mbedtls/include/mbedtls/md4.h b/features/mbedtls/inc/mbedtls/md4.h → connectivity/mbedtls/include/mbedtls/md4.h
diff --git a/features/mbedtls/inc/mbedtls/md5.h → connectivity/mbedtls/include/mbedtls/md5.h b/features/mbedtls/inc/mbedtls/md5.h → connectivity/mbedtls/include/mbedtls/md5.h
diff --git a/features/mbedtls/inc/mbedtls/md_internal.h → ...ity/mbedtls/include/mbedtls/md_internal.h b/features/mbedtls/inc/mbedtls/md_internal.h → ...ity/mbedtls/include/mbedtls/md_internal.h
diff --git a/...mbedtls/inc/mbedtls/memory_buffer_alloc.h → ...tls/include/mbedtls/memory_buffer_alloc.h b/...mbedtls/inc/mbedtls/memory_buffer_alloc.h → ...tls/include/mbedtls/memory_buffer_alloc.h
diff --git a/features/mbedtls/inc/mbedtls/net.h → connectivity/mbedtls/include/mbedtls/net.h b/features/mbedtls/inc/mbedtls/net.h → connectivity/mbedtls/include/mbedtls/net.h
diff --git a/features/mbedtls/inc/mbedtls/net_sockets.h → ...ity/mbedtls/include/mbedtls/net_sockets.h b/features/mbedtls/inc/mbedtls/net_sockets.h → ...ity/mbedtls/include/mbedtls/net_sockets.h
diff --git a/features/mbedtls/inc/mbedtls/nist_kw.h → ...ctivity/mbedtls/include/mbedtls/nist_kw.h b/features/mbedtls/inc/mbedtls/nist_kw.h → ...ctivity/mbedtls/include/mbedtls/nist_kw.h
diff --git a/features/mbedtls/inc/mbedtls/oid.h → connectivity/mbedtls/include/mbedtls/oid.h b/features/mbedtls/inc/mbedtls/oid.h → connectivity/mbedtls/include/mbedtls/oid.h
diff --git a/features/mbedtls/inc/mbedtls/padlock.h → ...ctivity/mbedtls/include/mbedtls/padlock.h b/features/mbedtls/inc/mbedtls/padlock.h → ...ctivity/mbedtls/include/mbedtls/padlock.h
diff --git a/features/mbedtls/inc/mbedtls/pem.h → connectivity/mbedtls/include/mbedtls/pem.h b/features/mbedtls/inc/mbedtls/pem.h → connectivity/mbedtls/include/mbedtls/pem.h
diff --git a/features/mbedtls/inc/mbedtls/pk.h → connectivity/mbedtls/include/mbedtls/pk.h b/features/mbedtls/inc/mbedtls/pk.h → connectivity/mbedtls/include/mbedtls/pk.h
diff --git a/features/mbedtls/inc/mbedtls/pk_internal.h → ...ity/mbedtls/include/mbedtls/pk_internal.h b/features/mbedtls/inc/mbedtls/pk_internal.h → ...ity/mbedtls/include/mbedtls/pk_internal.h
diff --git a/features/mbedtls/inc/mbedtls/pkcs11.h → ...ectivity/mbedtls/include/mbedtls/pkcs11.h b/features/mbedtls/inc/mbedtls/pkcs11.h → ...ectivity/mbedtls/include/mbedtls/pkcs11.h
diff --git a/features/mbedtls/inc/mbedtls/pkcs12.h → ...ectivity/mbedtls/include/mbedtls/pkcs12.h b/features/mbedtls/inc/mbedtls/pkcs12.h → ...ectivity/mbedtls/include/mbedtls/pkcs12.h
diff --git a/features/mbedtls/inc/mbedtls/pkcs5.h → connectivity/mbedtls/include/mbedtls/pkcs5.h b/features/mbedtls/inc/mbedtls/pkcs5.h → connectivity/mbedtls/include/mbedtls/pkcs5.h
diff --git a/features/mbedtls/inc/mbedtls/platform.h → ...tivity/mbedtls/include/mbedtls/platform.h b/features/mbedtls/inc/mbedtls/platform.h → ...tivity/mbedtls/include/mbedtls/platform.h
diff --git a/features/mbedtls/inc/mbedtls/platform_time.h → ...y/mbedtls/include/mbedtls/platform_time.h b/features/mbedtls/inc/mbedtls/platform_time.h → ...y/mbedtls/include/mbedtls/platform_time.h
diff --git a/features/mbedtls/inc/mbedtls/platform_util.h → ...y/mbedtls/include/mbedtls/platform_util.h b/features/mbedtls/inc/mbedtls/platform_util.h → ...y/mbedtls/include/mbedtls/platform_util.h
diff --git a/features/mbedtls/inc/mbedtls/poly1305.h → ...tivity/mbedtls/include/mbedtls/poly1305.h b/features/mbedtls/inc/mbedtls/poly1305.h → ...tivity/mbedtls/include/mbedtls/poly1305.h
diff --git a/features/mbedtls/inc/mbedtls/psa_util.h → ...tivity/mbedtls/include/mbedtls/psa_util.h b/features/mbedtls/inc/mbedtls/psa_util.h → ...tivity/mbedtls/include/mbedtls/psa_util.h
diff --git a/features/mbedtls/inc/mbedtls/ripemd160.h → ...ivity/mbedtls/include/mbedtls/ripemd160.h b/features/mbedtls/inc/mbedtls/ripemd160.h → ...ivity/mbedtls/include/mbedtls/ripemd160.h
diff --git a/features/mbedtls/inc/mbedtls/rsa.h → connectivity/mbedtls/include/mbedtls/rsa.h b/features/mbedtls/inc/mbedtls/rsa.h → connectivity/mbedtls/include/mbedtls/rsa.h
diff --git a/features/mbedtls/inc/mbedtls/rsa_internal.h → ...ty/mbedtls/include/mbedtls/rsa_internal.h b/features/mbedtls/inc/mbedtls/rsa_internal.h → ...ty/mbedtls/include/mbedtls/rsa_internal.h
diff --git a/features/mbedtls/inc/mbedtls/sha1.h → connectivity/mbedtls/include/mbedtls/sha1.h b/features/mbedtls/inc/mbedtls/sha1.h → connectivity/mbedtls/include/mbedtls/sha1.h
diff --git a/features/mbedtls/inc/mbedtls/sha256.h → ...ectivity/mbedtls/include/mbedtls/sha256.h b/features/mbedtls/inc/mbedtls/sha256.h → ...ectivity/mbedtls/include/mbedtls/sha256.h
diff --git a/features/mbedtls/inc/mbedtls/sha512.h → ...ectivity/mbedtls/include/mbedtls/sha512.h b/features/mbedtls/inc/mbedtls/sha512.h → ...ectivity/mbedtls/include/mbedtls/sha512.h
diff --git a/features/mbedtls/inc/mbedtls/ssl.h → connectivity/mbedtls/include/mbedtls/ssl.h b/features/mbedtls/inc/mbedtls/ssl.h → connectivity/mbedtls/include/mbedtls/ssl.h
diff --git a/features/mbedtls/inc/mbedtls/ssl_cache.h → ...ivity/mbedtls/include/mbedtls/ssl_cache.h b/features/mbedtls/inc/mbedtls/ssl_cache.h → ...ivity/mbedtls/include/mbedtls/ssl_cache.h
diff --git a/...es/mbedtls/inc/mbedtls/ssl_ciphersuites.h → ...bedtls/include/mbedtls/ssl_ciphersuites.h b/...es/mbedtls/inc/mbedtls/ssl_ciphersuites.h → ...bedtls/include/mbedtls/ssl_ciphersuites.h
diff --git a/features/mbedtls/inc/mbedtls/ssl_cookie.h → ...vity/mbedtls/include/mbedtls/ssl_cookie.h b/features/mbedtls/inc/mbedtls/ssl_cookie.h → ...vity/mbedtls/include/mbedtls/ssl_cookie.h
diff --git a/features/mbedtls/inc/mbedtls/ssl_internal.h → ...ty/mbedtls/include/mbedtls/ssl_internal.h b/features/mbedtls/inc/mbedtls/ssl_internal.h → ...ty/mbedtls/include/mbedtls/ssl_internal.h
diff --git a/features/mbedtls/inc/mbedtls/ssl_ticket.h → ...vity/mbedtls/include/mbedtls/ssl_ticket.h b/features/mbedtls/inc/mbedtls/ssl_ticket.h → ...vity/mbedtls/include/mbedtls/ssl_ticket.h
diff --git a/features/mbedtls/inc/mbedtls/threading.h → ...ivity/mbedtls/include/mbedtls/threading.h b/features/mbedtls/inc/mbedtls/threading.h → ...ivity/mbedtls/include/mbedtls/threading.h
diff --git a/features/mbedtls/inc/mbedtls/timing.h → ...ectivity/mbedtls/include/mbedtls/timing.h b/features/mbedtls/inc/mbedtls/timing.h → ...ectivity/mbedtls/include/mbedtls/timing.h
diff --git a/features/mbedtls/inc/mbedtls/version.h → ...ctivity/mbedtls/include/mbedtls/version.h b/features/mbedtls/inc/mbedtls/version.h → ...ctivity/mbedtls/include/mbedtls/version.h
diff --git a/features/mbedtls/inc/mbedtls/x509.h → connectivity/mbedtls/include/mbedtls/x509.h b/features/mbedtls/inc/mbedtls/x509.h → connectivity/mbedtls/include/mbedtls/x509.h
diff --git a/features/mbedtls/inc/mbedtls/x509_crl.h → ...tivity/mbedtls/include/mbedtls/x509_crl.h b/features/mbedtls/inc/mbedtls/x509_crl.h → ...tivity/mbedtls/include/mbedtls/x509_crl.h
diff --git a/features/mbedtls/inc/mbedtls/x509_crt.h → ...tivity/mbedtls/include/mbedtls/x509_crt.h b/features/mbedtls/inc/mbedtls/x509_crt.h → ...tivity/mbedtls/include/mbedtls/x509_crt.h
diff --git a/features/mbedtls/inc/mbedtls/x509_csr.h → ...tivity/mbedtls/include/mbedtls/x509_csr.h b/features/mbedtls/inc/mbedtls/x509_csr.h → ...tivity/mbedtls/include/mbedtls/x509_csr.h
diff --git a/features/mbedtls/inc/mbedtls/xtea.h → connectivity/mbedtls/include/mbedtls/xtea.h b/features/mbedtls/inc/mbedtls/xtea.h → connectivity/mbedtls/include/mbedtls/xtea.h
diff --git a/features/mbedtls/mbed_lib.json → connectivity/mbedtls/mbed_lib.json b/features/mbedtls/mbed_lib.json → connectivity/mbedtls/mbed_lib.json
diff --git a/features/mbedtls/platform/inc/platform_alt.h → ...ivity/mbedtls/platform/inc/platform_alt.h b/features/mbedtls/platform/inc/platform_alt.h → ...ivity/mbedtls/platform/inc/platform_alt.h
diff --git a/...ures/mbedtls/platform/inc/platform_mbed.h → ...vity/mbedtls/platform/inc/platform_mbed.h b/...ures/mbedtls/platform/inc/platform_mbed.h → ...vity/mbedtls/platform/inc/platform_mbed.h
diff --git a/features/mbedtls/platform/inc/shared_rng.h → ...ctivity/mbedtls/platform/inc/shared_rng.h b/features/mbedtls/platform/inc/shared_rng.h → ...ctivity/mbedtls/platform/inc/shared_rng.h
diff --git a/features/mbedtls/platform/src/mbed_trng.cpp → ...tivity/mbedtls/platform/src/mbed_trng.cpp b/features/mbedtls/platform/src/mbed_trng.cpp → ...tivity/mbedtls/platform/src/mbed_trng.cpp
diff --git a/...res/mbedtls/platform/src/platform_alt.cpp → ...ity/mbedtls/platform/src/platform_alt.cpp b/...res/mbedtls/platform/src/platform_alt.cpp → ...ity/mbedtls/platform/src/platform_alt.cpp
diff --git a/features/mbedtls/platform/src/shared_rng.cpp → ...ivity/mbedtls/platform/src/shared_rng.cpp b/features/mbedtls/platform/src/shared_rng.cpp → ...ivity/mbedtls/platform/src/shared_rng.cpp
diff --git a/features/mbedtls/src/.gitignore → connectivity/mbedtls/source/.gitignore b/features/mbedtls/src/.gitignore → connectivity/mbedtls/source/.gitignore
diff --git a/features/mbedtls/src/Makefile → connectivity/mbedtls/source/Makefile b/features/mbedtls/src/Makefile → connectivity/mbedtls/source/Makefile
diff --git a/features/mbedtls/src/aes.c → connectivity/mbedtls/source/aes.c b/features/mbedtls/src/aes.c → connectivity/mbedtls/source/aes.c
diff --git a/features/mbedtls/src/aesni.c → connectivity/mbedtls/source/aesni.c b/features/mbedtls/src/aesni.c → connectivity/mbedtls/source/aesni.c
diff --git a/features/mbedtls/src/arc4.c → connectivity/mbedtls/source/arc4.c b/features/mbedtls/src/arc4.c → connectivity/mbedtls/source/arc4.c
diff --git a/features/mbedtls/src/aria.c → connectivity/mbedtls/source/aria.c b/features/mbedtls/src/aria.c → connectivity/mbedtls/source/aria.c
diff --git a/features/mbedtls/src/asn1parse.c → connectivity/mbedtls/source/asn1parse.c b/features/mbedtls/src/asn1parse.c → connectivity/mbedtls/source/asn1parse.c
diff --git a/features/mbedtls/src/asn1write.c → connectivity/mbedtls/source/asn1write.c b/features/mbedtls/src/asn1write.c → connectivity/mbedtls/source/asn1write.c
diff --git a/features/mbedtls/src/base64.c → connectivity/mbedtls/source/base64.c b/features/mbedtls/src/base64.c → connectivity/mbedtls/source/base64.c
diff --git a/features/mbedtls/src/bignum.c → connectivity/mbedtls/source/bignum.c b/features/mbedtls/src/bignum.c → connectivity/mbedtls/source/bignum.c
diff --git a/features/mbedtls/src/blowfish.c → connectivity/mbedtls/source/blowfish.c b/features/mbedtls/src/blowfish.c → connectivity/mbedtls/source/blowfish.c
diff --git a/features/mbedtls/src/camellia.c → connectivity/mbedtls/source/camellia.c b/features/mbedtls/src/camellia.c → connectivity/mbedtls/source/camellia.c
diff --git a/features/mbedtls/src/ccm.c → connectivity/mbedtls/source/ccm.c b/features/mbedtls/src/ccm.c → connectivity/mbedtls/source/ccm.c
diff --git a/features/mbedtls/src/certs.c → connectivity/mbedtls/source/certs.c b/features/mbedtls/src/certs.c → connectivity/mbedtls/source/certs.c
diff --git a/features/mbedtls/src/chacha20.c → connectivity/mbedtls/source/chacha20.c b/features/mbedtls/src/chacha20.c → connectivity/mbedtls/source/chacha20.c
diff --git a/features/mbedtls/src/chachapoly.c → connectivity/mbedtls/source/chachapoly.c b/features/mbedtls/src/chachapoly.c → connectivity/mbedtls/source/chachapoly.c
diff --git a/features/mbedtls/src/cipher.c → connectivity/mbedtls/source/cipher.c b/features/mbedtls/src/cipher.c → connectivity/mbedtls/source/cipher.c
diff --git a/features/mbedtls/src/cipher_wrap.c → connectivity/mbedtls/source/cipher_wrap.c b/features/mbedtls/src/cipher_wrap.c → connectivity/mbedtls/source/cipher_wrap.c
diff --git a/features/mbedtls/src/cmac.c → connectivity/mbedtls/source/cmac.c b/features/mbedtls/src/cmac.c → connectivity/mbedtls/source/cmac.c
diff --git a/features/mbedtls/src/ctr_drbg.c → connectivity/mbedtls/source/ctr_drbg.c b/features/mbedtls/src/ctr_drbg.c → connectivity/mbedtls/source/ctr_drbg.c
diff --git a/features/mbedtls/src/debug.c → connectivity/mbedtls/source/debug.c b/features/mbedtls/src/debug.c → connectivity/mbedtls/source/debug.c
diff --git a/features/mbedtls/src/des.c → connectivity/mbedtls/source/des.c b/features/mbedtls/src/des.c → connectivity/mbedtls/source/des.c
diff --git a/features/mbedtls/src/dhm.c → connectivity/mbedtls/source/dhm.c b/features/mbedtls/src/dhm.c → connectivity/mbedtls/source/dhm.c
diff --git a/features/mbedtls/src/ecdh.c → connectivity/mbedtls/source/ecdh.c b/features/mbedtls/src/ecdh.c → connectivity/mbedtls/source/ecdh.c
diff --git a/features/mbedtls/src/ecdsa.c → connectivity/mbedtls/source/ecdsa.c b/features/mbedtls/src/ecdsa.c → connectivity/mbedtls/source/ecdsa.c
diff --git a/features/mbedtls/src/ecjpake.c → connectivity/mbedtls/source/ecjpake.c b/features/mbedtls/src/ecjpake.c → connectivity/mbedtls/source/ecjpake.c
diff --git a/features/mbedtls/src/ecp.c → connectivity/mbedtls/source/ecp.c b/features/mbedtls/src/ecp.c → connectivity/mbedtls/source/ecp.c
diff --git a/features/mbedtls/src/ecp_curves.c → connectivity/mbedtls/source/ecp_curves.c b/features/mbedtls/src/ecp_curves.c → connectivity/mbedtls/source/ecp_curves.c
diff --git a/features/mbedtls/src/entropy.c → connectivity/mbedtls/source/entropy.c b/features/mbedtls/src/entropy.c → connectivity/mbedtls/source/entropy.c
diff --git a/features/mbedtls/src/entropy_poll.c → connectivity/mbedtls/source/entropy_poll.c b/features/mbedtls/src/entropy_poll.c → connectivity/mbedtls/source/entropy_poll.c
diff --git a/features/mbedtls/src/error.c → connectivity/mbedtls/source/error.c b/features/mbedtls/src/error.c → connectivity/mbedtls/source/error.c
diff --git a/features/mbedtls/src/gcm.c → connectivity/mbedtls/source/gcm.c b/features/mbedtls/src/gcm.c → connectivity/mbedtls/source/gcm.c
diff --git a/features/mbedtls/targets/hash_wrappers.c → connectivity/mbedtls/source/hash_wrappers.c b/features/mbedtls/targets/hash_wrappers.c → connectivity/mbedtls/source/hash_wrappers.c
diff --git a/features/mbedtls/src/havege.c → connectivity/mbedtls/source/havege.c b/features/mbedtls/src/havege.c → connectivity/mbedtls/source/havege.c
diff --git a/features/mbedtls/src/hkdf.c → connectivity/mbedtls/source/hkdf.c b/features/mbedtls/src/hkdf.c → connectivity/mbedtls/source/hkdf.c
diff --git a/features/mbedtls/src/hmac_drbg.c → connectivity/mbedtls/source/hmac_drbg.c b/features/mbedtls/src/hmac_drbg.c → connectivity/mbedtls/source/hmac_drbg.c
diff --git a/features/mbedtls/src/md.c → connectivity/mbedtls/source/md.c b/features/mbedtls/src/md.c → connectivity/mbedtls/source/md.c
diff --git a/features/mbedtls/src/md2.c → connectivity/mbedtls/source/md2.c b/features/mbedtls/src/md2.c → connectivity/mbedtls/source/md2.c
diff --git a/features/mbedtls/src/md4.c → connectivity/mbedtls/source/md4.c b/features/mbedtls/src/md4.c → connectivity/mbedtls/source/md4.c
diff --git a/features/mbedtls/src/md5.c → connectivity/mbedtls/source/md5.c b/features/mbedtls/src/md5.c → connectivity/mbedtls/source/md5.c
diff --git a/features/mbedtls/src/memory_buffer_alloc.c → ...vity/mbedtls/source/memory_buffer_alloc.c b/features/mbedtls/src/memory_buffer_alloc.c → ...vity/mbedtls/source/memory_buffer_alloc.c
diff --git a/features/mbedtls/src/net_sockets.c → connectivity/mbedtls/source/net_sockets.c b/features/mbedtls/src/net_sockets.c → connectivity/mbedtls/source/net_sockets.c
diff --git a/features/mbedtls/src/nist_kw.c → connectivity/mbedtls/source/nist_kw.c b/features/mbedtls/src/nist_kw.c → connectivity/mbedtls/source/nist_kw.c
diff --git a/features/mbedtls/src/oid.c → connectivity/mbedtls/source/oid.c b/features/mbedtls/src/oid.c → connectivity/mbedtls/source/oid.c
diff --git a/features/mbedtls/src/padlock.c → connectivity/mbedtls/source/padlock.c b/features/mbedtls/src/padlock.c → connectivity/mbedtls/source/padlock.c
diff --git a/features/mbedtls/src/pem.c → connectivity/mbedtls/source/pem.c b/features/mbedtls/src/pem.c → connectivity/mbedtls/source/pem.c
diff --git a/features/mbedtls/src/pk.c → connectivity/mbedtls/source/pk.c b/features/mbedtls/src/pk.c → connectivity/mbedtls/source/pk.c
diff --git a/features/mbedtls/src/pk_wrap.c → connectivity/mbedtls/source/pk_wrap.c b/features/mbedtls/src/pk_wrap.c → connectivity/mbedtls/source/pk_wrap.c
diff --git a/features/mbedtls/src/pkcs11.c → connectivity/mbedtls/source/pkcs11.c b/features/mbedtls/src/pkcs11.c → connectivity/mbedtls/source/pkcs11.c
diff --git a/features/mbedtls/src/pkcs12.c → connectivity/mbedtls/source/pkcs12.c b/features/mbedtls/src/pkcs12.c → connectivity/mbedtls/source/pkcs12.c
diff --git a/features/mbedtls/src/pkcs5.c → connectivity/mbedtls/source/pkcs5.c b/features/mbedtls/src/pkcs5.c → connectivity/mbedtls/source/pkcs5.c
diff --git a/features/mbedtls/src/pkparse.c → connectivity/mbedtls/source/pkparse.c b/features/mbedtls/src/pkparse.c → connectivity/mbedtls/source/pkparse.c
diff --git a/features/mbedtls/src/pkwrite.c → connectivity/mbedtls/source/pkwrite.c b/features/mbedtls/src/pkwrite.c → connectivity/mbedtls/source/pkwrite.c
diff --git a/features/mbedtls/src/platform.c → connectivity/mbedtls/source/platform.c b/features/mbedtls/src/platform.c → connectivity/mbedtls/source/platform.c
diff --git a/features/mbedtls/src/platform_util.c → connectivity/mbedtls/source/platform_util.c b/features/mbedtls/src/platform_util.c → connectivity/mbedtls/source/platform_util.c
diff --git a/features/mbedtls/src/poly1305.c → connectivity/mbedtls/source/poly1305.c b/features/mbedtls/src/poly1305.c → connectivity/mbedtls/source/poly1305.c
diff --git a/features/mbedtls/src/ripemd160.c → connectivity/mbedtls/source/ripemd160.c b/features/mbedtls/src/ripemd160.c → connectivity/mbedtls/source/ripemd160.c
diff --git a/features/mbedtls/src/rsa.c → connectivity/mbedtls/source/rsa.c b/features/mbedtls/src/rsa.c → connectivity/mbedtls/source/rsa.c
diff --git a/features/mbedtls/src/rsa_internal.c → connectivity/mbedtls/source/rsa_internal.c b/features/mbedtls/src/rsa_internal.c → connectivity/mbedtls/source/rsa_internal.c
diff --git a/features/mbedtls/src/sha1.c → connectivity/mbedtls/source/sha1.c b/features/mbedtls/src/sha1.c → connectivity/mbedtls/source/sha1.c
diff --git a/features/mbedtls/src/sha256.c → connectivity/mbedtls/source/sha256.c b/features/mbedtls/src/sha256.c → connectivity/mbedtls/source/sha256.c
diff --git a/features/mbedtls/src/sha512.c → connectivity/mbedtls/source/sha512.c b/features/mbedtls/src/sha512.c → connectivity/mbedtls/source/sha512.c
diff --git a/features/mbedtls/src/ssl_cache.c → connectivity/mbedtls/source/ssl_cache.c b/features/mbedtls/src/ssl_cache.c → connectivity/mbedtls/source/ssl_cache.c
diff --git a/features/mbedtls/src/ssl_ciphersuites.c → ...ctivity/mbedtls/source/ssl_ciphersuites.c b/features/mbedtls/src/ssl_ciphersuites.c → ...ctivity/mbedtls/source/ssl_ciphersuites.c
diff --git a/features/mbedtls/src/ssl_cli.c → connectivity/mbedtls/source/ssl_cli.c b/features/mbedtls/src/ssl_cli.c → connectivity/mbedtls/source/ssl_cli.c
diff --git a/features/mbedtls/src/ssl_cookie.c → connectivity/mbedtls/source/ssl_cookie.c b/features/mbedtls/src/ssl_cookie.c → connectivity/mbedtls/source/ssl_cookie.c
diff --git a/features/mbedtls/src/ssl_msg.c → connectivity/mbedtls/source/ssl_msg.c b/features/mbedtls/src/ssl_msg.c → connectivity/mbedtls/source/ssl_msg.c
diff --git a/features/mbedtls/src/ssl_srv.c → connectivity/mbedtls/source/ssl_srv.c b/features/mbedtls/src/ssl_srv.c → connectivity/mbedtls/source/ssl_srv.c
diff --git a/features/mbedtls/src/ssl_ticket.c → connectivity/mbedtls/source/ssl_ticket.c b/features/mbedtls/src/ssl_ticket.c → connectivity/mbedtls/source/ssl_ticket.c
diff --git a/features/mbedtls/src/ssl_tls.c → connectivity/mbedtls/source/ssl_tls.c b/features/mbedtls/src/ssl_tls.c → connectivity/mbedtls/source/ssl_tls.c
diff --git a/features/mbedtls/src/threading.c → connectivity/mbedtls/source/threading.c b/features/mbedtls/src/threading.c → connectivity/mbedtls/source/threading.c
diff --git a/features/mbedtls/src/timing.c → connectivity/mbedtls/source/timing.c b/features/mbedtls/src/timing.c → connectivity/mbedtls/source/timing.c
diff --git a/features/mbedtls/src/version.c → connectivity/mbedtls/source/version.c b/features/mbedtls/src/version.c → connectivity/mbedtls/source/version.c
diff --git a/features/mbedtls/src/version_features.c → ...ctivity/mbedtls/source/version_features.c b/features/mbedtls/src/version_features.c → ...ctivity/mbedtls/source/version_features.c
diff --git a/features/mbedtls/src/x509.c → connectivity/mbedtls/source/x509.c b/features/mbedtls/src/x509.c → connectivity/mbedtls/source/x509.c
diff --git a/features/mbedtls/src/x509_create.c → connectivity/mbedtls/source/x509_create.c b/features/mbedtls/src/x509_create.c → connectivity/mbedtls/source/x509_create.c
diff --git a/features/mbedtls/src/x509_crl.c → connectivity/mbedtls/source/x509_crl.c b/features/mbedtls/src/x509_crl.c → connectivity/mbedtls/source/x509_crl.c
diff --git a/features/mbedtls/src/x509_crt.c → connectivity/mbedtls/source/x509_crt.c b/features/mbedtls/src/x509_crt.c → connectivity/mbedtls/source/x509_crt.c
diff --git a/features/mbedtls/src/x509_csr.c → connectivity/mbedtls/source/x509_csr.c b/features/mbedtls/src/x509_csr.c → connectivity/mbedtls/source/x509_csr.c
diff --git a/features/mbedtls/src/x509write_crt.c → connectivity/mbedtls/source/x509write_crt.c b/features/mbedtls/src/x509write_crt.c → connectivity/mbedtls/source/x509write_crt.c
diff --git a/features/mbedtls/src/x509write_csr.c → connectivity/mbedtls/source/x509write_csr.c b/features/mbedtls/src/x509write_csr.c → connectivity/mbedtls/source/x509write_csr.c
diff --git a/features/mbedtls/src/xtea.c → connectivity/mbedtls/source/xtea.c b/features/mbedtls/src/xtea.c → connectivity/mbedtls/source/xtea.c
diff --git a/TESTS/mbedtls/multi/main.cpp → ...bedtls/tests/TESTS/mbedtls/multi/main.cpp b/TESTS/mbedtls/multi/main.cpp → ...bedtls/tests/TESTS/mbedtls/multi/main.cpp
diff --git a/TESTS/mbedtls/sanity/main.cpp → ...edtls/tests/TESTS/mbedtls/sanity/main.cpp b/TESTS/mbedtls/sanity/main.cpp → ...edtls/tests/TESTS/mbedtls/sanity/main.cpp
diff --git a/TESTS/mbedtls/selftest/main.cpp → ...tls/tests/TESTS/mbedtls/selftest/main.cpp b/TESTS/mbedtls/selftest/main.cpp → ...tls/tests/TESTS/mbedtls/selftest/main.cpp
diff --git a/features/mbedtls/importer/Makefile → connectivity/mbedtls/tools/importer/Makefile b/features/mbedtls/importer/Makefile → connectivity/mbedtls/tools/importer/Makefile
diff --git a/...mbedtls/importer/TARGET_IGNORE/.gitignore → ...s/tools/importer/TARGET_IGNORE/.gitignore b/...mbedtls/importer/TARGET_IGNORE/.gitignore → ...s/tools/importer/TARGET_IGNORE/.gitignore
diff --git a/...s/mbedtls/importer/adjust-check-config.sh → ...tls/tools/importer/adjust-check-config.sh b/...s/mbedtls/importer/adjust-check-config.sh → ...tls/tools/importer/adjust-check-config.sh
diff --git a/features/mbedtls/importer/adjust-config.sh → ...y/mbedtls/tools/importer/adjust-config.sh b/features/mbedtls/importer/adjust-config.sh → ...y/mbedtls/tools/importer/adjust-config.sh
diff --git a/...dtls/importer/adjust-no-entropy-config.sh → ...ools/importer/adjust-no-entropy-config.sh b/...dtls/importer/adjust-no-entropy-config.sh → ...ools/importer/adjust-no-entropy-config.sh
diff --git a/doxyfile_options b/doxyfile_options
@@ -843,7 +843,7 @@ EXCLUDE_PATTERNS       = */tools/* \
                          */cmsis/* \
                          */connectivity/drivers/emac/* \
                          */features/cryptocell/* \
-                         */features/mbedtls/* \
+                         */connectivity/mbedtls/* \
                          */features/unsupported/* \
                          */connectivity/lwipstack/* \
                          */connectivity/nanostack/sal-stack-nanostack/* \

diff --git a/doxygen_options.json b/doxygen_options.json
@@ -10,7 +10,7 @@
     "EXPAND_AS_DEFINED": "",
     "SKIP_FUNCTION_MACROS": "NO",
     "STRIP_CODE_COMMENTS": "NO",
-    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
+    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */connectivity/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
     "ALPHABETICAL_INDEX": "NO",
     "CASE_SENSE_NAMES": "NO",
     "DOT_MULTI_TARGETS": "YES",