wifi-scripts: map the configured pairwise cipher for station mode

Only an exact GCMP cipher was mapped to the network block; other explicit
ciphers (CCMP-256, GCMP-256, TKIP variants) left pairwise unset, so
wpa_supplicant offered its default set and could not associate with an AP
restricted to the configured cipher. Pass wpa_pairwise through, keeping the
GCMP special case that also pins group.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
index 9fc44fb4f255b2ac1263a2679b1508fffe257133..a104538c098331f0a1fca83f7469cc2e89889046 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc
@@ -192,6 +192,8 @@ function setup_sta(data, config) {
        if (config.wpa_pairwise == 'GCMP') {
                config.pairwise = 'GCMP';
                config.group = 'GCMP';
+       } else if (config.wpa_pairwise) {
+               config.pairwise = config.wpa_pairwise;
        }
 
        config.key_mgmt ??= 'NONE';