diff --git a/.astyleignore b/.astyleignore index ba97ee2e08..bf9785794e 100644 --- a/.astyleignore +++ b/.astyleignore @@ -7,7 +7,6 @@ ^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 diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/Readme.md b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/Readme.md similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/Readme.md rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/Readme.md diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_ext.ar b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_ext.ar similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_ext.ar rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_ext.ar diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_trng.ar b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_trng.ar similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_trng.ar rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_ARM/libcc_310_trng.ar diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_ext.a b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_ext.a similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_ext.a rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_ext.a diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_trng.a b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_trng.a similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_trng.a rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_GCC_ARM/libcc_310_trng.a diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_ext.a b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_ext.a similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_ext.a rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_ext.a diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_trng.a b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_trng.a similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_trng.a rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/TOOLCHAIN_IAR/lib_cc310_trng.a diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_device_platform.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_ARM/libcc_310_core.ar b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_ARM/libcc_310_core.ar similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_ARM/libcc_310_core.ar rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_ARM/libcc_310_core.ar diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_GCC_ARM/libcc_310_core.a b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_GCC_ARM/libcc_310_core.a similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_GCC_ARM/libcc_310_core.a rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_GCC_ARM/libcc_310_core.a diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_IAR/lib_cc310_core.a b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_IAR/lib_cc310_core.a similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_IAR/lib_cc310_core.a rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/binaries/TOOLCHAIN_IAR/lib_cc310_core.a diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/aes_alt.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/aes_alt.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/aes_alt.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/aes_alt.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/cc_internal.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/cc_internal.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/ccm_alt.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/ccm_alt.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/cmac_alt.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/cmac_alt.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/cmac_alt.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/cmac_alt.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ccsw_crys_rsa_shared_types.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ccsw_crys_rsa_shared_types.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ccsw_crys_rsa_shared_types.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ccsw_crys_rsa_shared_types.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_aesccm.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_aesccm.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_aesccm.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_aesccm.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_aesccm_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_aesccm_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_aesccm_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_aesccm_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha_poly.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha_poly.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha_poly.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha_poly.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha_poly_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha_poly_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_chacha_poly_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_chacha_poly_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_common.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_common.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_common.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_common.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_common_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_common_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_common_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_common_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_dh.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_dh.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_dh.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_dh.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_dh_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_dh_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_dh_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_dh_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_dh_kg.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_dh_kg.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_dh_kg.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_dh_kg.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ec_edw_api.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ec_edw_api.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ec_edw_api.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ec_edw_api.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ec_mont_api.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ec_mont_api.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ec_mont_api.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ec_mont_api.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ec_mont_edw_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ec_mont_edw_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ec_mont_edw_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ec_mont_edw_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_build.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_build.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_build.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_build.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_dh.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_dh.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_dh.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_dh.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_domain.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_domain.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_domain.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_domain.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_ecdsa.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_ecdsa.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_ecdsa.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_ecdsa.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_kg.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_kg.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_kg.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_kg.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_types.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_types.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_ecpki_types.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_ecpki_types.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hash.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hash.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hash.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hash.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hash_defs.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hash_defs.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hash_defs.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hash_defs.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hash_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hash_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hash_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hash_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hkdf.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hkdf.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hkdf.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hkdf.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hkdf_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hkdf_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hkdf_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hkdf_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hmac.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hmac.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hmac.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hmac.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hmac_defs.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hmac_defs.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hmac_defs.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hmac_defs.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hmac_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hmac_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_hmac_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_hmac_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_kdf.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_kdf.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_kdf.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_kdf.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_kdf_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_kdf_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_kdf_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_kdf_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_pka_defs_hw.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_pka_defs_hw.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_pka_defs_hw.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_pka_defs_hw.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_poly.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_poly.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_poly.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_poly.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_poly_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_poly_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_poly_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_poly_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rnd.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rnd.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rnd.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rnd.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rnd_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rnd_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rnd_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rnd_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_build.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_build.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_build.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_build.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_kg.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_kg.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_kg.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_kg.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_prim.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_prim.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_prim.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_prim.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_schemes.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_schemes.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_schemes.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_schemes.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_types.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_types.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_rsa_types.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_rsa_types.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_srp.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_srp.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_srp.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_srp.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_srp_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_srp_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/crys_srp_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/crys_srp_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/driver_defs.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/driver_defs.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/driver_defs.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/driver_defs.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/sns_silib.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/sns_silib.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/sns_silib.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/sns_silib.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_aes.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_aes.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_aes.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_aes.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_aes_defs.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_aes_defs.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_aes_defs.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_aes_defs.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_aes_error.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_aes_error.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_aes_error.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_aes_error.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_compiler.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_compiler.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_compiler.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_compiler.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_trng.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_trng.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_trng.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_trng.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_types.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_types.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_types.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_types.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_types_plat.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_types_plat.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pal_types_plat.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pal_types_plat.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pka_hw_plat_defs.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pka_hw_plat_defs.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/include/ssi_pka_hw_plat_defs.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/internal/ssi_pka_hw_plat_defs.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/mbedtls_device.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/mbedtls_device.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/mbedtls_device.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/mbedtls_device.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/objects_cryptocell.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/objects_cryptocell.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/objects_cryptocell.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/objects_cryptocell.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/sha1_alt.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/sha1_alt.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/sha256_alt.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/sha256_alt.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha512_alt.h b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/sha512_alt.h similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/sha512_alt.h rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include/cryptocell310/sha512_alt.h diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/mbed_lib.json b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/mbed_lib.json similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/mbed_lib.json rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/mbed_lib.json diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/aes_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/aes_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/aes_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/aes_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/cc_internal.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/cc_internal.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/cc_internal.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/ccm_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/ccm_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/cmac_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/cmac_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/cmac_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/cmac_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ecdh_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/ecdh_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/ecdh_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/ecdh_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/ecdsa_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/ecdsa_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/sha1_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/sha1_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/sha256_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/sha256_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha512_alt.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/sha512_alt.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/sha512_alt.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/sha512_alt.c diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/trng.c b/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/trng.c similarity index 100% rename from features/cryptocell/FEATURE_CRYPTOCELL310/trng.c rename to connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/source/trng.c