From fb56779fd1359039313edc48837d162fca51b7ce Mon Sep 17 00:00:00 2001 From: Akshat Agrawal Date: Thu, 11 Jun 2026 18:56:55 +0530 Subject: [PATCH] Change the NIRA verification logic --- components/esp_wifi/wifi_apps/nan_app/src/nan_pairing.c | 5 +++-- .../wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/esp_wifi/wifi_apps/nan_app/src/nan_pairing.c b/components/esp_wifi/wifi_apps/nan_app/src/nan_pairing.c index 93de2adf3f4..4a4ac938adb 100644 --- a/components/esp_wifi/wifi_apps/nan_app/src/nan_pairing.c +++ b/components/esp_wifi/wifi_apps/nan_app/src/nan_pairing.c @@ -500,7 +500,7 @@ static void nan_pairing_nik_fup_timeout_cb(void *eloop_data, void *user_ctx) evt.status = WIFI_NAN_PAIRING_STATUS_REJECTED; evt.reason_code = WIFI_NAN_PAIRING_REASON_NIK_FUP_TIMEOUT; MACADDR_COPY(evt.peer_nmi, own->nik_fup_pending_peer_nmi); - esp_nan_disable_pairing(own->svc_id); + esp_nan_complete_pairing(own->svc_id); nan_app_post_event(WIFI_EVENT_NAN_PAIRING_CONFIRM, &evt, sizeof(evt)); ESP_LOGW(TAG, "Pairing NIK follow-up timed out for peer " MACSTR, MAC2STR(own->nik_fup_pending_peer_nmi)); @@ -801,6 +801,7 @@ static void nan_pairing_key_installed_cb(const uint8_t *peer_nmi, evt.status = WIFI_NAN_PAIRING_STATUS_ACCEPTED; evt.reason_code = 0; MACADDR_COPY(evt.peer_nmi, peer_nmi); + esp_nan_complete_pairing(own->svc_id); nan_app_post_event(WIFI_EVENT_NAN_PAIRING_CONFIRM, &evt, sizeof(evt)); return; } @@ -986,7 +987,7 @@ void nan_app_receive_pairing_followup(uint8_t svc_id, uint8_t peer_svc_id, evt.status = WIFI_NAN_PAIRING_STATUS_ACCEPTED; evt.reason_code = 0; MACADDR_COPY(evt.peer_nmi, peer_mac); - esp_nan_disable_pairing(own_svc_id_to_disable); + esp_nan_complete_pairing(own_svc_id_to_disable); nan_app_post_event(WIFI_EVENT_NAN_PAIRING_CONFIRM, &evt, sizeof(evt)); } diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h b/components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h index 8d6c7382070..774e25f094d 100644 --- a/components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h +++ b/components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h @@ -340,12 +340,12 @@ void esp_wifi_ap_set_group_mgmt_cipher_internal(wifi_cipher_type_t cipher); uint8_t esp_wifi_op_class_supported_internal(uint8_t op_class, uint8_t min_chan, uint8_t max_chan, uint8_t inc, uint8_t bw, channel_bitmap_t *non_pref_channels); bool esp_wifi_is_wpa3_compatible_mode_enabled(uint8_t if_index); uint8_t esp_wifi_ap_get_owe_config_internal(void); -esp_err_t esp_nan_disable_pairing(uint8_t svc_id); +esp_err_t esp_nan_complete_pairing(uint8_t svc_id); esp_err_t esp_wifi_nan_load_saved_creds(uint8_t own_nik[ESP_WIFI_NAN_NIK_LEN], bool *own_nik_valid, - wifi_nan_peer_creds_t peer_creds[ESP_WIFI_NAN_MAX_PEER_CREDS], uint8_t *num_peer_creds); + wifi_nan_peer_creds_t peer_creds[ESP_WIFI_NAN_MAX_PEER_CREDS], uint8_t *num_peer_creds); esp_err_t esp_wifi_nan_save_own_nik(const uint8_t own_nik[ESP_WIFI_NAN_NIK_LEN]) ; esp_err_t esp_wifi_nan_save_creds_for_peer(const uint8_t peer_nik[ESP_WIFI_NAN_NIK_LEN], - const uint8_t npk[ESP_WIFI_NAN_NPK_LEN]); + const uint8_t npk[ESP_WIFI_NAN_NPK_LEN]); esp_err_t esp_wifi_nan_erase_all_creds(void); #endif /* _ESP_WIFI_DRIVER_H_ */