Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(esp_wifi): Add NAN Pairing support

Browse Source 
- Add container struct for internal extra params for follow-up
- Support for parsing Shared Key Desc in Pairing follow-up
- Implement NAN Pairing API's with required parameters
- In KeyData set cipher_ver to 0, Key Info to 0x12C8
  (AKM-defined | Pairwise | Install | ACK |
   Secure | Encrypted Key Data) for iOS compatibility
- Move NAN PASN into esp_nan_supplicant.c, move declarations
  to esp_private/esp_supp_nan.h
- Align PASN/ND-PMK derivation with hostap

Co-authored-by: Sajia <sajia.ali@espressif.com>
Co-authored-by: Akshat Agrawal <akshat.agrawal@espressif.com>
Co-authored-by: Sarvesh Bodakhe <sarvesh.bodakhe@espressif.com>
This commit is contained in:
Nachiket Kukade
2026-05-22 13:01:51 +08:00
co-authored by Sajia Akshat Agrawal Sarvesh Bodakhe
parent e731ff3598
commit 9f361f478d
21 changed files with 2065 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_wifi/include/esp_private/wifi.h
+6 -3
View File
@@ -102,6 +102,7 @@ struct nan_cb_peer_info {
uint16_t ssi_len; /**< SSI length in bytes */
wifi_nan_peer_sdf_security_t *peer_security_params; /**< Peer's discovery security params parsed from SDF */
nan_vendor_ie_t *vendor_ie; /**< Vendor-specific IE, if any */
uint8_t *shared_key_attr; /**< Shared key descriptor attribute, if any */
};
/* NDP Peer info parsed from NAF. */
@@ -176,6 +177,8 @@ struct nan_sync_callbacks {
void (* pairing_indication)(uint8_t peer_svc_id, uint8_t pub_id, uint8_t peer_nmi[6], uint16_t selected_method);
void (* pairing_confirm)(uint8_t status, uint8_t peer_svc_id, uint8_t sub_id, uint8_t peer_nmi[6], uint16_t matched_method, uint8_t reason_code);
void (* receive_pasn)(uint8_t *buf, size_t len, uint16_t trans_seq, uint16_t status);
uint32_t (* get_nira_len)(void);
int (* construct_nira)(uint8_t *frm);
};
/* Host helpers for NAN encrypted-datapath, registered via
@@ -1040,15 +1043,15 @@ esp_err_t esp_nan_internal_subscribe_service(const wifi_nan_subscribe_cfg_t *sub
*
* @param[in] fup_params Configuration parameters for sending a Follow-up to the Peer.
* @param[out] context Context returned for Follow-up frame to be matched in Tx done.
* @param[in] pairing_npba Optional NPBA parameters for NAN pairing follow-up generation.
* If NULL, follow-up is sent with provided `fup_params->ssi`.
* @param[in] params_i Optional internal-only extras (NPBA / wrapped Shared Key Descriptor).
* If NULL, follow-up is sent with provided `fup_params->ssi`.
*
* @return
* - ESP_OK: succeed
* - others: failed
*/
esp_err_t esp_nan_internal_send_followup(wifi_nan_followup_params_t *fup_params, uint32_t *context,
wifi_nan_pairing_npba_params_t *pairing_npba);
extra_params_internal_t *params_i);
/**
* @brief Send Datapath Request to the Publisher with matching service
components/esp_wifi/include/esp_private/wifi_types.h
+17
View File
@@ -109,6 +109,23 @@ typedef struct {
uint32_t cookie; /**< Comeback cookie */
} wifi_nan_pairing_npba_params_t;
/**
* @brief Container for optional internal follow-up TX parameters.
*
* Aggregates everything beyond the basic @c wifi_nan_followup_params_t that
* the firmware/proprietary layer may need to compose a follow-up frame:
* NPBA attribute parameters (NAN pairing), a pre-wrapped Shared Key
* Descriptor blob (NAN PASN follow-up), and a NAN Identity Resolution
* Attribute (NIRA) blob. Any field may be NULL/zeroed when not in use.
*/
typedef struct {
wifi_nan_pairing_npba_params_t *pairing_npba; /**< NPBA params, or NULL */
uint8_t *shared_key_wrapped; /**< Encoded Shared Key Descriptor attr, or NULL */
uint16_t shared_key_wrapped_len; /**< Length of @c shared_key_wrapped in bytes */
uint8_t *nira_attr; /**< Encoded NAN Identity Resolution Attribute, or NULL */
uint16_t nira_attr_len; /**< Length of @c nira_attr in bytes */
} extra_params_internal_t;
#ifdef __cplusplus
}
#endif