michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: SMP: Forbid JustWorks re-pairing of authenticated keys

Browse source 
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.

Change-Id: If81b158f68a818d7a6e5d2854b482f34516b4737
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-08-26 17:57:26 +02:00 • committed by Anas Nashif
commit ae10411267
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
net/bluetooth/smp.c
View file

@ -406,10 +406,22 @@ static uint8_t get_auth(uint8_t auth)
static uint8_t smp_request_tk(struct bt_conn *conn, uint8_t remote_io)
{
struct bt_smp *smp = conn->smp;
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.
*/
keys = bt_keys_find_addr(&conn->dst);
if (keys && keys->type == BT_KEYS_AUTHENTICATED &&
smp->method == JUST_WORKS) {
BT_ERR("JustWorks failed, authenticated keys present\n");
return BT_SMP_ERR_UNSPECIFIED;
}
switch (smp->method) {
case PASSKEY_DISPLAY:
if (le_rand(&passkey, sizeof(passkey))) {