mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/configure_link_encryption_for_charac_v4.4' into 'release/v4.4' 

WifiProv: Add configuration support for forcing link encryption (v4.4)

See merge request espressif/esp-idf!18660
pull/9338/head
Jiang Jiang Jian 2022-06-30 16:49:26 +08:00
rodzic 55773f878d 7a01fe7a71
commit 7c28a05c69
2 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
components/protocomm/src/transports/protocomm_ble.c
Wyświetl plik

@ -405,8 +405,10 @@ static ssize_t populate_gatt_db(esp_gatts_attr_db_t **gatt_db_generated)
(*gatt_db_generated)[i].att_desc.value = (uint8_t *) &character_prop_read_write;
} else if (i % 3 == 2) {
/* Characteristic Value */
(*gatt_db_generated)[i].att_desc.perm = ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE | \
ESP_GATT_PERM_READ_ENCRYPTED | ESP_GATT_PERM_WRITE_ENCRYPTED;
(*gatt_db_generated)[i].att_desc.perm = ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE ;
#if CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION
(*gatt_db_generated)[i].att_desc.perm |= ESP_GATT_PERM_READ_ENCRYPTED | ESP_GATT_PERM_WRITE_ENCRYPTED;
#endif
(*gatt_db_generated)[i].att_desc.uuid_length = ESP_UUID_LEN_128;
(*gatt_db_generated)[i].att_desc.uuid_p = protoble_internal->g_nu_lookup[i / 3].uuid128;
(*gatt_db_generated)[i].att_desc.max_length = CHAR_VAL_LEN_MAX;

1
components/wifi_provisioning/Kconfig
Wyświetl plik

@ -34,7 +34,6 @@ menu "Wi-Fi Provisioning Manager"
config WIFI_PROV_BLE_FORCE_ENCRYPTION
bool
prompt "Force Link Encryption during characteristic Read / Write"
depends on BT_NIMBLE_ENABLED
default y
help
Used to enforce link encryption when attempting to read / write characteristic