summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/smp.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-06-24 15:22:59 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-12-03 16:51:19 +0100
commit70157ef5391819a55bb4186c901ac873231fb6ea (patch)
treede6873ee8ad998062d63b1f9d05fb2a0eb0fed39 /net/bluetooth/smp.c
parent1408bb6efb04da3efdc998df1bc032c1d86d1842 (diff)
downloadop-kernel-dev-70157ef5391819a55bb4186c901ac873231fb6ea.zip
op-kernel-dev-70157ef5391819a55bb4186c901ac873231fb6ea.tar.gz
Bluetooth: Use debug keys for SMP when HCI_USE_DEBUG_KEYS is set
The HCI_USE_DEBUG_KEYS flag is intended to force our side to always use debug keys for pairing. This means both BR/EDR SSP as well as SMP with LE Secure Connections. This patch updates the SMP code to use the debug keys instead of generating a random local key pair when the flag is set. 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.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 918ce03..7791604 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1585,18 +1585,27 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
static u8 sc_send_public_key(struct smp_chan *smp)
{
+ struct hci_dev *hdev = smp->conn->hcon->hdev;
+
BT_DBG("");
- while (true) {
- /* Generate local key pair for Secure Connections */
- if (!ecc_make_key(smp->local_pk, smp->local_sk))
- return SMP_UNSPECIFIED;
+ if (test_bit(HCI_USE_DEBUG_KEYS, &hdev->dev_flags)) {
+ BT_DBG("Using debug keys");
+ memcpy(smp->local_pk, debug_pk, 64);
+ memcpy(smp->local_sk, debug_sk, 32);
+ set_bit(SMP_FLAG_DEBUG_KEY, &smp->flags);
+ } else {
+ while (true) {
+ /* Generate local key pair for Secure Connections */
+ if (!ecc_make_key(smp->local_pk, smp->local_sk))
+ return SMP_UNSPECIFIED;
- /* This is unlikely, but we need to check that we didn't
- * accidentially generate a debug key.
- */
- if (memcmp(smp->local_sk, debug_sk, 32))
- break;
+ /* This is unlikely, but we need to check that
+ * we didn't accidentially generate a debug key.
+ */
+ if (memcmp(smp->local_sk, debug_sk, 32))
+ break;
+ }
}
BT_DBG("Local Public Key X: %32phN", smp->local_pk);
OpenPOWER on IntegriCloud