From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 4/5] Bluetooth: Re-encrypt link after receiving an LTK
Date: Wed, 26 Feb 2014 23:33:46 +0200 [thread overview]
Message-ID: <1393450427-12438-4-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1393450427-12438-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
It's not strictly speaking required to re-encrypt a link once we receive
an LTK since the connection is already encrypted with the STK. However,
re-encrypting with the LTK allows us to verify that we've received an
LTK that actually works.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/smp.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 0de98fe23330..52708f79545f 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1268,6 +1268,13 @@ int smp_distribute_keys(struct l2cap_conn *conn)
set_bit(SMP_FLAG_COMPLETE, &smp->smp_flags);
smp_notify_keys(conn);
+ /* Re-encrypt the link with LTK */
+ if (smp->ltk) {
+ struct smp_ltk *ltk = smp->ltk;
+ hci_le_start_enc(hcon, ltk->ediv, ltk->rand, ltk->val);
+ hcon->enc_key_size = ltk->enc_size;
+ }
+
smp_chan_destroy(conn);
return 0;
--
1.8.5.3
next prev parent reply other threads:[~2014-02-26 21:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 21:33 [PATCH 1/5] Bluetooth: Track not yet received keys in SMP johan.hedberg
2014-02-26 21:33 ` [PATCH 2/5] Bluetooth: Simplify logic for checking for SMP completion johan.hedberg
2014-02-26 21:33 ` [PATCH 3/5] Bluetooth: Remove unneeded "force" parameter from smp_distribute_keys() johan.hedberg
2014-02-26 21:47 ` Marcel Holtmann
2014-02-26 21:33 ` johan.hedberg [this message]
2014-02-26 21:33 ` [PATCH 5/5] Bluetooth: Fix disconnecting connections in non-connected states johan.hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393450427-12438-4-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox