diff options
| author | pstew@chromium.org <pstew@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 18:40:30 +0000 |
|---|---|---|
| committer | pstew@chromium.org <pstew@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 18:40:30 +0000 |
| commit | 3c91cd0d57ee98069a80af9628516836fddc8bca (patch) | |
| tree | 4e711facb31d22d3c12473e96a64a1d95ef8c8dc /chromeos/test | |
| parent | 6cc54f5a04e63e969ddb12bf2232ee8eafb253e8 (diff) | |
| download | chromium_src-3c91cd0d57ee98069a80af9628516836fddc8bca.zip chromium_src-3c91cd0d57ee98069a80af9628516836fddc8bca.tar.gz chromium_src-3c91cd0d57ee98069a80af9628516836fddc8bca.tar.bz2 | |
Accept L2TP Xauth parameters in ONC
Add Xauth L2TP credentials to the ONC configuration language.
BUG=267647
R=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/141583002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/test')
5 files changed, 19 insertions, 3 deletions
diff --git a/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc b/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc index 10fccf1..40bf369 100644 --- a/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc +++ b/chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc @@ -21,7 +21,11 @@ } }, "IKEVersion": 1, - "SaveCredentials": true + "SaveCredentials": true, + "XAUTH": { + "Username": "some xauth username", + "Password": "some xauth password" + } }, "L2TP": { "Username": "some username", diff --git a/chromeos/test/data/network/shill_l2tpipsec.json b/chromeos/test/data/network/shill_l2tpipsec.json index f529a97..ce7c8b7 100644 --- a/chromeos/test/data/network/shill_l2tpipsec.json +++ b/chromeos/test/data/network/shill_l2tpipsec.json @@ -5,6 +5,8 @@ "Provider.Type": "l2tpipsec", "L2TPIPsec.PSK": "some_preshared_key", "L2TPIPsec.User": "some username", + "L2TPIPsec.XauthPassword": "some xauth password", + "L2TPIPsec.XauthUser": "some xauth username", "L2TPIPsec.Password": "some password", "SaveCredentials": true } diff --git a/chromeos/test/data/network/shill_l2tpipsec_clientcert.json b/chromeos/test/data/network/shill_l2tpipsec_clientcert.json index 3c47214..f5b97a8 100644 --- a/chromeos/test/data/network/shill_l2tpipsec_clientcert.json +++ b/chromeos/test/data/network/shill_l2tpipsec_clientcert.json @@ -2,6 +2,8 @@ "GUID": "guid", "L2TPIPsec.Password": "some password", "L2TPIPsec.User": "some username", + "L2TPIPsec.XauthPassword": "some xauth password", + "L2TPIPsec.XauthUser": "some xauth username", "Name": "MyL2TPVPN", "Provider.Host": "some.host.org", "Provider.Type": "l2tpipsec", diff --git a/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc b/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc index ed7400d..1e6d3da 100644 --- a/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc +++ b/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc @@ -12,7 +12,11 @@ // "AuthenticationType": "PSK", // "IKEVersion": 1, "PSK": "some_preshared_key", - "SaveCredentials": true + "SaveCredentials": true, + "XAUTH": { + "Username": "some xauth username", + "Password": "some xauth password" + } }, "L2TP": { "Username": "some username", diff --git a/chromeos/test/data/network/valid_l2tpipsec.onc b/chromeos/test/data/network/valid_l2tpipsec.onc index 0e0bc5f..8aab993 100644 --- a/chromeos/test/data/network/valid_l2tpipsec.onc +++ b/chromeos/test/data/network/valid_l2tpipsec.onc @@ -8,7 +8,11 @@ "AuthenticationType": "PSK", "IKEVersion": 1, "PSK": "some_preshared_key", - "SaveCredentials": true + "SaveCredentials": true, + "XAUTH": { + "Username": "some xauth username", + "Password": "some xauth password" + } }, "L2TP": { "Username": "some username", |