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>
This commit is contained in:
parent
1408bb6efb
commit
70157ef539
1 changed files with 18 additions and 9 deletions
|
@ -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)
|
static u8 sc_send_public_key(struct smp_chan *smp)
|
||||||
{
|
{
|
||||||
|
struct hci_dev *hdev = smp->conn->hcon->hdev;
|
||||||
|
|
||||||
BT_DBG("");
|
BT_DBG("");
|
||||||
|
|
||||||
while (true) {
|
if (test_bit(HCI_USE_DEBUG_KEYS, &hdev->dev_flags)) {
|
||||||
/* Generate local key pair for Secure Connections */
|
BT_DBG("Using debug keys");
|
||||||
if (!ecc_make_key(smp->local_pk, smp->local_sk))
|
memcpy(smp->local_pk, debug_pk, 64);
|
||||||
return SMP_UNSPECIFIED;
|
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
|
/* This is unlikely, but we need to check that
|
||||||
* accidentially generate a debug key.
|
* we didn't accidentially generate a debug key.
|
||||||
*/
|
*/
|
||||||
if (memcmp(smp->local_sk, debug_sk, 32))
|
if (memcmp(smp->local_sk, debug_sk, 32))
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BT_DBG("Local Public Key X: %32phN", smp->local_pk);
|
BT_DBG("Local Public Key X: %32phN", smp->local_pk);
|
||||||
|
|
Loading…
Add table
Reference in a new issue