emulator: Include Link Key in key distribution if BR/EDR is supported
diff --git a/emulator/bthost.c b/emulator/bthost.c
index 3638fe4..2bcdc31 100644
--- a/emulator/bthost.c
+++ b/emulator/bthost.c
@@ -2329,6 +2329,11 @@
&cmd, sizeof(cmd));
}
+bool bthost_bredr_capable(struct bthost *bthost)
+{
+ return lmp_bredr_capable(bthost);
+}
+
void bthost_request_auth(struct bthost *bthost, uint16_t handle)
{
struct btconn *conn;
diff --git a/emulator/bthost.h b/emulator/bthost.h
index 7110db8..553865a 100644
--- a/emulator/bthost.h
+++ b/emulator/bthost.h
@@ -108,6 +108,8 @@
void bthost_set_reject_user_confirm(struct bthost *bthost, bool reject);
bool bthost_get_reject_user_confirm(struct bthost *bthost);
+bool bthost_bredr_capable(struct bthost *bthost);
+
uint64_t bthost_conn_get_fixed_chan(struct bthost *bthost, uint16_t handle);
typedef void (*bthost_rfcomm_connect_cb) (uint16_t handle, uint16_t cid,
diff --git a/emulator/smp.c b/emulator/smp.c
index e941141..40836cf 100644
--- a/emulator/smp.c
+++ b/emulator/smp.c
@@ -68,8 +68,6 @@
#define DIST_SIGN 0x04
#define DIST_LINK_KEY 0x08
-#define KEY_DIST (DIST_ENC_KEY | DIST_ID_KEY | DIST_SIGN)
-
#define SC_NO_DIST (DIST_ENC_KEY | DIST_LINK_KEY)
#define MAX_IO_CAP 0x04
@@ -193,6 +191,14 @@
return method;
}
+static uint8_t key_dist(struct bthost *host)
+{
+ if (!bthost_bredr_capable(host))
+ return (DIST_ENC_KEY | DIST_ID_KEY | DIST_SIGN);
+
+ return (DIST_ENC_KEY | DIST_ID_KEY | DIST_SIGN | DIST_LINK_KEY);
+}
+
static void smp_send(struct smp_conn *conn, uint8_t smp_cmd, const void *data,
uint8_t len)
{
@@ -433,8 +439,8 @@
}
rsp.max_key_size = 0x10;
- rsp.init_key_dist = conn->preq[5] & KEY_DIST;
- rsp.resp_key_dist = conn->preq[6] & KEY_DIST;
+ rsp.init_key_dist = conn->preq[5] & key_dist(bthost);
+ rsp.resp_key_dist = conn->preq[6] & key_dist(bthost);
conn->prsp[0] = BT_L2CAP_SMP_PAIRING_RESPONSE;
memcpy(&conn->prsp[1], &rsp, sizeof(rsp));
@@ -691,8 +697,8 @@
req.oob_data = 0x00;
req.auth_req = auth_req;
req.max_key_size = 0x10;
- req.init_key_dist = KEY_DIST;
- req.resp_key_dist = KEY_DIST;
+ req.init_key_dist = key_dist(conn->smp->bthost);
+ req.resp_key_dist = key_dist(conn->smp->bthost);
conn->preq[0] = BT_L2CAP_SMP_PAIRING_REQUEST;
memcpy(&conn->preq[1], &req, sizeof(req));
@@ -818,8 +824,8 @@
memset(&req, 0, sizeof(req));
req.max_key_size = 0x10;
- req.init_key_dist = KEY_DIST;
- req.resp_key_dist = KEY_DIST;
+ req.init_key_dist = key_dist(smp->bthost);
+ req.resp_key_dist = key_dist(smp->bthost);
smp_send(conn, BT_L2CAP_SMP_PAIRING_REQUEST, &req, sizeof(req));
}
