Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

BLE: Allow bonding with GapPairingNone

Browse Source
This commit is contained in:
Willy-JL
2024-04-17 01:21:41 +01:00
parent 16654d3c90
commit 3b490d5d1f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/bad_kb/bad_kb_app.c
View File

@@ -152,6 +152,7 @@ int32_t bad_kb_conn_apply(BadKbApp* app) {
BadKbConfig* cfg = app->set_bt_id ? &app->id_config : &app->config;
memcpy(&app->cur_ble_cfg, &cfg->ble, sizeof(cfg->ble));
app->cur_ble_cfg.bonding = app->bt_remember;
// TODO: Allow GapPairingNone with BT Remember ON
if(app->bt_remember) {
app->cur_ble_cfg.pairing = GapPairingPinCodeVerifyYesNo;
} else {

4
targets/f7/ble_glue/gap.c
View File

@@ -372,7 +372,6 @@ static void gap_init_svc(Gap* gap) {
// Set default PHY
hci_le_set_default_phy(ALL_PHYS_PREFERENCE, TX_2M_PREFERRED, RX_2M_PREFERRED);
// Set I/O capability
bool bonding_mode = gap->config->bonding_mode;
uint8_t cfg_mitm_protection = CFG_MITM_PROTECTION;
uint8_t cfg_used_fixed_pin = CFG_USED_FIXED_PIN;
bool keypress_supported = false;
@@ -383,7 +382,6 @@ static void gap_init_svc(Gap* gap) {
keypress_supported = true;
} else if(gap->config->pairing_method == GapPairingNone) {
// "Just works" pairing method (iOS accepts it, it seems Android and Linux don't)
bonding_mode = false;
cfg_mitm_protection = MITM_PROTECTION_NOT_REQUIRED;
cfg_used_fixed_pin = USE_FIXED_PIN_FOR_PAIRING_ALLOWED;
// If "just works" isn't supported, we want the numeric comparaison method
@@ -392,7 +390,7 @@ static void gap_init_svc(Gap* gap) {
}
// Setup authentication
aci_gap_set_authentication_requirement(
bonding_mode,
gap->config->bonding_mode,
cfg_mitm_protection,
CFG_SC_SUPPORT,
keypress_supported,