зеркало из https://github.com/mozilla/gecko-dev.git
Bug 868941 - Connecting to WLAN using WPA-EAP with special options (mschapv2/PEAP) is not possible. r=vchang
This commit is contained in:
Родитель
1b7323408a
Коммит
57a43bf800
|
@ -1326,7 +1326,7 @@ var WifiManager = (function() {
|
|||
var networkConfigurationFields = [
|
||||
"ssid", "bssid", "psk", "wep_key0", "wep_key1", "wep_key2", "wep_key3",
|
||||
"wep_tx_keyidx", "priority", "key_mgmt", "scan_ssid", "disabled",
|
||||
"identity", "password", "auth_alg"
|
||||
"identity", "password", "auth_alg", "phase1", "phase2", "eap"
|
||||
];
|
||||
|
||||
manager.getNetworkConfiguration = function(config, callback) {
|
||||
|
@ -1683,7 +1683,10 @@ Network.api = {
|
|||
psk: "rw",
|
||||
identity: "rw",
|
||||
wep: "rw",
|
||||
hidden: "rw"
|
||||
hidden: "rw",
|
||||
eap: "rw",
|
||||
phase1: "rw",
|
||||
phase2: "rw"
|
||||
};
|
||||
|
||||
// Note: We never use ScanResult.prototype, so the fact that it's unrelated to
|
||||
|
@ -1945,6 +1948,12 @@ function WifiWorker() {
|
|||
configured.auth_alg = net.auth_alg = "OPEN SHARED";
|
||||
}
|
||||
|
||||
if ("phase1" in net)
|
||||
net.phase1 = quote(net.phase1);
|
||||
|
||||
if ("phase2" in net)
|
||||
net.phase2 = quote(net.phase2);
|
||||
|
||||
return net;
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче