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

Unified Diff: chromeos/network/onc/onc_translator_onc_to_shill.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Support CACert PEM list for L2tp. 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/onc/onc_translator_onc_to_shill.cc
diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
index 70831c4d8ae4738d52c44a1dc740dc4f1c323bb2..8c09df3c4451483befb05a37d3e34a7ef9fecc13 100644
--- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
+++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
@@ -101,18 +101,20 @@ void LocalTranslator::TranslateFields() {
void LocalTranslator::TranslateOpenVPN() {
// Shill supports only one RemoteCertKU but ONC a list.
// Copy only the first entry if existing.
- const base::ListValue* certKUs = NULL;
- std::string certKU;
- if (onc_object_->GetListWithoutPathExpansion(vpn::kRemoteCertKU, &certKUs) &&
- certKUs->GetString(0, &certKU)) {
+ const base::ListValue* cert_kus = NULL;
+ std::string cert_ku;
+ if (onc_object_->GetListWithoutPathExpansion(vpn::kRemoteCertKU, &cert_kus) &&
+ cert_kus->GetString(0, &cert_ku)) {
shill_dictionary_->SetStringWithoutPathExpansion(
- flimflam::kOpenVPNRemoteCertKUProperty, certKU);
+ flimflam::kOpenVPNRemoteCertKUProperty, cert_ku);
}
for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
it.Advance()) {
scoped_ptr<base::Value> translated;
- if (it.key() == vpn::kSaveCredentials || it.key() == vpn::kRemoteCertKU) {
+ if (it.key() == vpn::kSaveCredentials ||
+ it.key() == vpn::kRemoteCertKU ||
+ it.key() == openvpn::kServerCAPEMs) {
translated.reset(it.value().DeepCopy());
} else {
// Shill wants all Provider/VPN fields to be strings.

Powered by Google App Engine
This is Rietveld 408576698