OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "net/base/x509_certificate.h" | 5 #include "net/base/x509_certificate.h" |
6 | 6 |
7 #include <stdlib.h> | 7 #include <stdlib.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 | 255 |
256 // static | 256 // static |
257 X509Certificate* X509Certificate::CreateFromDERCertChain( | 257 X509Certificate* X509Certificate::CreateFromDERCertChain( |
258 const std::vector<base::StringPiece>& der_certs) { | 258 const std::vector<base::StringPiece>& der_certs) { |
259 if (der_certs.empty()) | 259 if (der_certs.empty()) |
260 return NULL; | 260 return NULL; |
261 | 261 |
262 X509Certificate::OSCertHandles intermediate_ca_certs; | 262 X509Certificate::OSCertHandles intermediate_ca_certs; |
263 for (size_t i = 1; i < der_certs.size(); i++) { | 263 for (size_t i = 1; i < der_certs.size(); i++) { |
264 OSCertHandle handle = CreateOSCert(der_certs[i]); | 264 OSCertHandle handle = CreateOSCert(der_certs[i]); |
265 DCHECK(handle); | 265 if (!handle) |
| 266 break; |
266 intermediate_ca_certs.push_back(handle); | 267 intermediate_ca_certs.push_back(handle); |
267 } | 268 } |
268 | 269 |
269 OSCertHandle handle = CreateOSCert(der_certs[0]); | 270 OSCertHandle handle = NULL; |
270 DCHECK(handle); | 271 // Return NULL if we failed to parse any of the certs. |
271 X509Certificate* cert = CreateFromHandle(handle, intermediate_ca_certs); | 272 if (der_certs.size() - 1 == intermediate_ca_certs.size()) |
272 FreeOSCertHandle(handle); | 273 handle = CreateOSCert(der_certs[0]); |
| 274 |
| 275 X509Certificate* cert = NULL; |
| 276 if (handle) { |
| 277 cert = CreateFromHandle(handle, intermediate_ca_certs); |
| 278 FreeOSCertHandle(handle); |
| 279 } |
| 280 |
273 for (size_t i = 0; i < intermediate_ca_certs.size(); i++) | 281 for (size_t i = 0; i < intermediate_ca_certs.size(); i++) |
274 FreeOSCertHandle(intermediate_ca_certs[i]); | 282 FreeOSCertHandle(intermediate_ca_certs[i]); |
275 | 283 |
276 return cert; | 284 return cert; |
277 } | 285 } |
278 | 286 |
279 // static | 287 // static |
280 X509Certificate* X509Certificate::CreateFromBytes(const char* data, | 288 X509Certificate* X509Certificate::CreateFromBytes(const char* data, |
281 int length) { | 289 int length) { |
282 OSCertHandle cert_handle = CreateOSCertHandleFromBytes(data, length); | 290 OSCertHandle cert_handle = CreateOSCertHandleFromBytes(data, length); |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
682 bool X509Certificate::IsSHA1HashInSortedArray(const SHA1Fingerprint& hash, | 690 bool X509Certificate::IsSHA1HashInSortedArray(const SHA1Fingerprint& hash, |
683 const uint8* array, | 691 const uint8* array, |
684 size_t array_byte_len) { | 692 size_t array_byte_len) { |
685 DCHECK_EQ(0u, array_byte_len % base::SHA1_LENGTH); | 693 DCHECK_EQ(0u, array_byte_len % base::SHA1_LENGTH); |
686 const unsigned arraylen = array_byte_len / base::SHA1_LENGTH; | 694 const unsigned arraylen = array_byte_len / base::SHA1_LENGTH; |
687 return NULL != bsearch(hash.data, array, arraylen, base::SHA1_LENGTH, | 695 return NULL != bsearch(hash.data, array, arraylen, base::SHA1_LENGTH, |
688 CompareSHA1Hashes); | 696 CompareSHA1Hashes); |
689 } | 697 } |
690 | 698 |
691 } // namespace net | 699 } // namespace net |
OLD | NEW |