diff options
| author | Johan Hedberg | 2014-05-16 10:03:34 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2014-12-03 16:51:15 +0100 |
| commit | 656687769487b736674f111b92cef6ba6a31dea6 (patch) | |
| tree | ad14c476d40252f35a8bb838ffbfc00461330bec /net/bluetooth/smp.c | |
| parent | Bluetooth: Make auth_req mask dependent on SC enabled or not (diff) | |
| download | kernel-qcow2-linux-656687769487b736674f111b92cef6ba6a31dea6.tar.gz kernel-qcow2-linux-656687769487b736674f111b92cef6ba6a31dea6.tar.xz kernel-qcow2-linux-656687769487b736674f111b92cef6ba6a31dea6.zip | |
Bluetooth: Add SMP flag for SC and set it when necessary.
This patch adds a new SMP flag for tracking whether Secure Connections
is in use and sets the flag when both remote and local side have elected
to use Secure Connections.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/smp.c')
| -rw-r--r-- | net/bluetooth/smp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index bfa839eed89b..3808ade96d08 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -45,6 +45,7 @@ enum { SMP_FLAG_MITM_AUTH, SMP_FLAG_COMPLETE, SMP_FLAG_INITIATOR, + SMP_FLAG_SC, }; struct smp_chan { @@ -973,6 +974,9 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) build_pairing_cmd(conn, req, &rsp, auth); + if (rsp.auth_req & SMP_AUTH_SC) + set_bit(SMP_FLAG_SC, &smp->flags); + key_size = min(req->max_key_size, rsp.max_key_size); if (check_enc_key_size(conn, key_size)) return SMP_ENC_KEY_SIZE; @@ -1020,6 +1024,9 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb) auth = rsp->auth_req & AUTH_REQ_MASK(hdev); + if ((req->auth_req & SMP_AUTH_SC) && (auth & SMP_AUTH_SC)) + set_bit(SMP_FLAG_SC, &smp->flags); + /* If we need MITM check that it can be achieved */ if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) { u8 method; |