You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/06/17 04:04:02 UTC
[2/9] incubator-mynewt-core git commit: BLE Host - Rename start_rand
to master_id_rand.
BLE Host - Rename start_rand to master_id_rand.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/e347a0d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e347a0d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e347a0d6
Branch: refs/heads/develop
Commit: e347a0d6832540fdd8c01ddfcd73a5aa164b9d7b
Parents: cda2363
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Jun 16 20:48:15 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Jun 16 20:49:26 2016 -0700
----------------------------------------------------------------------
net/nimble/host/src/ble_sm.c | 22 +++++++++++-----------
net/nimble/host/src/ble_sm_priv.h | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e347a0d6/net/nimble/host/src/ble_sm.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_sm.c b/net/nimble/host/src/ble_sm.c
index bd435a5..76cbbd0 100644
--- a/net/nimble/host/src/ble_sm.c
+++ b/net/nimble/host/src/ble_sm.c
@@ -146,8 +146,8 @@ static uint8_t ble_sm_dbg_next_pair_rand[16];
static uint8_t ble_sm_dbg_next_pair_rand_set;
static uint16_t ble_sm_dbg_next_ediv;
static uint8_t ble_sm_dbg_next_ediv_set;
-static uint64_t ble_sm_dbg_next_start_rand;
-static uint8_t ble_sm_dbg_next_start_rand_set;
+static uint64_t ble_sm_dbg_next_master_id_rand;
+static uint8_t ble_sm_dbg_next_master_id_rand_set;
static uint8_t ble_sm_dbg_next_ltk[16];
static uint8_t ble_sm_dbg_next_ltk_set;
static uint8_t ble_sm_dbg_next_csrk[16];
@@ -172,10 +172,10 @@ ble_sm_dbg_set_next_ediv(uint16_t next_ediv)
}
void
-ble_sm_dbg_set_next_start_rand(uint64_t next_start_rand)
+ble_sm_dbg_set_next_master_id_rand(uint64_t next_master_id_rand)
{
- ble_sm_dbg_next_start_rand = next_start_rand;
- ble_sm_dbg_next_start_rand_set = 1;
+ ble_sm_dbg_next_master_id_rand = next_master_id_rand;
+ ble_sm_dbg_next_master_id_rand_set = 1;
}
void
@@ -289,19 +289,19 @@ ble_sm_gen_ediv(uint16_t *ediv)
}
static int
-ble_sm_gen_start_rand(uint64_t *start_rand)
+ble_sm_gen_master_id_rand(uint64_t *master_id_rand)
{
int rc;
#ifdef BLE_HS_DEBUG
- if (ble_sm_dbg_next_start_rand_set) {
- ble_sm_dbg_next_start_rand_set = 0;
- *start_rand = ble_sm_dbg_next_start_rand;
+ if (ble_sm_dbg_next_master_id_rand_set) {
+ ble_sm_dbg_next_master_id_rand_set = 0;
+ *master_id_rand = ble_sm_dbg_next_master_id_rand;
return 0;
}
#endif
- rc = ble_hci_util_rand(start_rand, sizeof *start_rand);
+ rc = ble_hci_util_rand(master_id_rand, sizeof *master_id_rand);
if (rc != 0) {
return rc;
}
@@ -1737,7 +1737,7 @@ ble_sm_key_exch_exec(struct ble_sm_proc *proc, struct ble_sm_result *res,
if (rc != 0) {
goto err;
}
- rc = ble_sm_gen_start_rand(&master_id.rand_val);
+ rc = ble_sm_gen_master_id_rand(&master_id.rand_val);
if (rc != 0) {
goto err;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e347a0d6/net/nimble/host/src/ble_sm_priv.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_sm_priv.h b/net/nimble/host/src/ble_sm_priv.h
index 57c8e19..9ba2fad 100644
--- a/net/nimble/host/src/ble_sm_priv.h
+++ b/net/nimble/host/src/ble_sm_priv.h
@@ -287,7 +287,7 @@ struct ble_sm_result {
#ifdef BLE_HS_DEBUG
void ble_sm_dbg_set_next_pair_rand(uint8_t *next_pair_rand);
void ble_sm_dbg_set_next_ediv(uint16_t next_ediv);
-void ble_sm_dbg_set_next_start_rand(uint64_t next_start_rand);
+void ble_sm_dbg_set_next_master_id_rand(uint64_t next_master_id_rand);
void ble_sm_dbg_set_next_ltk(uint8_t *next_ltk);
void ble_sm_dbg_set_next_csrk(uint8_t *next_csrk);
void ble_sm_dbg_set_sc_keys(uint8_t *pubkey, uint8_t *privkey);