| 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 "net/cert/x509_certificate.h" | 5 #include "net/cert/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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 X509Certificate* X509Certificate::CreateFromHandle( | 256 X509Certificate* X509Certificate::CreateFromHandle( |
| 257 OSCertHandle cert_handle, | 257 OSCertHandle cert_handle, |
| 258 const OSCertHandles& intermediates) { | 258 const OSCertHandles& intermediates) { |
| 259 DCHECK(cert_handle); | 259 DCHECK(cert_handle); |
| 260 return new X509Certificate(cert_handle, intermediates); | 260 return new X509Certificate(cert_handle, intermediates); |
| 261 } | 261 } |
| 262 | 262 |
| 263 // static | 263 // static |
| 264 X509Certificate* X509Certificate::CreateFromDERCertChain( | 264 X509Certificate* X509Certificate::CreateFromDERCertChain( |
| 265 const std::vector<base::StringPiece>& der_certs) { | 265 const std::vector<base::StringPiece>& der_certs) { |
| 266 // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed. | 266 // TODO(cbentzel): Remove ScopedTracker below once crbug.com/424386 is fixed. |
| 267 tracked_objects::ScopedTracker tracking_profile( | 267 tracked_objects::ScopedTracker tracking_profile( |
| 268 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 268 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 269 "424386 X509Certificate::CreateFromDERCertChain")); | 269 "424386 X509Certificate::CreateFromDERCertChain")); |
| 270 | 270 |
| 271 if (der_certs.empty()) | 271 if (der_certs.empty()) |
| 272 return NULL; | 272 return NULL; |
| 273 | 273 |
| 274 X509Certificate::OSCertHandles intermediate_ca_certs; | 274 X509Certificate::OSCertHandles intermediate_ca_certs; |
| 275 for (size_t i = 1; i < der_certs.size(); i++) { | 275 for (size_t i = 1; i < der_certs.size(); i++) { |
| 276 OSCertHandle handle = CreateOSCertHandleFromBytes( | 276 OSCertHandle handle = CreateOSCertHandleFromBytes( |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 756 RemoveFromCache(cert_handle_); | 756 RemoveFromCache(cert_handle_); |
| 757 FreeOSCertHandle(cert_handle_); | 757 FreeOSCertHandle(cert_handle_); |
| 758 } | 758 } |
| 759 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) { | 759 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) { |
| 760 RemoveFromCache(intermediate_ca_certs_[i]); | 760 RemoveFromCache(intermediate_ca_certs_[i]); |
| 761 FreeOSCertHandle(intermediate_ca_certs_[i]); | 761 FreeOSCertHandle(intermediate_ca_certs_[i]); |
| 762 } | 762 } |
| 763 } | 763 } |
| 764 | 764 |
| 765 } // namespace net | 765 } // namespace net |
| OLD | NEW |