will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #886 from evergreen22/passkey-option

Browse Source 
Optional secure pairing with a passkey
This commit is contained in:
JF 2021-12-22 21:34:20 +01:00 committed by GitHub
commit 3b0b48020d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ble/BatteryInformationService.cpp
View File

@ -17,7 +17,7 @@ BatteryInformationService::BatteryInformationService(Controllers::Battery& batte
characteristicDefinition {{.uuid = &batteryLevelUuid.u, characteristicDefinition {{.uuid = &batteryLevelUuid.u,
.access_cb = BatteryInformationServiceCallback, .access_cb = BatteryInformationServiceCallback,
.arg = this, .arg = this,
.flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_ENC | BLE_GATT_CHR_F_READ_AUTHEN | BLE_GATT_CHR_F_NOTIFY, .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY,
.val_handle = &batteryLevelHandle}, .val_handle = &batteryLevelHandle},
{0}}, {0}},
serviceDefinition { serviceDefinition {

4
src/components/ble/NimbleController.cpp
View File

@ -134,9 +134,7 @@ void NimbleController::Init() {
RestoreBond(); RestoreBond();
if (!ble_gap_adv_active() && !bleController.IsConnected()) {
StartAdvertising(); StartAdvertising();
}
} }
void NimbleController::StartAdvertising() { void NimbleController::StartAdvertising() {
@ -274,7 +272,7 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
* display capability only so we only handle the "display" action here. * display capability only so we only handle the "display" action here.
* *
* Standards insist that the rand() PRNG be deterministic. * Standards insist that the rand() PRNG be deterministic.
* Use the nimble TRNG here since rand() is predictable. * Use the tinycrypt prng here since rand() is predictable.
*/ */
NRF_LOG_INFO("Security event : BLE_GAP_EVENT_PASSKEY_ACTION"); NRF_LOG_INFO("Security event : BLE_GAP_EVENT_PASSKEY_ACTION");
if (event->passkey.params.action == BLE_SM_IOACT_DISP) { if (event->passkey.params.action == BLE_SM_IOACT_DISP) {

2
src/components/ble/NimbleController.h
View File

@ -110,8 +110,8 @@ namespace Pinetime {
ImmediateAlertService immediateAlertService; ImmediateAlertService immediateAlertService;
HeartRateService heartRateService; HeartRateService heartRateService;
MotionService motionService; MotionService motionService;
ServiceDiscovery serviceDiscovery;
FSService fsService; FSService fsService;
ServiceDiscovery serviceDiscovery;
uint8_t addrType; uint8_t addrType;
uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE; uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;