nimble/host: Support database hash #1112
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi, sorry for late response Could you rebase on top on master branch ? |
Supports database hash characteristic. Computes database hash and stores it on first pairing with device. Computes current hash and compares it with stored hash on reconnection. See BLE Core spec 5.2 section 7.2
MarceauFillon
force-pushed
the
database_hash_calculation
branch
from
3f01350
to
c1d153d
Compare
|
No worries, done! |
sjanc
reviewed
Sep 5, 2022
| assert(ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR); | ||
| assert(ctxt->chr == &ble_svc_gatt_defs[0].characteristics[1]); | ||
| uint8_t db_hash[16]; | ||
| uint16_t len_data = sizeof(db_hash); |
There was a problem hiding this comment.
please not mix declarations with code (eg. asserts after variables declarations)
| uint8_t db_hash[16]; | ||
| uint16_t len_data = sizeof(db_hash); | ||
| int res = ble_compute_db_hash(db_hash); | ||
| if(res != 0){ |
There was a problem hiding this comment.
empty line after declarations
| } | ||
|
|
||
| rc = os_mbuf_append(ctxt->om, db_hash, len_data); | ||
| if(rc !=0){ |
| @@ -73,7 +108,7 @@ ble_svc_gatt_access(uint16_t conn_handle, uint16_t attr_handle, | |||
|
|
|||
| put_le16(u8p + 0, ble_svc_gatt_start_handle); | |||
| put_le16(u8p + 2, ble_svc_gatt_end_handle); | |||
|
|
|||
| ble_hs_misc_peer_addr_type_to_id(conn->bhc_peer_addr.type); | ||
| hash_key.idx = 0; | ||
|
|
||
| rc = ble_store_read_hash(conn_handle, &hash_key, &hash_value); // read peer hash, read the database hash characteristic and compare, if rc != 0 => ble_svc_conn_gatt_changed(0, 0xffff) |
There was a problem hiding this comment.
please use C style comments /**/ eg:
/* call foo */
foo();
| ble_hs_misc_peer_addr_type_to_id(conn->bhc_peer_addr.type); | ||
| hash_key.idx = 0; | ||
|
|
||
| rc = ble_store_read_hash(conn_handle, &hash_key, &hash_value); // read peer hash, read the database hash characteristic and compare, if rc != 0 => ble_svc_conn_gatt_changed(0, 0xffff) |
There was a problem hiding this comment.
also, this commented code, is it TODO?
|
|
||
| static void ble_db_hash_message_append_u16(uint16_t val, uint8_t *buf, uint8_t *len) { | ||
| val = htole16(val); | ||
| memcpy(buf + *len, &val, sizeof(uint16_t)); |
There was a problem hiding this comment.
we already have put_le16, put_le32 etc functions
please use those
| @@ -577,6 +579,14 @@ ble_sm_persist_keys(struct ble_sm_proc *proc) | |||
| ble_sm_fill_store_value(&peer_addr, authenticated, sc, &proc->peer_keys, | |||
| &value_sec); | |||
| ble_store_write_peer_sec(&value_sec); | |||
|
|
|||
|
|
|||
| // Compute current database hash and store it | |||
| @@ -894,3 +894,5 @@ int ble_gatts_start(void); | |||
| */ | |||
|
|
|||
| #endif | |||
|
|
|||
| int ble_compute_db_hash(uint8_t db_hash[16]); | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supports database hash characteristic.
Computes database hash and stores it on first pairing with device.
Computes current hash and compares it with stored hash on reconnection.
See BLE Core spec 5.2 section 7.2