michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Fix LE SC JustWorks pairing as slave

Browse source 
In JustWorks/PasskeyConfirmation pairing slave doesn't check remote
confirmation value (as it doesn't receive one). Factor out confirmation
check to helper and use it only when needed. This keeps code easy to
understand.

Change-Id: Ifb31bc3f2b53586a9c92b29b01e9832c124b0951
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-12-03 12:38:27 +01:00 • committed by Anas Nashif
commit 70ed77861e
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
net/bluetooth/smp.c
View file

@ -1582,14 +1582,10 @@ void bt_smp_dhkey_ready(const uint8_t *dhkey)
}
}
static uint8_t sc_smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
static uint8_t sc_smp_check_confirm(struct bt_smp *smp)
{
uint32_t passkey;
uint8_t cfm[16];
uint8_t r;
int err;
BT_DBG("");
switch (smp->method) {
case PASSKEY_CONFIRM:
@ -1607,14 +1603,12 @@ static uint8_t sc_smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
*/
r = (smp->passkey >> smp->passkey_round) & 0x01;
r |= 0x80;
break;
default:
return BT_SMP_ERR_UNSPECIFIED;
}
err = smp_f4(smp->pkey, bt_dev.pkey, smp->rrnd, r, cfm);
if (err) {
if (smp_f4(smp->pkey, bt_dev.pkey, smp->rrnd, r, cfm)) {
return BT_SMP_ERR_UNSPECIFIED;
}
@ -1624,8 +1618,23 @@ static uint8_t sc_smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
return BT_SMP_ERR_CONFIRM_FAILED;
}
return 0;
}
static uint8_t sc_smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
{
uint32_t passkey;
uint8_t err;
BT_DBG("");
#if defined(CONFIG_BLUETOOTH_CENTRAL)
if (smp->chan.conn->role == BT_HCI_ROLE_MASTER) {
err = sc_smp_check_confirm(smp);
if (err) {
return err;
}
switch (smp->method) {
case PASSKEY_CONFIRM:
/* compare passkey before calculating LTK */
@ -1683,6 +1692,11 @@ static uint8_t sc_smp_pairing_random(struct bt_smp *smp, struct net_buf *buf)
break;
case PASSKEY_DISPLAY:
case PASSKEY_INPUT:
err = sc_smp_check_confirm(smp);
if (err) {
return err;
}
atomic_set_bit(&smp->allowed_cmds,
BT_SMP_CMD_PAIRING_CONFIRM);
smp_send_pairing_random(smp);