netifd: fix wpa mixed mode matching

Change wpa mixed mode matching to not accidently catch wep+mixed.

All documented cases have the character between {wpa,psk} and mixed as a
'-' but no need to break things which were working, so preserve the *
case.

Reported-by: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
[Allow "psk-mixed" to be prefixed, to align with the *psk2* and *psk* cases,
 slightly reword subject and commit message.]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh
index 8816bff80abf235519309d2a1425a19e2cdaffd7..45f84feeab0d589dbae9651b0ec291fb0f792bd2 100644 (file)
--- a/scripts/netifd-wireless.sh
+++ b/scripts/netifd-wireless.sh
@@ -214,7 +214,7 @@ wireless_vif_parse_encryption() {
                wpa2*|*psk2*)
                        wpa=2
                ;;
-               *mixed*)
+               wpa*mixed*|psk*mixed*)
                        wpa=3
                ;;
                wpa*|*psk*)