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

Unified Diff: chromeos/network/managed_network_configuration_handler.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix trust update. Add a utils test. Remove X509 dependency from Shill parsing. 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: chromeos/network/managed_network_configuration_handler.cc
diff --git a/chromeos/network/managed_network_configuration_handler.cc b/chromeos/network/managed_network_configuration_handler.cc
index 0009231da0670943e4ce67e613f0001da8b365a4..40b21f8c66e546dad1117d1b4612d68ae314c9ec 100644
--- a/chromeos/network/managed_network_configuration_handler.cc
+++ b/chromeos/network/managed_network_configuration_handler.cc
@@ -37,6 +37,7 @@
#include "chromeos/network/onc/onc_utils.h"
#include "chromeos/network/onc/onc_validator.h"
#include "dbus/object_path.h"
+#include "net/cert/x509_certificate.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
namespace chromeos {
@@ -197,9 +198,15 @@ scoped_ptr<base::DictionaryValue> CreateShillConfiguration(
effective->SetStringWithoutPathExpansion(onc::network_config::kGUID, guid);
+ net::CertificateList server_and_ca_certs;
+ // TODO(pneubeck): Obtain list of server/ca certificates here.
+
scoped_ptr<base::DictionaryValue> shill_dictionary(
- onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
- *effective));
+ onc::TranslateONCObjectToShill(
+ &onc::kNetworkConfigurationSignature,
+ *effective,
+ base::Bind(&onc::GetPEMEncodedCertFromFingerprint,
+ server_and_ca_certs)));
shill_dictionary->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
profile.path);

Powered by Google App Engine
This is Rietveld 408576698