michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Shell: Use on-air addresses when checking for OOB data

Browse source 
Authentication using OOB data uses the on-air device addresses used
during connection setup. So we need to check against the on-air
addresses in the info object to see if we have correct OOB data.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-08-07 13:30:08 +02:00 • committed by Carles Cufí
commit e242c250c4
1 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

53
subsys/bluetooth/shell/bt.c
View file

@ -1154,33 +1154,52 @@ static const char *oob_config_str(int oob_config)
} }
static void auth_pairing_oob_data_request(struct bt_conn *conn, static void auth_pairing_oob_data_request(struct bt_conn *conn,
struct bt_conn_oob_info *info) struct bt_conn_oob_info *oob_info)
{ {
char addr[BT_ADDR_LE_STR_LEN]; char addr[BT_ADDR_LE_STR_LEN];
struct bt_conn_info info;
int err;
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); err = bt_conn_get_info(conn, &info);
if (err) {
return;
}
if (info->lesc.oob_config != BT_CONN_OOB_LOCAL_ONLY && if (oob_info->type == BT_CONN_OOB_LE_SC) {
bt_addr_le_cmp(bt_conn_get_dst(conn), &oob_remote.addr)) { struct bt_le_oob_sc_data *oobd_local =
shell_print(ctx_shell, "No OOB data available for %s", addr); oob_info->lesc.oob_config != BT_CONN_OOB_REMOTE_ONLY
? &oob_local.le_sc_data
: NULL;
struct bt_le_oob_sc_data *oobd_remote =
oob_info->lesc.oob_config != BT_CONN_OOB_LOCAL_ONLY
? &oob_remote.le_sc_data
: NULL;
if (oobd_remote &&
bt_addr_le_cmp(info.le.remote, &oob_remote.addr)) {
bt_addr_le_to_str(info.le.remote, addr, sizeof(addr));
shell_print(ctx_shell,
"No OOB data available for remote %s",
addr);
bt_conn_auth_cancel(conn); bt_conn_auth_cancel(conn);
return; return;
} }
if (info->type == BT_CONN_OOB_LE_SC) { if (oobd_local &&
struct bt_le_oob_sc_data *oobd_local = bt_addr_le_cmp(info.le.local, &oob_local.addr)) {
info->lesc.oob_config != BT_CONN_OOB_REMOTE_ONLY bt_addr_le_to_str(info.le.local, addr, sizeof(addr));
? &oob_local.le_sc_data shell_print(ctx_shell,
: NULL; "No OOB data available for local %s",
struct bt_le_oob_sc_data *oobd_remote = addr);
info->lesc.oob_config != BT_CONN_OOB_LOCAL_ONLY bt_conn_auth_cancel(conn);
? &oob_remote.le_sc_data return;
: NULL; }
bt_le_oob_set_sc_data(conn, oobd_local,
oobd_remote);
bt_le_oob_set_sc_data(conn, oobd_local, oobd_remote);
bt_addr_le_to_str(info.le.dst, addr, sizeof(addr));
shell_print(ctx_shell, "Set %s OOB SC data for %s, ", shell_print(ctx_shell, "Set %s OOB SC data for %s, ",
oob_config_str(info->lesc.oob_config), addr); oob_config_str(oob_info->lesc.oob_config), addr);
} else { } else {
shell_print(ctx_shell, "Legacy OOB not supported"); shell_print(ctx_shell, "Legacy OOB not supported");
bt_conn_auth_cancel(conn); bt_conn_auth_cancel(conn);