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

Side by Side Diff: chromeos/network/onc/onc_signature.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/onc/onc_signature.h" 5 #include "chromeos/network/onc/onc_signature.h"
6 6
7 #include "chromeos/network/onc/onc_constants.h" 7 #include "chromeos/network/onc/onc_constants.h"
8 #include "third_party/cros_system_api/dbus/service_constants.h" 8 #include "third_party/cros_system_api/dbus/service_constants.h"
9 9
10 using base::Value; 10 using base::Value;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 { kRecommended, &kRecommendedSignature }, 50 { kRecommended, &kRecommendedSignature },
51 { eap::kAnonymousIdentity, &kStringSignature }, 51 { eap::kAnonymousIdentity, &kStringSignature },
52 { eap::kClientCertPattern, &kCertificatePatternSignature }, 52 { eap::kClientCertPattern, &kCertificatePatternSignature },
53 { eap::kClientCertRef, &kStringSignature }, 53 { eap::kClientCertRef, &kStringSignature },
54 { eap::kClientCertType, &kStringSignature }, 54 { eap::kClientCertType, &kStringSignature },
55 { eap::kIdentity, &kStringSignature }, 55 { eap::kIdentity, &kStringSignature },
56 { eap::kInner, &kStringSignature }, 56 { eap::kInner, &kStringSignature },
57 { eap::kOuter, &kStringSignature }, 57 { eap::kOuter, &kStringSignature },
58 { eap::kPassword, &kStringSignature }, 58 { eap::kPassword, &kStringSignature },
59 { eap::kSaveCredentials, &kBoolSignature }, 59 { eap::kSaveCredentials, &kBoolSignature },
60 { eap::kServerCAFingerprint, &kStringSignature },
60 { eap::kServerCARef, &kStringSignature }, 61 { eap::kServerCARef, &kStringSignature },
61 { eap::kUseSystemCAs, &kBoolSignature }, 62 { eap::kUseSystemCAs, &kBoolSignature },
62 { NULL } 63 { NULL }
63 }; 64 };
64 65
65 const OncFieldSignature ipsec_fields[] = { 66 const OncFieldSignature ipsec_fields[] = {
66 { kRecommended, &kRecommendedSignature }, 67 { kRecommended, &kRecommendedSignature },
67 { vpn::kAuthenticationType, &kStringSignature }, 68 { vpn::kAuthenticationType, &kStringSignature },
68 { vpn::kClientCertPattern, &kCertificatePatternSignature }, 69 { vpn::kClientCertPattern, &kCertificatePatternSignature },
69 { vpn::kClientCertRef, &kStringSignature }, 70 { vpn::kClientCertRef, &kStringSignature },
70 { vpn::kClientCertType, &kStringSignature }, 71 { vpn::kClientCertType, &kStringSignature },
71 { vpn::kGroup, &kStringSignature }, 72 { vpn::kGroup, &kStringSignature },
72 { vpn::kIKEVersion, &kIntegerSignature }, 73 { vpn::kIKEVersion, &kIntegerSignature },
73 { vpn::kPSK, &kStringSignature }, 74 { vpn::kPSK, &kStringSignature },
74 { vpn::kSaveCredentials, &kBoolSignature }, 75 { vpn::kSaveCredentials, &kBoolSignature },
76 { vpn::kServerCAFingerprint, &kStringSignature },
75 { vpn::kServerCARef, &kStringSignature }, 77 { vpn::kServerCARef, &kStringSignature },
76 // Not yet supported. 78 // Not yet supported.
77 // { vpn::kEAP, &kEAPSignature }, 79 // { vpn::kEAP, &kEAPSignature },
78 // { vpn::kXAUTH, &kXAUTHSignature }, 80 // { vpn::kXAUTH, &kXAUTHSignature },
79 { NULL } 81 { NULL }
80 }; 82 };
81 83
82 const OncFieldSignature l2tp_fields[] = { 84 const OncFieldSignature l2tp_fields[] = {
83 { kRecommended, &kRecommendedSignature }, 85 { kRecommended, &kRecommendedSignature },
84 { vpn::kPassword, &kStringSignature }, 86 { vpn::kPassword, &kStringSignature },
(...skipping 17 matching lines...) Expand all
102 { vpn::kNsCertType, &kStringSignature }, 104 { vpn::kNsCertType, &kStringSignature },
103 { vpn::kPassword, &kStringSignature }, 105 { vpn::kPassword, &kStringSignature },
104 { vpn::kPort, &kIntegerSignature }, 106 { vpn::kPort, &kIntegerSignature },
105 { vpn::kProto, &kStringSignature }, 107 { vpn::kProto, &kStringSignature },
106 { vpn::kPushPeerInfo, &kBoolSignature }, 108 { vpn::kPushPeerInfo, &kBoolSignature },
107 { vpn::kRemoteCertEKU, &kStringSignature }, 109 { vpn::kRemoteCertEKU, &kStringSignature },
108 { vpn::kRemoteCertKU, &kStringListSignature }, 110 { vpn::kRemoteCertKU, &kStringListSignature },
109 { vpn::kRemoteCertTLS, &kStringSignature }, 111 { vpn::kRemoteCertTLS, &kStringSignature },
110 { vpn::kRenegSec, &kIntegerSignature }, 112 { vpn::kRenegSec, &kIntegerSignature },
111 { vpn::kSaveCredentials, &kBoolSignature }, 113 { vpn::kSaveCredentials, &kBoolSignature },
114 { vpn::kServerCAFingerprint, &kStringSignature },
112 { vpn::kServerCARef, &kStringSignature }, 115 { vpn::kServerCARef, &kStringSignature },
113 // Not supported, yet. 116 // Not supported, yet.
117 { vpn::kServerCertFingerprint, &kStringSignature },
114 { vpn::kServerCertRef, &kStringSignature }, 118 { vpn::kServerCertRef, &kStringSignature },
115 { vpn::kServerPollTimeout, &kIntegerSignature }, 119 { vpn::kServerPollTimeout, &kIntegerSignature },
116 { vpn::kShaper, &kIntegerSignature }, 120 { vpn::kShaper, &kIntegerSignature },
117 { vpn::kStaticChallenge, &kStringSignature }, 121 { vpn::kStaticChallenge, &kStringSignature },
118 { vpn::kTLSAuthContents, &kStringSignature }, 122 { vpn::kTLSAuthContents, &kStringSignature },
119 { vpn::kTLSRemote, &kStringSignature }, 123 { vpn::kTLSRemote, &kStringSignature },
120 { vpn::kUsername, &kStringSignature }, 124 { vpn::kUsername, &kStringSignature },
121 // Not supported, yet. 125 // Not supported, yet.
122 { vpn::kVerb, &kStringSignature }, 126 { vpn::kVerb, &kStringSignature },
123 { NULL } 127 { NULL }
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (&signature == entry->value_signature && 397 if (&signature == entry->value_signature &&
394 onc_field_name == entry->field_name) { 398 onc_field_name == entry->field_name) {
395 return true; 399 return true;
396 } 400 }
397 } 401 }
398 return false; 402 return false;
399 } 403 }
400 404
401 } // namespace onc 405 } // namespace onc
402 } // namespace chromeos 406 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698