Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_normalizer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_normalizer.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 100 matching lines @@
 
   std::string outer;
   eap->GetStringWithoutPathExpansion(kOuter, &outer);
   RemoveEntryUnless(eap, kAnonymousIdentity,
                     outer == kPEAP || outer == kEAP_TTLS);
   RemoveEntryUnless(eap, kInner,
                     outer == kPEAP || outer == kEAP_TTLS || outer == kEAP_FAST);
 }
 
 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;
   ipsec->GetIntegerWithoutPathExpansion(kIKEVersion, &ike_version);
   RemoveEntryUnless(ipsec, kEAP, ike_version == 2);
   RemoveEntryUnless(ipsec, kGroup, ike_version == 1);
   RemoveEntryUnless(ipsec, kXAUTH, ike_version == 1);
 }
 
 void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
@@ skipping 54 matching lines @@
 
   std::string security;
   wifi->GetStringWithoutPathExpansion(wifi::kSecurity, &security);
   RemoveEntryUnless(wifi, kEAP, security == kWEP_8021X || security == kWPA_EAP);
   RemoveEntryUnless(wifi, kPassphrase,
                     security == kWEP_PSK || security == kWPA_PSK);
 }
 
 }  // namespace onc
 }  // namespace chromeos