From c0b3af2292af4a5b49775aeb48d0115d602ea8b8 Mon Sep 17 00:00:00 2001
From: Sarvesh Bodakhe <sarvesh.bodakhe@espressif.com>
Date: Tue, 17 Oct 2023 11:18:27 +0530
Subject: [PATCH] fix(esp_wifi): Add md5sum validation checks for new public
 headers and sync headers

Add checks for following public headers:
- esp_wifi_types_generic.h
- esp_wifi_native.h
---
 components/esp_wifi/include/esp_wifi_types.h         | 1 +
 components/esp_wifi/include/esp_wifi_types_generic.h | 4 ++--
 components/esp_wifi/include/local/esp_wifi_native.h  | 4 +++-
 components/esp_wifi/test_md5/test_md5.sh             | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
index f237fbff4a..3f0f1ab07a 100644
--- a/components/esp_wifi/include/esp_wifi_types.h
+++ b/components/esp_wifi/include/esp_wifi_types.h
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #pragma once
+
 #include "esp_wifi_types_generic.h"
 #if __has_include("esp_wifi_native.h")
 #include "esp_wifi_native.h"
diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h
index e523f94619..e7b35ef41e 100644
--- a/components/esp_wifi/include/esp_wifi_types_generic.h
+++ b/components/esp_wifi/include/esp_wifi_types_generic.h
@@ -8,7 +8,7 @@
 #ifndef __ESP_WIFI_TYPES_H__
 #define __ESP_WIFI_TYPES_H__
 
-#include "esp_event.h"
+#include "esp_event_base.h"
 #include "esp_interface.h"
 
 #ifdef __cplusplus
@@ -430,7 +430,7 @@ typedef struct {
     uint8_t payload[0];      /**< Payload. Length is equal to value in 'length' field, minus 4. */
 } vendor_ie_data_t;
 
-typedef struct wifi_pkt_rx_ctrl_t wifi_pkt_rx_ctrl_t;
+typedef struct wifi_pkt_rx_ctrl_t esp_wifi_rxctrl_t;
 
 /**
   * @brief Promiscuous frame type
diff --git a/components/esp_wifi/include/local/esp_wifi_native.h b/components/esp_wifi/include/local/esp_wifi_native.h
index 12d7f1e396..8edd780364 100644
--- a/components/esp_wifi/include/local/esp_wifi_native.h
+++ b/components/esp_wifi/include/local/esp_wifi_native.h
@@ -102,7 +102,9 @@ typedef struct wifi_csi_config_t{
     uint8_t shift;          /**< manually left shift bits of the scale of the CSI data. The range of the left shift bits is 0~15 */
     bool dump_ack_en;       /**< enable to dump 802.11 ACK frame, default disabled */
 } wifi_csi_config_t;
-#endif
+#endif // !CONFIG_SOC_WIFI_HE_SUPPORT
+
+typedef wifi_pkt_rx_ctrl_t esp_wifi_rxctrl_t;
 
 /**
   * @brief CSI data type
diff --git a/components/esp_wifi/test_md5/test_md5.sh b/components/esp_wifi/test_md5/test_md5.sh
index 115537ce09..8a676b8e33 100755
--- a/components/esp_wifi/test_md5/test_md5.sh
+++ b/components/esp_wifi/test_md5/test_md5.sh
@@ -39,6 +39,8 @@ ${PREFIX}ld --unresolved-symbols=ignore-all --entry 0 -o ${ELF_FILE} \
     -u g_esp_wifi_he_md5 \
     -u g_wifi_crypto_funcs_md5 \
     -u g_wifi_type_md5 \
+    -u g_wifi_types_generic_md5 \
+    -u g_wifi_types_native_md5 \
     -u g_wifi_he_type_md5 \
     -u g_wifi_osi_funcs_md5 \
     -u g_wifi_supplicant_funcs_md5 \
@@ -70,6 +72,8 @@ check_md5 ${IDF_PATH}/components/esp_wifi/include/esp_wifi_he.h g_esp_wifi_he_md
 check_md5 ${IDF_PATH}/components/esp_wifi/include/esp_private/wifi_os_adapter.h g_wifi_osi_funcs_md5
 check_md5 ${IDF_PATH}/components/esp_wifi/include/esp_wifi_crypto_types.h g_wifi_crypto_funcs_md5
 check_md5 ${IDF_PATH}/components/esp_wifi/include/esp_wifi_types.h g_wifi_type_md5
+check_md5 ${IDF_PATH}/components/esp_wifi/include/esp_wifi_types_generic.h g_wifi_types_generic_md5
+check_md5 ${IDF_PATH}/components/esp_wifi/include/local/esp_wifi_native.h g_wifi_types_native_md5
 check_md5 ${IDF_PATH}/components/esp_wifi/include/esp_wifi_he_types.h g_wifi_he_type_md5
 check_md5 ${IDF_PATH}/components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h g_wifi_supplicant_funcs_md5