Skip to content

Add option for Bluetooth security #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavisNT wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add option for Bluetooth security #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion sim/components/ble/NimbleController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
// alertNotificationClient {systemTask, notificationManager},
// currentTimeService {dateTimeController},
musicService {*this},
weatherService {dateTimeController},
weatherService {*this, dateTimeController},
// batteryInformationService {batteryController},
// immediateAlertService {systemTask, notificationManager},
// heartRateService {systemTask, heartRateController},
Expand Down Expand Up @@ -136,6 +136,45 @@ void NimbleController::Init() {
// StartAdvertising();
}

void NimbleController::AddCharacteristicSecurity(const struct ble_gatt_svc_def* svcs) {
// if (!systemTask.GetSettings().GetBleSecured())
// return;

// struct ble_gatt_chr_def* chrs;
// for (int si = 0; svcs[si].type != 0; si++) {
// chrs = const_cast<struct ble_gatt_chr_def*>(svcs[si].characteristics);
// for (int ci = 0; chrs[ci].uuid != NULL; ci++) {
// if (chrs[ci].flags & BLE_GATT_CHR_F_READ) {
// chrs[ci].flags |= BLE_GATT_CHR_F_READ_ENC | BLE_GATT_CHR_F_READ_AUTHEN;
// }
// if ((chrs[ci].flags & BLE_GATT_CHR_F_WRITE) || (chrs[ci].flags & BLE_GATT_CHR_F_WRITE_NO_RSP)) {
// chrs[ci].flags |= BLE_GATT_CHR_F_WRITE_ENC | BLE_GATT_CHR_F_WRITE_AUTHEN;
// }
// chrs[ci].min_key_size = 16;
// }
// }
}

bool NimbleController::IsConnSecurityOK() {
// #ifndef PINETIME_IS_RECOVERY
// if (!bleController.IsRadioEnabled() || !systemTask.GetSettings().GetBleRadioEnabled())
// return false;

// if (!systemTask.GetSettings().GetBleSecured())
// return true;

// if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE)
// return false;

// struct ble_gap_conn_desc desc;
// return (ble_gap_conn_find(connectionHandle, &desc) == 0 && desc.sec_state.encrypted && desc.sec_state.authenticated &&
// desc.sec_state.bonded && desc.sec_state.key_size >= 16);
// #else
return true;
// #endif
}


// void NimbleController::StartAdvertising() {
// struct ble_gap_adv_params adv_params;
// struct ble_hs_adv_fields fields;
Expand Down
3 changes: 3 additions & 0 deletions sim/components/ble/NimbleController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ namespace Pinetime {
void EnableRadio();
void DisableRadio();

void AddCharacteristicSecurity(const struct ble_gatt_svc_def* svcs);
bool IsConnSecurityOK();

private:
// void PersistBond(struct ble_gap_conn_desc& desc);
// void RestoreBond();
Expand Down