Bug 1028044 - Use auth instead of autheap in phase2 settings. r=vchang, a=2.0+
authorChuck Lee <chulee@mozilla.com>
Tue, 24 Jun 2014 17:41:38 +0800
changeset 207493 b33e040d2d244967dd845f0622e21c20d0a4c3ec
parent 207492 f0fb4204362927c7b8d7582ea8f04d044970dc46
child 207494 ad0cdb7f2b46ea5e6503052634bb32c9e604a7c9
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvchang, 2
bugs1028044
milestone32.0a2
Bug 1028044 - Use auth instead of autheap in phase2 settings. r=vchang, a=2.0+
dom/wifi/WifiWorker.js
--- a/dom/wifi/WifiWorker.js
+++ b/dom/wifi/WifiWorker.js
@@ -1945,20 +1945,20 @@ function WifiWorker() {
       if (hasValidProperty("pin")) {
         net.pin = quote(net.pin);
       }
 
       if (hasValidProperty("phase1"))
         net.phase1 = quote(net.phase1);
 
       if (hasValidProperty("phase2")) {
-        if (net.eap === "PEAP") {
+        if (net.phase2 === "TLS") {
+          net.phase2 = quote("autheap=" + net.phase2);
+        } else { // PAP, MSCHAPV2, etc.
           net.phase2 = quote("auth=" + net.phase2);
-        } else {  // TLS, TTLS
-          net.phase2 = quote("autheap=" + net.phase2);
         }
       }
 
       if (hasValidProperty("serverCertificate"))
         net.ca_cert = quote("keystore://WIFI_SERVERCERT_" + net.serverCertificate);
 
       if (hasValidProperty("subjectMatch"))
         net.subject_match = quote(net.subjectMatch);