Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Unified Diff: chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a unit test for the resolve function. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc
index 41a998699e25b29d85023c347ab252eda94190bf..ea60fc23f7c6fa38fcaf742ac8b78a364fd5a0b4 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc
@@ -165,11 +165,20 @@ void NetworkConfigurationUpdaterImplCros::ApplyNetworkConfiguration(
ParseAndValidateOncForImport(
onc_blob, onc_source, "", &network_configs, &certificates);
- network_library_->LoadOncNetworks(network_configs, onc_source);
-
+ chromeos::CertificateHandler::CertsByGUID imported_server_and_ca_certs;
scoped_ptr<net::CertificateList> web_trust_certs(new net::CertificateList);
certificate_handler_->ImportCertificates(
- certificates, onc_source, web_trust_certs.get());
+ certificates, onc_source, web_trust_certs.get(),
+ &imported_server_and_ca_certs);
+
+ if (!chromeos::onc::ResolveServerCertRefsInNetworks(
+ imported_server_and_ca_certs, &network_configs)) {
+ LOG(ERROR) << "Some certificate references in the ONC policy for source "
+ << chromeos::onc::GetSourceAsString(onc_source)
+ << " could not be resolved.";
+ }
+
+ network_library_->LoadOncNetworks(network_configs, onc_source);
if (onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY)
SetTrustAnchors(web_trust_certs.Pass());

Powered by Google App Engine
This is Rietveld 408576698