Merge branch 'bugfix/fragment_and_forge_vulnerability_detection' into 'master'

fix(wifi): fragment and forge vulnerability detection See merge request sdk/ESP8266_RTOS_SDK!1618
2025-05-21 00:56:38 +08:00 · 2021-05-24 06:15:10 +00:00
parent 2f42e70e40 8a2ab31b50
commit 08e225dde2
11 changed files with 9 additions and 4 deletions
--- a/components/esp8266/lib/VERSION
+++ b/components/esp8266/lib/VERSION
@ -1,8 +1,8 @@
 gwen:
-    core:       cebfb0e
-    net80211:   eb73fdf
-    pp:         5fda74f
-    espnow:     7a93d71
+    core:       231e0e2
+    net80211:   231e0e2
+    pp:         231e0e2
+    espnow:     231e0e2

    smartconfig:  3.0.0/5f550c40
    phy:          1163.0
--- a/components/esp8266/lib/libcore.a
+++ b/components/esp8266/lib/libcore.a
--- a/components/esp8266/lib/libcore_dbg.a
+++ b/components/esp8266/lib/libcore_dbg.a
--- a/components/esp8266/lib/libespnow.a
+++ b/components/esp8266/lib/libespnow.a
--- a/components/esp8266/lib/libespnow_dbg.a
+++ b/components/esp8266/lib/libespnow_dbg.a
--- a/components/esp8266/lib/libnet80211.a
+++ b/components/esp8266/lib/libnet80211.a
--- a/components/esp8266/lib/libnet80211_dbg.a
+++ b/components/esp8266/lib/libnet80211_dbg.a
--- a/components/esp8266/lib/libpp.a
+++ b/components/esp8266/lib/libpp.a
--- a/components/esp8266/lib/libpp_dbg.a
+++ b/components/esp8266/lib/libpp_dbg.a
--- a/components/wpa_supplicant/src/common/wpa_common.h
+++ b/components/wpa_supplicant/src/common/wpa_common.h
@ -110,6 +110,8 @@
 #define WPA_CAPABILITY_MFPR BIT(6)
 #define WPA_CAPABILITY_MFPC BIT(7)
 #define WPA_CAPABILITY_PEERKEY_ENABLED BIT(9)
+#define WPA_CAPABILITY_SPP_CAPABLE BIT(10)
+#define WPA_CAPABILITY_SPP_REQUIRED BIT(11)


 /* IEEE 802.11r */
--- a/components/wpa_supplicant/src/rsn_supp/wpa_ie.c
+++ b/components/wpa_supplicant/src/rsn_supp/wpa_ie.c
@ -225,6 +225,9 @@ static int  wpa_gen_wpa_ie_rsn(u8 *rsn_ie, size_t rsn_ie_len,
        }
    }
 #endif /* CONFIG_IEEE80211W */
+
+    capab |= WPA_CAPABILITY_SPP_CAPABLE;
+
    WPA_PUT_LE16(pos, capab);
    pos += 2;