diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2016-06-07 11:43:14 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2016-06-07 12:47:43 +0300 |
| commit | 28de3782a283669a27dbd0bf1836cc990ee7f929 (patch) | |
| tree | da8de4a57469722079dc17a6926f15cc60da2b31 | |
| parent | 00eba5fd7ce031206222638fa57eada940aa28cd (diff) | |
| download | bluez-28de3782a283669a27dbd0bf1836cc990ee7f929.tar.gz | |
emulator: Include Link Key in key distribution if BR/EDR is supported
| -rw-r--r-- | emulator/bthost.c | 5 | ||||
| -rw-r--r-- | emulator/bthost.h | 2 | ||||
| -rw-r--r-- | emulator/smp.c | 22 |
3 files changed, 21 insertions, 8 deletions
diff --git a/emulator/bthost.c b/emulator/bthost.c index 3638fe454..2bcdc3193 100644 --- a/emulator/bthost.c +++ b/emulator/bthost.c @@ -2329,6 +2329,11 @@ void bthost_write_le_host_supported(struct bthost *bthost, uint8_t mode) &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 7110db81f..553865a89 100644 --- a/emulator/bthost.h +++ b/emulator/bthost.h @@ -108,6 +108,8 @@ uint8_t bthost_get_auth_req(struct bthost *bthost); 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 e94114152..40836cfbb 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 @@ static uint8_t sc_select_method(struct smp_conn *conn) 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 @@ static void pairing_req(struct smp_conn *conn, const void *data, uint16_t len) } 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 @@ void smp_pair(void *conn_data, uint8_t io_cap, uint8_t auth_req) 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 @@ static void smp_conn_bredr(struct smp_conn *conn, uint8_t encrypt) 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)); } |