Merge branch 'bugfix/wpa2_ent_fixes' into 'master'

Few fixes in wpa_supplicant

Closes WIFI-6676

See merge request espressif/esp-idf!33017

Author: jack0c

components/esp_wifi/wifi_apps/nan_app/src/nan_app.c

@@ -673,7 +673,7 @@ void esp_nan_app_deinit(void)
     }
 
     if (s_nan_data_lock) {
-        os_semphr_delete(s_nan_data_lock);
+        os_mutex_delete(s_nan_data_lock);
         s_nan_data_lock = NULL;
     }
 }

components/wpa_supplicant/esp_supplicant/src/esp_common.c

@@ -415,7 +415,7 @@ void esp_supplicant_common_deinit(void)
             s_supplicant_evt_queue = NULL;
         }
         if (s_supplicant_api_lock) {
-            os_semphr_delete(s_supplicant_api_lock);
+            os_mutex_delete(s_supplicant_api_lock);
             s_supplicant_api_lock = NULL;
         }
     } else if (esp_supplicant_post_evt(SIG_SUPPLICANT_DEL_TASK, 0) != 0) {

components/wpa_supplicant/esp_supplicant/src/esp_dpp.c

@@ -617,7 +617,7 @@ static void esp_dpp_task(void *pvParameters)
     s_dpp_evt_queue = NULL;
 
     if (s_dpp_api_lock) {
-        os_semphr_delete(s_dpp_api_lock);
+        os_mutex_delete(s_dpp_api_lock);
         s_dpp_api_lock = NULL;
     }
 

components/wpa_supplicant/esp_supplicant/src/esp_eap_client.c

@@ -242,7 +242,7 @@ void wpa2_task(void *pvParameters)
             break;
         } else {
             if (s_wifi_wpa2_sync_sem) {
-                wpa_printf(MSG_DEBUG, "EAP: wifi->EAP api completed sig(%" PRId32 ")", e->sig);
+                wpa_printf(MSG_DEBUG, "EAP: wifi->EAP api completed");
                 os_semphr_give(s_wifi_wpa2_sync_sem);
             } else {
                 wpa_printf(MSG_ERROR, "EAP: null wifi->EAP sync sem");
@@ -255,7 +255,7 @@ void wpa2_task(void *pvParameters)
     wpa_printf(MSG_DEBUG, "EAP: task deleted");
     s_wpa2_queue = NULL;
     if (s_wifi_wpa2_sync_sem) {
-        wpa_printf(MSG_DEBUG, "EAP: wifi->EAP api completed sig(%" PRId32 ")", e->sig);
+        wpa_printf(MSG_DEBUG, "EAP: wifi->EAP api completed");
         os_semphr_give(s_wifi_wpa2_sync_sem);
     } else {
         wpa_printf(MSG_ERROR, "EAP: null wifi->EAP sync sem");
@@ -725,7 +725,7 @@ static int eap_peer_sm_init(void)
 
     gEapSm = sm;
 #ifdef USE_WPA2_TASK
-    s_wpa2_queue = os_queue_create(SIG_WPA2_MAX, sizeof(s_wpa2_queue));
+    s_wpa2_queue = os_queue_create(SIG_WPA2_MAX, sizeof(ETSEvent));
     ret = os_task_create(wpa2_task, "wpa2T", WPA2_TASK_STACK_SIZE, NULL, WPA2_TASK_PRIORITY, &s_wpa2_task_hdl);
     if (ret != TRUE) {
         wpa_printf(MSG_ERROR, "wps enable: failed to create task");
@@ -782,7 +782,7 @@ static void eap_peer_sm_deinit(void)
     }
 
     if (s_wpa2_data_lock) {
-        os_semphr_delete(s_wpa2_data_lock);
+        os_mutex_delete(s_wpa2_data_lock);
         s_wpa2_data_lock = NULL;
         wpa_printf(MSG_DEBUG, "EAP: eap_peer_sm_deinit: free data lock");
     }

components/wpa_supplicant/esp_supplicant/src/esp_wps.c

@@ -1771,6 +1771,11 @@ int wps_task_deinit(void)
         wps_rxq_deinit();
     }
 
+    if (s_wps_data_lock) {
+        os_mutex_delete(s_wps_data_lock);
+        s_wps_data_lock = NULL;
+    }
+
     return ESP_OK;
 }
 
@@ -1803,7 +1808,7 @@ int wps_task_init(void)
     }
 
     os_bzero(s_wps_sig_cnt, SIG_WPS_NUM);
-    s_wps_queue = os_queue_create(SIG_WPS_NUM, sizeof(s_wps_queue));
+    s_wps_queue = os_queue_create(SIG_WPS_NUM, sizeof(ETSEvent));
     if (!s_wps_queue) {
         wpa_printf(MSG_ERROR, "wps task init: failed to alloc queue");
         goto _wps_no_mem;