diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2011-03-15 13:08:16 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2011-03-15 13:08:16 +0100 |
| commit | 057f9b4f5534a302c6e66431894724ae213985b1 (patch) | |
| tree | 7693b6a241d7fe56e628a2831e6f13bf62989f77 /lib/python/Plugins | |
| parent | a8a4bf79a9686f655ff7cb49d08879ae63d432a6 (diff) | |
| parent | 74ef8cacc65911f9a64fef9f0fd9607dd178f64c (diff) | |
| download | enigma2-057f9b4f5534a302c6e66431894724ae213985b1.tar.gz enigma2-057f9b4f5534a302c6e66431894724ae213985b1.zip | |
Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes
Diffstat (limited to 'lib/python/Plugins')
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py index 4a6b07c7..a64a5a6d 100755 --- a/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py +++ b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py @@ -265,7 +265,7 @@ class wpaSupplicant: fp.write('\tssid="'+essid+'"\n') fp.write('\tscan_ssid=0\n') if encrypted: - if encryption == 'WPA' or encryption == 'WPA2' or encryption == 'WPA/WPA2' : + if encryption in ('WPA', 'WPA2', 'WPA/WPA2'): fp.write('\tkey_mgmt=WPA-PSK\n') if encryption == 'WPA': @@ -273,15 +273,14 @@ class wpaSupplicant: fp.write('\tpairwise=TKIP\n') fp.write('\tgroup=TKIP\n') elif encryption == 'WPA2': + fp.write('\tproto=RSN\n') + fp.write('\tpairwise=CCMP\n') + fp.write('\tgroup=CCMP\n') + else: fp.write('\tproto=WPA RSN\n') fp.write('\tpairwise=CCMP TKIP\n') - fp.write('\tgroup=CCMP TKIP\n') - else: - fp.write('\tproto=WPA WPA2\n') - fp.write('\tpairwise=CCMP\n') - fp.write('\tgroup=TKIP\n') + fp.write('\tgroup=CCMP TKIP\n') fp.write('\tpsk="'+psk+'"\n') - elif encryption == 'WEP': fp.write('\tkey_mgmt=NONE\n') if wepkeytype == 'ASCII': |