| Index: chromeos/network/onc/onc_constants.h
|
| diff --git a/chromeos/network/onc/onc_constants.h b/chromeos/network/onc/onc_constants.h
|
| index 8df3a53397cf41d34b962296892684f01a269f68..93c589297b8f9661e40c1248a730b5b48d904a2a 100644
|
| --- a/chromeos/network/onc/onc_constants.h
|
| +++ b/chromeos/network/onc/onc_constants.h
|
| @@ -162,6 +162,7 @@ CHROMEOS_EXPORT extern const char kEmailAddress[];
|
| CHROMEOS_EXPORT extern const char kEnrollmentURI[];
|
| CHROMEOS_EXPORT extern const char kGUID[];
|
| CHROMEOS_EXPORT extern const char kIssuerCARef[];
|
| +CHROMEOS_EXPORT extern const char kIssuerCAPEMs[];
|
| CHROMEOS_EXPORT extern const char kIssuer[];
|
| CHROMEOS_EXPORT extern const char kLocality[];
|
| CHROMEOS_EXPORT extern const char kNone[];
|
| @@ -214,6 +215,7 @@ CHROMEOS_EXPORT extern const char kPEAP[];
|
| CHROMEOS_EXPORT extern const char kPassword[];
|
| CHROMEOS_EXPORT extern const char kSaveCredentials[];
|
| CHROMEOS_EXPORT extern const char kServerCARef[];
|
| +CHROMEOS_EXPORT extern const char kServerCAPEMs[];
|
| CHROMEOS_EXPORT extern const char kUseSystemCAs[];
|
| } // namespace eap
|
|
|
| @@ -221,25 +223,19 @@ namespace vpn {
|
| CHROMEOS_EXPORT extern const char kAuthNoCache[];
|
| CHROMEOS_EXPORT extern const char kAuthRetry[];
|
| CHROMEOS_EXPORT extern const char kAuth[];
|
| -CHROMEOS_EXPORT extern const char kAuthenticationType[];
|
| CHROMEOS_EXPORT extern const char kAutoConnect[];
|
| -CHROMEOS_EXPORT extern const char kCert[];
|
| CHROMEOS_EXPORT extern const char kCipher[];
|
| CHROMEOS_EXPORT extern const char kClientCertPattern[];
|
| CHROMEOS_EXPORT extern const char kClientCertRef[];
|
| CHROMEOS_EXPORT extern const char kClientCertType[];
|
| CHROMEOS_EXPORT extern const char kCompLZO[];
|
| CHROMEOS_EXPORT extern const char kCompNoAdapt[];
|
| -CHROMEOS_EXPORT extern const char kEAP[];
|
| -CHROMEOS_EXPORT extern const char kGroup[];
|
| CHROMEOS_EXPORT extern const char kHost[];
|
| -CHROMEOS_EXPORT extern const char kIKEVersion[];
|
| CHROMEOS_EXPORT extern const char kIPsec[];
|
| CHROMEOS_EXPORT extern const char kKeyDirection[];
|
| CHROMEOS_EXPORT extern const char kL2TP[];
|
| CHROMEOS_EXPORT extern const char kNsCertType[];
|
| CHROMEOS_EXPORT extern const char kOpenVPN[];
|
| -CHROMEOS_EXPORT extern const char kPSK[];
|
| CHROMEOS_EXPORT extern const char kPassword[];
|
| CHROMEOS_EXPORT extern const char kPort[];
|
| CHROMEOS_EXPORT extern const char kProto[];
|
| @@ -249,7 +245,7 @@ CHROMEOS_EXPORT extern const char kRemoteCertKU[];
|
| CHROMEOS_EXPORT extern const char kRemoteCertTLS[];
|
| CHROMEOS_EXPORT extern const char kRenegSec[];
|
| CHROMEOS_EXPORT extern const char kSaveCredentials[];
|
| -CHROMEOS_EXPORT extern const char kServerCARef[];
|
| +CHROMEOS_EXPORT extern const char kServerCertPEM[];
|
| CHROMEOS_EXPORT extern const char kServerCertRef[];
|
| CHROMEOS_EXPORT extern const char kServerPollTimeout[];
|
| CHROMEOS_EXPORT extern const char kShaper[];
|
| @@ -260,13 +256,26 @@ CHROMEOS_EXPORT extern const char kTypeL2TP_IPsec[];
|
| CHROMEOS_EXPORT extern const char kType[];
|
| CHROMEOS_EXPORT extern const char kUsername[];
|
| CHROMEOS_EXPORT extern const char kVerb[];
|
| -CHROMEOS_EXPORT extern const char kXAUTH[];
|
| } // namespace vpn
|
|
|
| +namespace ipsec {
|
| +CHROMEOS_EXPORT extern const char kAuthenticationType[];
|
| +CHROMEOS_EXPORT extern const char kCert[];
|
| +CHROMEOS_EXPORT extern const char kEAP[];
|
| +CHROMEOS_EXPORT extern const char kGroup[];
|
| +CHROMEOS_EXPORT extern const char kIKEVersion[];
|
| +CHROMEOS_EXPORT extern const char kPSK[];
|
| +CHROMEOS_EXPORT extern const char kServerCAPEMs[];
|
| +CHROMEOS_EXPORT extern const char kServerCARef[];
|
| +CHROMEOS_EXPORT extern const char kXAUTH[];
|
| +} // namespace ipsec
|
| +
|
| namespace openvpn {
|
| -CHROMEOS_EXPORT extern const char kNone[];
|
| CHROMEOS_EXPORT extern const char kInteract[];
|
| CHROMEOS_EXPORT extern const char kNoInteract[];
|
| +CHROMEOS_EXPORT extern const char kNone[];
|
| +CHROMEOS_EXPORT extern const char kServerCAPEMs[];
|
| +CHROMEOS_EXPORT extern const char kServerCARef[];
|
| CHROMEOS_EXPORT extern const char kServer[];
|
| } // namespace openvpn
|
|
|
|
|