OLD | NEW |
---|---|
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/client_cert_util.h" | 5 #include "chromeos/network/client_cert_util.h" |
6 | 6 |
7 #include <cert.h> | 7 #include <cert.h> |
8 #include <pk11pub.h> | 8 #include <pk11pub.h> |
9 | 9 |
10 #include <list> | 10 #include <list> |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
192 for (CertificateStlList::iterator iter = matching_certs.begin(); | 192 for (CertificateStlList::iterator iter = matching_certs.begin(); |
193 iter != matching_certs.end(); ++iter) { | 193 iter != matching_certs.end(); ++iter) { |
194 if (!latest.get() || (*iter)->valid_start() > latest->valid_start()) | 194 if (!latest.get() || (*iter)->valid_start() > latest->valid_start()) |
195 latest = *iter; | 195 latest = *iter; |
196 } | 196 } |
197 | 197 |
198 return latest; | 198 return latest; |
199 } | 199 } |
200 | 200 |
201 void SetShillProperties(const client_cert::ConfigType cert_config_type, | 201 void SetShillProperties(const client_cert::ConfigType cert_config_type, |
202 // XXX: should tmp_slot arg be removed if slot id is now | |
203 // included in the GetPkcs11IdForCert output? | |
pneubeck (no reviews)
2014/06/13 12:40:42
This has to be discussed with the Shill team (pste
| |
202 const std::string& tpm_slot, | 204 const std::string& tpm_slot, |
203 const std::string& tpm_pin, | 205 const std::string& tpm_pin, |
204 const std::string* pkcs11_id, | 206 const std::string* pkcs11_id, |
205 base::DictionaryValue* properties) { | 207 base::DictionaryValue* properties) { |
206 const char* tpm_pin_property = NULL; | 208 const char* tpm_pin_property = NULL; |
207 switch (cert_config_type) { | 209 switch (cert_config_type) { |
208 case CONFIG_TYPE_NONE: { | 210 case CONFIG_TYPE_NONE: { |
209 return; | 211 return; |
210 } | 212 } |
211 case CONFIG_TYPE_OPENVPN: { | 213 case CONFIG_TYPE_OPENVPN: { |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
278 return !cert_id.empty() && !key_id.empty() && !identity.empty(); | 280 return !cert_id.empty() && !key_id.empty() && !identity.empty(); |
279 } | 281 } |
280 } | 282 } |
281 NOTREACHED(); | 283 NOTREACHED(); |
282 return false; | 284 return false; |
283 } | 285 } |
284 | 286 |
285 } // namespace client_cert | 287 } // namespace client_cert |
286 | 288 |
287 } // namespace chromeos | 289 } // namespace chromeos |
OLD | NEW |