From 00cf3a768e270adcea38752445ca943bf64217bf Mon Sep 17 00:00:00 2001 From: geeksville Date: Wed, 22 Jul 2020 13:50:30 -0700 Subject: [PATCH] nimble WIP turn on bonding and security --- src/nimble/BluetoothUtil.cpp | 10 ---------- src/nimble/NimbleDefs.c | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/nimble/BluetoothUtil.cpp b/src/nimble/BluetoothUtil.cpp index f856e27bc..3a5239c94 100644 --- a/src/nimble/BluetoothUtil.cpp +++ b/src/nimble/BluetoothUtil.cpp @@ -738,21 +738,11 @@ void reinitBluetooth() ble_hs_cfg.store_status_cb = ble_store_util_status_rr; ble_hs_cfg.sm_io_cap = BLE_SM_IO_CAP_DISP_ONLY; -#ifdef CONFIG_EXAMPLE_BONDING ble_hs_cfg.sm_bonding = 1; -#endif -#ifdef CONFIG_EXAMPLE_MITM ble_hs_cfg.sm_mitm = 1; -#endif -#ifdef CONFIG_EXAMPLE_USE_SC ble_hs_cfg.sm_sc = 1; -#else - ble_hs_cfg.sm_sc = 0; -#ifdef CONFIG_EXAMPLE_BONDING ble_hs_cfg.sm_our_key_dist = 1; ble_hs_cfg.sm_their_key_dist = 1; -#endif -#endif // add standard GAP services ble_svc_gap_init(); diff --git a/src/nimble/NimbleDefs.c b/src/nimble/NimbleDefs.c index 1e1f09a85..5be014d5b 100644 --- a/src/nimble/NimbleDefs.c +++ b/src/nimble/NimbleDefs.c @@ -32,17 +32,17 @@ const struct ble_gatt_svc_def gatt_svr_svcs[] = { // FIXME - remove non ENC access .uuid = &toradio_uuid.u, .access_cb = toradio_callback, - .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_WRITE_ENC, + .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_WRITE_AUTHEN, }, { .uuid = &fromradio_uuid.u, .access_cb = fromradio_callback, - .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_ENC, + .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_AUTHEN, }, { .uuid = &fromnum_uuid.u, .access_cb = fromnum_callback, - .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_ENC | BLE_GATT_CHR_F_NOTIFY, + .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_READ_AUTHEN | BLE_GATT_CHR_F_NOTIFY, }, { 0, /* No more characteristics in this service. */