Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(nan): declare NAN key types as nan_key_type_t enum

Browse Source 
Move the NAN_KEY_ND_TK/ND_GTK/NM_TK/ND_IGTK/ND_BIGTK selectors from #defines
into a nan_key_type_t enum, and finalize their doc wording (drop the
"provisional" note now that the IGTK/BIGTK values are verified against the
blob ABI). They are still passed to esp_wifi_set_nan_key_internal() as the
int key_flag argument, so no call-site or ABI change. Also tidy the
surrounding doc comments.
This commit is contained in:
Sarvesh Bodakhe
2026-07-01 16:12:03 +05:30
parent 5275d5ef08
commit 8b2b386825
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_wifi/wifi_apps/nan_app/src/nan_i.h
View File

@@ -173,19 +173,21 @@ extern void *s_nan_data_lock;
/* Internal key-install constants matching esp_wifi_set_sta_key_internal semantics. */
#define NAN_WIFI_WPA_ALG_CCMP 3
#define NAN_WIFI_WPA_ALG_BIP_CMAC_128 7 /* IGTK/BIGTK BIP = blob WIFI_WPA_ALG_IGTK (confirmed by han2; 4 is SMS4) */
#define NAN_WIFI_WPA_ALG_BIP_CMAC_128 7 /* IGTK/BIGTK BIP = blob WIFI_WPA_ALG_IGTK; 4 is SMS4 */
#define NAN_KEY_FLAG_RX BIT(2)
#define NAN_KEY_FLAG_TX BIT(3)
#define NAN_KEY_FLAG_PAIRWISE BIT(5)
/* NAN key-type selector passed as the last arg of esp_wifi_set_nan_key_internal;
* tells the blob which NAN SA the key belongs to. IGTK/BIGTK values are
* provisional — confirm with han2 before the lib bump. */
#define NAN_KEY_ND_TK 0
#define NAN_KEY_ND_GTK 1
#define NAN_KEY_NM_TK 2
#define NAN_KEY_ND_IGTK 3
#define NAN_KEY_ND_BIGTK 4
* tells the blob which NAN SA the key belongs to. Values match the blob's
* key-type enum. */
typedef enum {
NAN_KEY_ND_TK = 0,
NAN_KEY_ND_GTK = 1,
NAN_KEY_NM_TK = 2,
NAN_KEY_ND_IGTK = 3,
NAN_KEY_ND_BIGTK = 4,
} nan_key_type_t;
/* Handshake state */
enum nan_handshake_state {

4
components/esp_wifi/wifi_apps/nan_app/src/nan_security.c
View File

@@ -1322,8 +1322,8 @@ uint16_t nan_get_ndp_security_csid(uint8_t ndp_id, const uint8_t *peer_nmi)
* (required for symmetric GTK distribution and third-party/iOS/Android
* interop). Safe to include NCS-GTK here: the blob treats this value as an
* opaque bitmap that it passes straight to the host CSIA callbacks
* (construct_csia / get_csia_len) and never interprets individual bits
* (confirmed by han2). Pairwise/link cipher selection and ND-TK install are
* (construct_csia / get_csia_len) and never interprets individual bits.
* Pairwise/link cipher selection and ND-TK install are
* host-driven and do not read this field; the group key has its own install
* path (NAN_KEY_ND_GTK) and gtk_required gate. */
return csid;