summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_ui_data_unittest.cc
diff options
context:
space:
mode:
authorpneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 19:21:00 +0000
committerpneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 19:21:00 +0000
commit823e3cdbc71d7f7255509850f389f7d76f00ece6 (patch)
treed48b6977d99fe8f90d3157cdd36835784c4a68a1 /chromeos/network/network_ui_data_unittest.cc
parent3e1593459b82220567d99ec1a766c8eddb1f8b61 (diff)
downloadchromium_src-823e3cdbc71d7f7255509850f389f7d76f00ece6.zip
chromium_src-823e3cdbc71d7f7255509850f389f7d76f00ece6.tar.gz
chromium_src-823e3cdbc71d7f7255509850f389f7d76f00ece6.tar.bz2
Resolve certificate references in ONC by PEM.
In ONC, Server and CA certificates are referenced by GUID. Before, the GUID was stored in the nickname of each certificate and used to identify each certificate. After this change, the GUID is resolved and replaced by the PEM encoding of the certificate during import. The nickname is not used. This commit only affects Server and CA certificates (including IssuerCARef in CertificatePatterns). Client certificates are still identified by GUID. This CL also - uses the new *CaCertPEMProperty fields of Shill. - prepares for a list of CaCerts (for EAP, IPsec and OpenVPN) Side-effect of this CL: IssuerCARef is stored in the UIData service-property in Shill. Because this CL replaces IssuerCARef by IssuerCAPEMs, IssuerCARef entries of old UIData properties are ignored. This may break network configurations which were configured via chrome://net-internals. Reimporting such a configuration will fix the problem. BUG=208986 TBR=eroman@chromium.org (for net_internals_ui.cc) Review URL: https://chromiumcodereview.appspot.com/16946002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_ui_data_unittest.cc')
-rw-r--r--chromeos/network/network_ui_data_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromeos/network/network_ui_data_unittest.cc b/chromeos/network/network_ui_data_unittest.cc
index 8333629..857218b8 100644
--- a/chromeos/network/network_ui_data_unittest.cc
+++ b/chromeos/network/network_ui_data_unittest.cc
@@ -103,15 +103,15 @@ INSTANTIATE_TEST_CASE_P(
CreateUIDataTest,
CreateUIDataTest,
::testing::Values(
- std::make_pair("valid_wifi_clientcert.onc",
+ std::make_pair("wifi_clientcert_with_cert_pems.onc",
"uidata_for_wifi_clientcert.json"),
std::make_pair("valid_wifi_clientref.onc",
"uidata_for_wifi_clientref.json"),
std::make_pair("valid_wifi_psk.onc",
"uidata_for_wifi_psk.json"),
- std::make_pair("valid_openvpn_clientcert.onc",
+ std::make_pair("openvpn_clientcert_with_cert_pems.onc",
"uidata_for_openvpn_clientcert.json"),
- std::make_pair("valid_l2tpipsec_clientcert.onc",
+ std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc",
"uidata_for_l2tpipsec_clientcert.json")));
} // namespace chromeos