Skip to content

Commit fdbbd93

Browse files
committed
try to handle lines with multiple key_mgmt
e.g. key_mgmt=WPA-PSK FT-PSK WPA-PSK-SHA256 as in #9
1 parent 86f8a33 commit fdbbd93

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

convert_wifi.pl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,14 @@ ()
5454
if (!defined $SSID) { return warn "Skipping - no SSID?! in " . Dumper(\%CUR) };
5555
#if ($SSID !~ /^[a-zA-Z0-9_ \-\"\'\.<>&()@]+$/) { warn "Possibly problematic SSID name $SSID (FIXME needs escaping?)" };
5656

57-
my $key_mgmt = $CUR{key_mgmt} || ''; warn "no key_mgmt for SSID $SSID" if not defined $CUR{key_mgmt};
58-
if ($CUR{key_mgmt} !~ /^NONE|WPA-PSK$/) { return warn "Skipping network with unknown key_mgmt=$key_mgmt for SSID $SSID" };
57+
my $key_mgmt = $CUR{key_mgmt} || 'WPA-PSK'; warn "no key_mgmt for SSID $SSID; trying to continue, but it might not work" if not defined $CUR{key_mgmt};
58+
if ($key_mgmt ne 'NONE') {
59+
if ($key_mgmt =~ /\b(WPA-PSK\S*)\b/) {
60+
$key_mgmt = $1; # line can be e.g. "key_mgmt=WPA-PSK FT-PSK WPA-PSK-SHA256", so if it has WPA-PSK, assume that
61+
} else {
62+
return warn "Skipping network with unknown key_mgmt=$key_mgmt for SSID $SSID"
63+
};
64+
}
5965
$key_mgmt =~ tr/-/_/;
6066

6167
if ($IGNORE_OPEN and $key_mgmt eq 'NONE') { return };

0 commit comments

Comments
 (0)