michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bt-mesh: deprecate BT_MESH_USES_TINYCRYPT

Browse source 
Since the TinyCrypt library is being deprecated in Zephyr, this
commit set TinyCrypt usage in BT mesh as deprecated and it sets
Mbed TLS PSA Crypto API as the default option (when TF-M is not
available).
Tests are also updated in this commit.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
This commit is contained in:
Valerio Setti 2024-10-18 06:03:54 +02:00 • committed by Anas Nashif
commit 0f4875b7d0
6 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/bluetooth/mesh/brg/CMakeLists.txt
View file

@ -19,4 +19,4 @@ target_compile_options(app
-DCONFIG_BT_SETTINGS
-DCONFIG_BT_MESH_BRG_CFG_SRV
-DCONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX=16
-DCONFIG_BT_MESH_USES_TINYCRYPT)
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA)

2
tests/bluetooth/mesh/delayable_msg/CMakeLists.txt
View file

@ -20,4 +20,4 @@ target_compile_options(app
-DCONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_COUNT=4
-DCONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_CHUNK_SIZE=20
-DCONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_CHUNK_COUNT=20
-DCONFIG_BT_MESH_USES_TINYCRYPT)
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA)

2
tests/bluetooth/mesh/rpl/CMakeLists.txt
View file

@ -19,4 +19,4 @@ target_compile_options(app
-DCONFIG_BT_MESH_CRPL=10
-DCONFIG_BT_MESH_RPL_STORE_TIMEOUT=1
-DCONFIG_BT_SETTINGS
-DCONFIG_BT_MESH_USES_TINYCRYPT)
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA)

11
tests/bsim/bluetooth/mesh/src/test_provision.c
View file

@ -15,10 +15,6 @@
#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
#include <psa/crypto.h>
#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
#include <tinycrypt/constants.h>
#include <tinycrypt/ecc.h>
#include <tinycrypt/ecc_dh.h>
#else
#error "Unknown crypto library has been chosen"
#endif
@ -435,7 +431,6 @@ static void oob_auth_set(int test_step)
prov.input_actions = oob_auth_test_vector[test_step].input_actions;
}
#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
static void generate_oob_key_pair(void)
{
psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
@ -470,12 +465,6 @@ static void generate_oob_key_pair(void)
memcpy(public_key_be, public_key_repr + 1, 64);
}
#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
static void generate_oob_key_pair(void)
{
ASSERT_TRUE(uECC_make_key(public_key_be, private_key_be, uECC_secp256r1()));
}
#endif
static void oob_device(bool use_oob_pk)
{