bluetooth: mesh: remove tinycrypt support

Tinycrypt support deprecated in Zephyr 4.0 release.
Time to remove it.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>

Author: alxelax

include/zephyr/bluetooth/mesh/keys.h

@@ -12,34 +12,18 @@
 #define ZEPHYR_INCLUDE_BLUETOOTH_MESH_KEYS_H_
 
 #include <stdint.h>
-#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA || defined CONFIG_BT_MESH_USES_TFM_PSA
 #include <psa/crypto.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA || defined CONFIG_BT_MESH_USES_TFM_PSA
-
 /** The structure that keeps representation of key. */
 struct bt_mesh_key {
 	/** PSA key representation is the PSA key identifier. */
 	psa_key_id_t key;
 };
 
-#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
-
-/** The structure that keeps representation of key. */
-struct bt_mesh_key {
-	/** tinycrypt key representation is the pure key value. */
-	uint8_t key[16];
-};
-
-#else
-#error "Crypto library has not been chosen"
-#endif
-
 #ifdef __cplusplus
 }
 #endif

subsys/bluetooth/mesh/CMakeLists.txt

@@ -13,6 +13,7 @@ zephyr_library_sources_ifdef(CONFIG_BT_MESH
     app_keys.c
     heartbeat.c
     crypto.c
+    crypto_psa.c
     access.c
     msg.c
     cfg_srv.c
@@ -123,12 +124,6 @@ zephyr_library_sources_ifdef(CONFIG_BT_MESH_STATISTIC statistic.c)
 
 zephyr_library_sources_ifdef(CONFIG_BT_MESH_ACCESS_DELAYABLE_MSG delayable_msg.c)
 
-if (CONFIG_BT_MESH_USES_TINYCRYPT)
-    zephyr_library_sources(crypto_tc.c)
-else()
-    zephyr_library_sources(crypto_psa.c)
-endif()
-
 zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
 
 zephyr_library_include_directories_ifdef(CONFIG_BUILD_WITH_TFM

subsys/bluetooth/mesh/Kconfig

@@ -1494,19 +1494,6 @@ choice BT_MESH_CRYPTO_LIB
 	help
 	  Crypto library selection for mesh security.
 
-config BT_MESH_USES_TINYCRYPT
-	bool "TinyCrypt [DEPRECATED]"
-	select DEPRECATED
-	select TINYCRYPT
-	select TINYCRYPT_AES
-	select TINYCRYPT_AES_CMAC
-	select TINYCRYPT_ECC_DH
-	select TINYCRYPT_SHA256
-	select TINYCRYPT_SHA256_HMAC
-	select BT_HOST_CCM
-	help
-	  Use TinyCrypt library to perform crypto operations.
-
 config BT_MESH_USES_MBEDTLS_PSA
 	bool "mbed TLS PSA"
 	select MBEDTLS

subsys/bluetooth/mesh/crypto_tc.c

@@ -13,42 +13,8 @@ enum bt_mesh_key_type {
 	BT_MESH_KEY_TYPE_DEV
 };
 
-#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA || defined CONFIG_BT_MESH_USES_TFM_PSA
-
 int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct bt_mesh_key *out);
 int bt_mesh_key_export(uint8_t out[16], const struct bt_mesh_key *in);
 void bt_mesh_key_assign(struct bt_mesh_key *dst, const struct bt_mesh_key *src);
 int bt_mesh_key_destroy(const struct bt_mesh_key *key);
 int bt_mesh_key_compare(const uint8_t raw_key[16], const struct bt_mesh_key *mesh_key);
-
-#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
-
-static inline int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16],
-				     struct bt_mesh_key *out)
-{
-	memcpy(out, in, 16);
-	return 0;
-}
-
-static inline int bt_mesh_key_export(uint8_t out[16], const struct bt_mesh_key *in)
-{
-	memcpy(out, in, 16);
-	return 0;
-}
-
-static inline void bt_mesh_key_assign(struct bt_mesh_key *dst, const struct bt_mesh_key *src)
-{
-	memcpy(dst, src, sizeof(struct bt_mesh_key));
-}
-
-static inline int bt_mesh_key_destroy(const struct bt_mesh_key *key)
-{
-	return 0;
-}
-
-static inline int bt_mesh_key_compare(const uint8_t raw_key[16], const struct bt_mesh_key *mesh_key)
-{
-	return memcmp(mesh_key, raw_key, 16);
-}
-
-#endif