summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gix <brian.gix@intel.com>2020-09-29 13:45:49 -0700
committerBrian Gix <brian.gix@gmail.com>2023-01-30 16:14:41 -0800
commit9923c09de57e558a8b85df12bed31b9be4d2ec9f (patch)
tree7cba79e252172f088d4ce2f50d4e51cbf4ca2938
parentc50ecca56654f3c1c4b3cc9f9402a64cca9164f8 (diff)
downloadbluez-9923c09de57e558a8b85df12bed31b9be4d2ec9f.tar.gz
mesh: Rename parameter list per crypto usage
The derived key generated by the "nkpk" salt and network master key is used to create Private Beacons as of Mesh Profile Specification v1.1
-rw-r--r--mesh/crypto.c4
-rw-r--r--mesh/crypto.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/mesh/crypto.c b/mesh/crypto.c
index 668d16877..3754cb012 100644
--- a/mesh/crypto.c
+++ b/mesh/crypto.c
@@ -251,9 +251,9 @@ bool mesh_crypto_nkbk(const uint8_t n[16], uint8_t beacon_key[16])
return crypto_128(n, "nkbk", beacon_key);
}
-bool mesh_crypto_nkpk(const uint8_t n[16], uint8_t proxy_key[16])
+bool mesh_crypto_nkpk(const uint8_t n[16], uint8_t private_key[16])
{
- return crypto_128(n, "nkpk", proxy_key);
+ return crypto_128(n, "nkpk", private_key);
}
bool mesh_crypto_k3(const uint8_t n[16], uint8_t out64[8])
diff --git a/mesh/crypto.h b/mesh/crypto.h
index c31abbbbd..55789886e 100644
--- a/mesh/crypto.h
+++ b/mesh/crypto.h
@@ -26,7 +26,7 @@ bool mesh_aes_ecb_one(const uint8_t key[16],
const uint8_t plaintext[16], uint8_t encrypted[16]);
bool mesh_crypto_nkik(const uint8_t network_key[16], uint8_t identity_key[16]);
bool mesh_crypto_nkbk(const uint8_t network_key[16], uint8_t beacon_key[16]);
-bool mesh_crypto_nkpk(const uint8_t network_key[16], uint8_t proxy_key[16]);
+bool mesh_crypto_nkpk(const uint8_t network_key[16], uint8_t private_key[16]);
bool mesh_crypto_identity(const uint8_t net_key[16], uint16_t addr,
uint8_t id[16]);
bool mesh_crypto_beacon_cmac(const uint8_t encryption_key[16],