Bug 1028044 - Use auth instead of autheap in phase2 settings. r=vchang
authorChuck Lee <chulee@mozilla.com>
Tue, 24 Jun 2014 17:41:38 +0800
changeset 191192 454aff4d62f328827c5bcc3c9151afbd158a08aa
parent 191191 1b0e65192c5d3c35fa0927bafbbb0a8d506a596d
child 191193 dc699086d74598b3d5b11ddb9b0abe156a4e8122
push id27036
push userkwierso@gmail.com
push dateSat, 28 Jun 2014 00:11:36 +0000
treeherdermozilla-central@08e9e0b78f81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvchang
bugs1028044
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1028044 - Use auth instead of autheap in phase2 settings. r=vchang
dom/wifi/WifiWorker.js
--- a/dom/wifi/WifiWorker.js
+++ b/dom/wifi/WifiWorker.js
@@ -1952,20 +1952,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);