Skip to content

tests: Bluetooth: Mesh: remove key ID distribution in mesh bsim #85069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kartben merged 2 commits into from
Feb 17, 2025
Merged

tests: Bluetooth: Mesh: remove key ID distribution in mesh bsim #85069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f92b8c
tests: Bluetooth: Mesh: remove key id distribution
alxelax Feb 12, 2025
c466797
Bluetooth: Mesh: remove weak attribute and rename functions
alxelax Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions subsys/bluetooth/mesh/crypto_psa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ int bt_mesh_dhkey_gen(const uint8_t *pub_key, const uint8_t *priv_key, uint8_t *
return err;
}

__weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
static psa_key_id_t bt_mesh_psa_keyid_alloc(void)
{
for (int i = 0; i < BT_MESH_PSA_KEY_ID_RANGE_SIZE; i++) {
if (!atomic_test_bit(pst_keys, i)) {
Expand All @@ -365,7 +365,7 @@ __weak psa_key_id_t bt_mesh_user_keyid_alloc(void)
return PSA_KEY_ID_NULL;
}

__weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
static int bt_mesh_psa_keyid_free(psa_key_id_t key_id)
{
if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
Expand All @@ -376,7 +376,7 @@ __weak int bt_mesh_user_keyid_free(psa_key_id_t key_id)
return -EIO;
}

__weak void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
static void bt_mesh_psa_keyid_assign(psa_key_id_t key_id)
{
if (IN_RANGE(key_id, BT_MESH_PSA_KEY_ID_MIN,
BT_MESH_PSA_KEY_ID_MIN + BT_MESH_PSA_KEY_ID_RANGE_SIZE - 1)) {
Expand Down Expand Up @@ -412,7 +412,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
break;
case BT_MESH_KEY_TYPE_NET:
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
key_id = bt_mesh_user_keyid_alloc();
key_id = bt_mesh_psa_keyid_alloc();

if (key_id == PSA_KEY_ID_NULL) {
return -ENOMEM;
Expand All @@ -428,7 +428,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
case BT_MESH_KEY_TYPE_APP:
case BT_MESH_KEY_TYPE_DEV:
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
key_id = bt_mesh_user_keyid_alloc();
key_id = bt_mesh_psa_keyid_alloc();

if (key_id == PSA_KEY_ID_NULL) {
return -ENOMEM;
Expand Down Expand Up @@ -456,7 +456,7 @@ int bt_mesh_key_import(enum bt_mesh_key_type type, const uint8_t in[16], struct
status == PSA_ERROR_ALREADY_EXISTS ? -EALREADY : -EIO;

if (err && key_id != PSA_KEY_ID_NULL) {
bt_mesh_user_keyid_free(key_id);
bt_mesh_psa_keyid_free(key_id);
}

psa_reset_key_attributes(&key_attributes);
Expand All @@ -483,7 +483,7 @@ void bt_mesh_key_assign(struct bt_mesh_key *dst, const struct bt_mesh_key *src)
{
memcpy(dst, src, sizeof(struct bt_mesh_key));
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
bt_mesh_user_keyid_assign(dst->key);
bt_mesh_psa_keyid_assign(dst->key);
}
}

Expand All @@ -494,7 +494,7 @@ int bt_mesh_key_destroy(const struct bt_mesh_key *key)
}

if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
return bt_mesh_user_keyid_free(key->key);
return bt_mesh_psa_keyid_free(key->key);
}

return 0;
Expand Down
6 changes: 0 additions & 6 deletions tests/bsim/bluetooth/mesh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ if(CONFIG_SETTINGS)
src/test_brg.c
)

if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
target_sources(app PRIVATE
src/distribute_keyid.c
)
endif()

if(CONFIG_BT_MESH_GATT_PROXY AND CONFIG_BT_MESH_PROXY_SOLICITATION)
target_sources(app PRIVATE
src/test_proxy_sol.c
Expand Down
72 changes: 0 additions & 72 deletions tests/bsim/bluetooth/mesh/src/distribute_keyid.c
View file
Open in desktop

This file was deleted.

Loading