Optional secure pairing with a passkey

Support passkey pairing when requested by the central
Fix a comment and reorder warning
This commit is contained in:
James A. Jerkins 2021-12-21 16:02:01 -06:00
parent 6a5946c4e3
commit eca0588c23
3 changed files with 4 additions and 6 deletions

View File

@ -17,7 +17,7 @@ BatteryInformationService::BatteryInformationService(Controllers::Battery& batte
characteristicDefinition {{.uuid = &batteryLevelUuid.u,
.access_cb = BatteryInformationServiceCallback,
.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},
{0}},
serviceDefinition {

View File

@ -134,10 +134,8 @@ void NimbleController::Init() {
RestoreBond();
if (!ble_gap_adv_active() && !bleController.IsConnected()) {
StartAdvertising();
}
}
void NimbleController::StartAdvertising() {
struct ble_gap_adv_params adv_params;
@ -274,7 +272,7 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
* display capability only so we only handle the "display" action here.
*
* 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");
if (event->passkey.params.action == BLE_SM_IOACT_DISP) {

View File

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