michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Move bt_smp_keys_check function up

Browse source 
Move the bt_smp_keys_check function above all usage of the function
in order to avoid prototype declaration when making the function static.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-09-24 13:50:46 +02:00 • committed by Andrew Boie
commit d50b1ac301
1 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
subsys/bluetooth/host/smp.c
View file

@ -308,6 +308,42 @@ no_callbacks:
static u8_t legacy_get_pair_method(struct bt_smp *smp, u8_t remote_io); static u8_t legacy_get_pair_method(struct bt_smp *smp, u8_t remote_io);
#endif #endif
bool bt_smp_keys_check(struct bt_conn *conn)
{
if (atomic_test_bit(conn->flags, BT_CONN_FORCE_PAIR)) {
return false;
}
if (!conn->le.keys) {
conn->le.keys = bt_keys_find(BT_KEYS_LTK_P256,
conn->id, &conn->le.dst);
if (!conn->le.keys) {
conn->le.keys = bt_keys_find(BT_KEYS_LTK,
conn->id,
&conn->le.dst);
}
}
if (!conn->le.keys ||
!(conn->le.keys->keys & (BT_KEYS_LTK | BT_KEYS_LTK_P256))) {
return false;
}
if (conn->required_sec_level > BT_SECURITY_L2 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED)) {
return false;
}
if (conn->required_sec_level > BT_SECURITY_L3 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED) &&
!(conn->le.keys->keys & BT_KEYS_LTK_P256) &&
!(conn->le.keys->enc_size == BT_SMP_MAX_ENC_KEY_SIZE)) {
return false;
}
return true;
}
static u8_t get_pair_method(struct bt_smp *smp, u8_t remote_io) static u8_t get_pair_method(struct bt_smp *smp, u8_t remote_io)
{ {
struct bt_smp_pairing *req, *rsp; struct bt_smp_pairing *req, *rsp;
@ -5058,42 +5094,6 @@ bool bt_smp_get_tk(struct bt_conn *conn, u8_t *tk)
return true; return true;
} }
bool bt_smp_keys_check(struct bt_conn *conn)
{
if (atomic_test_bit(conn->flags, BT_CONN_FORCE_PAIR)) {
return false;
}
if (!conn->le.keys) {
conn->le.keys = bt_keys_find(BT_KEYS_LTK_P256,
conn->id, &conn->le.dst);
if (!conn->le.keys) {
conn->le.keys = bt_keys_find(BT_KEYS_LTK,
conn->id,
&conn->le.dst);
}
}
if (!conn->le.keys ||
!(conn->le.keys->keys & (BT_KEYS_LTK | BT_KEYS_LTK_P256))) {
return false;
}
if (conn->required_sec_level > BT_SECURITY_L2 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED)) {
return false;
}
if (conn->required_sec_level > BT_SECURITY_L3 &&
!(conn->le.keys->flags & BT_KEYS_AUTHENTICATED) &&
!(conn->le.keys->keys & BT_KEYS_LTK_P256) &&
!(conn->le.keys->enc_size == BT_SMP_MAX_ENC_KEY_SIZE)) {
return false;
}
return true;
}
void bt_smp_keys_reject(struct bt_conn *conn) void bt_smp_keys_reject(struct bt_conn *conn)
{ {
struct bt_smp *smp; struct bt_smp *smp;