chromeos/network/onc/onc_constants.cc - Issue 16946002: Resolve certificate references in ONC by PEM.

Unified Diff: chromeos/network/onc/onc_constants.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

« chrome/browser/chromeos/cros/network_library.h ('K') | « chromeos/network/onc/onc_constants.h ('k') | chromeos/network/onc/onc_normalizer.cc » ('j') | chromeos/test/data/network/managed_toplevel1_with_cert_pems.onc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/onc/onc_constants.cc

diff --git a/chromeos/network/onc/onc_constants.cc b/chromeos/network/onc/onc_constants.cc

index 9e7d6d3751e8f5b283a4f5a7d46a6eb0d8cc4c33..c0f9daadedef9f8c45c812480969579bf716e1a6 100644

--- a/chromeos/network/onc/onc_constants.cc

+++ b/chromeos/network/onc/onc_constants.cc

@@ -140,6 +140,7 @@ const char kEmailAddress[] = "EmailAddress";

const char kEnrollmentURI[] = "EnrollmentURI";

const char kGUID[] = "GUID";

const char kIssuerCARef[] = "IssuerCARef";

+const char kIssuerCAPEMs[] = "IssuerCAPEMs";

const char kIssuer[] = "Issuer";

const char kLocality[] = "Locality";

const char kNone[] = "None";

@@ -192,6 +193,7 @@ const char kPAP[] = "PAP";

const char kPEAP[] = "PEAP";

const char kPassword[] = "Password";

const char kSaveCredentials[] = "SaveCredentials";

+const char kServerCAPEMs[] = "ServerCAPEMs";

const char kServerCARef[] = "ServerCARef";

const char kUseSystemCAs[] = "UseSystemCAs";

} // namespace eap

@@ -200,25 +202,19 @@ namespace vpn {

const char kAuthNoCache[] = "AuthNoCache";

const char kAuthRetry[] = "AuthRetry";

const char kAuth[] = "Auth";

-const char kAuthenticationType[] = "AuthenticationType";

const char kAutoConnect[] = "AutoConnect";

-const char kCert[] = "Cert";

const char kCipher[] = "Cipher";

const char kClientCertPattern[] = "ClientCertPattern";

const char kClientCertRef[] = "ClientCertRef";

const char kClientCertType[] = "ClientCertType";

const char kCompLZO[] = "CompLZO";

const char kCompNoAdapt[] = "CompNoAdapt";

-const char kEAP[] = "EAP";

-const char kGroup[] = "Group";

const char kHost[] = "Host";

-const char kIKEVersion[] = "IKEVersion";

const char kIPsec[] = "IPsec";

const char kKeyDirection[] = "KeyDirection";

const char kL2TP[] = "L2TP";

const char kNsCertType[] = "NsCertType";

const char kOpenVPN[] = "OpenVPN";

-const char kPSK[] = "PSK";

const char kPassword[] = "Password";

const char kPort[] = "Port";

const char kProto[] = "Proto";

@@ -228,7 +224,7 @@ const char kRemoteCertKU[] = "RemoteCertKU";

const char kRemoteCertTLS[] = "RemoteCertTLS";

const char kRenegSec[] = "RenegSec";

const char kSaveCredentials[] = "SaveCredentials";

-const char kServerCARef[] = "ServerCARef";

+const char kServerCertPEM[] = "ServerCertPEM";

const char kServerCertRef[] = "ServerCertRef";

const char kServerPollTimeout[] = "ServerPollTimeout";

const char kShaper[] = "Shaper";

@@ -239,13 +235,26 @@ const char kTypeL2TP_IPsec[] = "L2TP-IPsec";

const char kType[] = "Type";

const char kUsername[] = "Username";

const char kVerb[] = "Verb";

-const char kXAUTH[] = "XAUTH";

} // namespace vpn

+namespace ipsec {

Mattias Nissler (ping if slow) 2013/07/02 13:00:35 You should really try and break these unrelated ch

pneubeck (no reviews) 2013/07/02 14:38:43 Done.

+const char kAuthenticationType[] = "AuthenticationType";

+const char kCert[] = "Cert";

+const char kEAP[] = "EAP";

+const char kGroup[] = "Group";

+const char kIKEVersion[] = "IKEVersion";

+const char kPSK[] = "PSK";

+const char kServerCAPEMs[] = "ServerCAPEMs";

+const char kServerCARef[] = "ServerCARef";

+const char kXAUTH[] = "XAUTH";

+} // namespace ipsec

namespace openvpn {

-const char kNone[] = "none";

const char kInteract[] = "interact";

const char kNoInteract[] = "nointeract";

+const char kNone[] = "none";

+const char kServerCAPEMs[] = "ServerCAPEMs";

+const char kServerCARef[] = "ServerCARef";

const char kServer[] = "server";

} // namespace openvpn