michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Fix setting pairing method for LE SC

Browse source 
request_tk is called only for legacy pairing. Due to this pairing
method must be selected in pairing request or response handler to
cover LE SC case. But it must be selected only after it is known if
pairing is legacy or LE SC.

Change-Id: I0418a679b73c199acff12795157389d5969adb05
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-11-18 15:56:50 +01:00 • committed by Anas Nashif
commit 744cb36d79
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
net/bluetooth/smp.c
View file

@ -743,14 +743,12 @@ static uint8_t get_auth(uint8_t auth)
return auth;
}
static uint8_t smp_request_tk(struct bt_smp *smp, uint8_t remote_io)
static uint8_t smp_request_tk(struct bt_smp *smp)
{
struct bt_conn *conn = smp->chan.conn;
struct bt_keys *keys;
uint32_t passkey;
smp->method = get_pair_method(smp, remote_io);
/* Fail if we have keys that are stronger than keys that will be
* distributed in new pairing. This is to avoid replacing authenticated
* keys with unauthenticated ones.
@ -921,13 +919,15 @@ static uint8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
atomic_set_bit(&smp->flags, SMP_FLAG_PAIRING);
smp_restart_timer(smp);
smp->method = get_pair_method(smp, req->io_capability);
if (atomic_test_bit(&smp->flags, SMP_FLAG_SC)) {
return 0;
}
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PAIRING_CONFIRM);
return smp_request_tk(smp, req->io_capability);
return smp_request_tk(smp);
}
#else
static uint8_t smp_pairing_req(struct bt_smp *smp, struct net_buf *buf)
@ -1222,15 +1222,19 @@ static uint8_t smp_pairing_rsp(struct bt_smp *smp, struct net_buf *buf)
if ((rsp->auth_req & BT_SMP_AUTH_SC) &&
(req->auth_req & BT_SMP_AUTH_SC)) {
atomic_set_bit(&smp->flags, SMP_FLAG_SC);
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PUBLIC_KEY);
}
smp->method = get_pair_method(smp, rsp->io_capability);
if (atomic_test_bit(&smp->flags, SMP_FLAG_SC)) {
smp->local_dist &= SEND_KEYS_SC;
smp->remote_dist &= RECV_KEYS_SC;
atomic_set_bit(&smp->allowed_cmds, BT_SMP_CMD_PUBLIC_KEY);
return sc_send_public_key(smp);
}
ret = smp_request_tk(smp, rsp->io_capability);
ret = smp_request_tk(smp);
if (ret) {
return ret;
}