[Shr-Devel] [PATCH] Fix wpa_supplicant.conf generation for GTA02 and also recognize WPA2 networks.

[Jake Drexel]

Signed-off-by: Jake Drexel <jackramone at gmail.com>
---
 src/wifi.vala |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/wifi.vala b/src/wifi.vala
index 6431985..faa983c 100644
--- a/src/wifi.vala
+++ b/src/wifi.vala
@@ -371,7 +371,7 @@ namespace iliwi {
         line_regex_strength = new Regex("""^\s+Quality=(\d+)/(\d+) """);
         line_regex_interface = new Regex("""^(\w+\d+)\s*Scan completed :$""");
         line_regex_adhoc = new Regex("""^\s+Mode:Ad-Hoc$""");
-        line_regex_wpa_enc = new Regex("""^\s+IE: WPA""");
+        line_regex_wpa_enc = new Regex("""^\s+(IE: [[:alnum:]. /]*WPA|Extra:(rsn|wpa)_ie=)""");
         line_regex_wpa_enc_auth = new Regex("""^\s+Extra:wpa_ie=dd160050f20101000050f20201000050f20201000050f201$""");
       } catch(Error e) {
         debug("Regex error!");
@@ -533,15 +533,27 @@ namespace iliwi {
 WEP
                     Extra:bcn_int=100
                     Extra:wmm_ie=dd180050f2020101800003a4000027a4000042435e0062322f00
-WPA-PSK
+WPA-PSK GTA02
                     Extra:bcn_int=100
                     Extra:wpa_ie=dd180050f20101000050f20201000050f20201000050f2020c00
                     Extra:wmm_ie=dd180050f2020101800003a4000027a4000042435e0062322f00
 
-WPA2-PSK
+WPA-PSK 
+                    IE: WPA Version 1
+                        Group Cipher : TKIP
+                        Pairwise Ciphers (1) : TKIP
+                        Authentication Suites (1) : PSK
+
+WPA2-PSK GTA02
                     Extra:bcn_int=100
                     Extra:rsn_ie=30140100000fac040100000fac040100000fac020c00
                     Extra:wmm_ie=dd180050f2020101800003a4000027a4000042435e0062322f00
+
+WPA2-PSK
+                    IE: IEEE 802.11i/WPA2 Version 1
+                        Group Cipher : CCMP
+                        Pairwise Ciphers (1) : CCMP
+                        Authentication Suites (1) : PSK
 WPA/WPA2-mixed
                     Extra:bcn_int=100
                     Extra:wpa_ie=dd1c0050f20101000050f20202000050f2040050f20201000050f2020c00
-- 
1.7.3.4