Commit fb334fee authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg

Bluetooth: Rename smp->local_rr into smp->local_rand

The variable for the out-of-band random number was badly named and
with that confusing. Just rename it to local_rand so it is clear
what value it represents.
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent bc07cd69
...@@ -78,7 +78,7 @@ struct smp_dev { ...@@ -78,7 +78,7 @@ struct smp_dev {
/* Secure Connections OOB data */ /* Secure Connections OOB data */
u8 local_pk[64]; u8 local_pk[64];
u8 local_sk[32]; u8 local_sk[32];
u8 local_rr[16]; u8 local_rand[16];
bool debug_key; bool debug_key;
struct crypto_blkcipher *tfm_aes; struct crypto_blkcipher *tfm_aes;
...@@ -569,14 +569,14 @@ int smp_generate_oob(struct hci_dev *hdev, u8 hash[16], u8 rand[16]) ...@@ -569,14 +569,14 @@ int smp_generate_oob(struct hci_dev *hdev, u8 hash[16], u8 rand[16])
SMP_DBG("OOB Public Key Y: %32phN", smp->local_pk + 32); SMP_DBG("OOB Public Key Y: %32phN", smp->local_pk + 32);
SMP_DBG("OOB Private Key: %32phN", smp->local_sk); SMP_DBG("OOB Private Key: %32phN", smp->local_sk);
get_random_bytes(smp->local_rr, 16); get_random_bytes(smp->local_rand, 16);
err = smp_f4(smp->tfm_cmac, smp->local_pk, smp->local_pk, err = smp_f4(smp->tfm_cmac, smp->local_pk, smp->local_pk,
smp->local_rr, 0, hash); smp->local_rand, 0, hash);
if (err < 0) if (err < 0)
return err; return err;
memcpy(rand, smp->local_rr, 16); memcpy(rand, smp->local_rand, 16);
return 0; return 0;
} }
...@@ -1841,7 +1841,7 @@ static u8 sc_send_public_key(struct smp_chan *smp) ...@@ -1841,7 +1841,7 @@ static u8 sc_send_public_key(struct smp_chan *smp)
memcpy(smp->local_pk, smp_dev->local_pk, 64); memcpy(smp->local_pk, smp_dev->local_pk, 64);
memcpy(smp->local_sk, smp_dev->local_sk, 32); memcpy(smp->local_sk, smp_dev->local_sk, 32);
memcpy(smp->lr, smp_dev->local_rr, 16); memcpy(smp->lr, smp_dev->local_rand, 16);
if (smp_dev->debug_key) if (smp_dev->debug_key)
set_bit(SMP_FLAG_DEBUG_KEY, &smp->flags); set_bit(SMP_FLAG_DEBUG_KEY, &smp->flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment