We shall enforce the cipher for both, pairwise and group, thus change
the name of the variable to a more generic phrasing, 'cipher' instead
of 'pairwise'.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org> [keep a copy for compatibility reasons]
auth_mode_open=1
auth_mode_shared=0
auth_type=none
auth_mode_open=1
auth_mode_shared=0
auth_type=none
- *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) wpa_pairwise="CCMP TKIP";;
- *aes|*ccmp) wpa_pairwise="CCMP";;
- *tkip) wpa_pairwise="TKIP";;
+ *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) wpa_cipher="CCMP TKIP";;
+ *aes|*ccmp) wpa_cipher="CCMP";;
+ *tkip) wpa_cipher="TKIP";;
esac
# 802.11n requires CCMP for WPA
esac
# 802.11n requires CCMP for WPA
- [ "$enable_ht:$wpa_pairwise" = "1:TKIP" ] && wpa_pairwise="CCMP TKIP"
+ [ "$enable_ht:$wpa_cipher" = "1:TKIP" ] && wpa_cipher="CCMP TKIP"
# Examples:
# psk-mixed/tkip => WPA1+2 PSK, TKIP
# Examples:
# psk-mixed/tkip => WPA1+2 PSK, TKIP
+ wpa_pairwise="$wpa_cipher"
case "$encryption" in
*psk*)
case "$encryption" in
*psk*)