From f04eb1d604da466cbe26d03000ebe64b7fce36c2 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 30 Aug 2023 16:19:19 +0200 Subject: [PATCH] netifd: revert upstream wpa3 cypher fixes Fixes: WIFI-12906 Signed-off-by: John Crispin --- ...tifd-revert-upstream-wpa3-cypher-fix.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 patches/base/0062-netifd-revert-upstream-wpa3-cypher-fix.patch diff --git a/patches/base/0062-netifd-revert-upstream-wpa3-cypher-fix.patch b/patches/base/0062-netifd-revert-upstream-wpa3-cypher-fix.patch new file mode 100644 index 000000000..09aa9a16e --- /dev/null +++ b/patches/base/0062-netifd-revert-upstream-wpa3-cypher-fix.patch @@ -0,0 +1,44 @@ +From 1ee6f065f807c392cdd560d3673a296132d6568a Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Wed, 30 Aug 2023 16:16:12 +0200 +Subject: [PATCH] netifd: revert upstream wpa3 cypher fix + +Signed-off-by: John Crispin +--- + .../netifd/patches/300-revert-wpa3-fix.patch | 24 +++++++++++++++++++ + 1 file changed, 24 insertions(+) + create mode 100644 package/network/config/netifd/patches/300-revert-wpa3-fix.patch + +diff --git a/package/network/config/netifd/patches/300-revert-wpa3-fix.patch b/package/network/config/netifd/patches/300-revert-wpa3-fix.patch +new file mode 100644 +index 0000000000..4a02edd8d0 +--- /dev/null ++++ b/package/network/config/netifd/patches/300-revert-wpa3-fix.patch +@@ -0,0 +1,24 @@ ++Index: netifd-2023-08-17-4711f744/scripts/netifd-wireless.sh ++=================================================================== ++--- netifd-2023-08-17-4711f744.orig/scripts/netifd-wireless.sh +++++ netifd-2023-08-17-4711f744/scripts/netifd-wireless.sh ++@@ -216,19 +216,10 @@ wireless_vif_parse_encryption() { ++ wpa_cipher="CCMP" ++ fi ++ ++- # WPA3 enterprise requires the GCMP-256 cipher (technically also CCMP and GCMP are possible ++- # but many clients/devices do not support that) ++- case "$encryption" in ++- wpa3-mixed*) wpa_cipher="${wpa_cipher} GCMP-256";; ++- wpa3*) wpa_cipher="GCMP-256";; ++- esac ++- ++ case "$encryption" in ++ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) wpa_cipher="CCMP TKIP";; ++- *ccmp256) wpa_cipher="CCMP-256";; ++ *aes|*ccmp) wpa_cipher="CCMP";; ++ *tkip) wpa_cipher="TKIP";; ++- *gcmp256) wpa_cipher="GCMP-256";; ++ *gcmp) wpa_cipher="GCMP";; ++ esac ++ +-- +2.34.1 +