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

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

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clean up 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_normalizer.cc
diff --git a/chromeos/network/onc/onc_normalizer.cc b/chromeos/network/onc/onc_normalizer.cc
index bd1b9105f6e48651b24d1067bcf5f2f718675c45..3a3ada6a6537afff231f7cd0f40629c988a711c4 100644
--- a/chromeos/network/onc/onc_normalizer.cc
+++ b/chromeos/network/onc/onc_normalizer.cc
@@ -118,20 +118,20 @@ void Normalizer::NormalizeEAP(base::DictionaryValue* eap) {
}
void Normalizer::NormalizeIPsec(base::DictionaryValue* ipsec) {
- using namespace vpn;
+ using namespace ipsec;
std::string auth_type;
ipsec->GetStringWithoutPathExpansion(kAuthenticationType, &auth_type);
- RemoveEntryUnless(ipsec, kClientCertType, auth_type == kCert);
+ RemoveEntryUnless(ipsec, vpn::kClientCertType, auth_type == kCert);
RemoveEntryUnless(ipsec, kServerCARef, auth_type == kCert);
RemoveEntryUnless(ipsec, kPSK, auth_type == kPSK);
- RemoveEntryUnless(ipsec, kSaveCredentials, auth_type == kPSK);
+ RemoveEntryUnless(ipsec, vpn::kSaveCredentials, auth_type == kPSK);
std::string clientcert_type;
- ipsec->GetStringWithoutPathExpansion(kClientCertType, &clientcert_type);
- RemoveEntryUnless(ipsec, kClientCertPattern,
+ ipsec->GetStringWithoutPathExpansion(vpn::kClientCertType, &clientcert_type);
+ RemoveEntryUnless(ipsec, vpn::kClientCertPattern,
clientcert_type == certificate::kPattern);
- RemoveEntryUnless(ipsec, kClientCertRef,
+ RemoveEntryUnless(ipsec, vpn::kClientCertRef,
clientcert_type == certificate::kRef);
int ike_version = -1;

Powered by Google App Engine
This is Rietveld 408576698