Bug 775499 - 0002. Handle subject match setting. r=vchang

dom/wifi/WifiWorker.js

@@ -1153,7 +1153,7 @@ var WifiManager = (function() {
     "ssid", "bssid", "psk", "wep_key0", "wep_key1", "wep_key2", "wep_key3",
     "wep_tx_keyidx", "priority", "key_mgmt", "scan_ssid", "disabled",
     "identity", "password", "auth_alg", "phase1", "phase2", "eap", "pin",
-    "pcsc", "ca_cert"
+    "pcsc", "ca_cert", "subject_match"
   ];
 
   manager.getNetworkConfiguration = function(config, callback) {
@@ -1860,6 +1860,9 @@ function WifiWorker() {
         net.ca_cert.indexOf("keystore://WIFI_SERVERCERT_" === 0)) {
       pub.serverCertificate = net.ca_cert.substr(27);
     }
+    if(net.subject_match) {
+      pub.subjectMatch = net.subject_match;
+    }
     return pub;
   };
 
@@ -1944,6 +1947,9 @@ function WifiWorker() {
 
       if (hasValidProperty("serverCertificate"))
         net.ca_cert = quote("keystore://WIFI_SERVERCERT_" + net.serverCertificate);
+
+      if (hasValidProperty("subjectMatch"))
+        net.subject_match = quote(net.subjectMatch);
     }
 
     return net;