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

Side by Side Diff: net/cert/x509_certificate.cc

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 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
« no previous file with comments | « net/cert/ct_known_logs_static.h ('k') | net/dns/host_resolver_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/base64.h" 14 #include "base/base64.h"
15 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/memory/singleton.h" 18 #include "base/memory/singleton.h"
19 #include "base/metrics/histogram.h" 19 #include "base/metrics/histogram.h"
20 #include "base/pickle.h" 20 #include "base/pickle.h"
21 #include "base/profiler/scoped_tracker.h"
21 #include "base/sha1.h" 22 #include "base/sha1.h"
22 #include "base/strings/string_piece.h" 23 #include "base/strings/string_piece.h"
23 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
24 #include "base/synchronization/lock.h" 25 #include "base/synchronization/lock.h"
25 #include "base/time/time.h" 26 #include "base/time/time.h"
26 #include "crypto/secure_hash.h" 27 #include "crypto/secure_hash.h"
27 #include "net/base/net_util.h" 28 #include "net/base/net_util.h"
28 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 29 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
29 #include "net/cert/pem_tokenizer.h" 30 #include "net/cert/pem_tokenizer.h"
30 #include "url/url_canon.h" 31 #include "url/url_canon.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 X509Certificate* X509Certificate::CreateFromHandle( 256 X509Certificate* X509Certificate::CreateFromHandle(
256 OSCertHandle cert_handle, 257 OSCertHandle cert_handle,
257 const OSCertHandles& intermediates) { 258 const OSCertHandles& intermediates) {
258 DCHECK(cert_handle); 259 DCHECK(cert_handle);
259 return new X509Certificate(cert_handle, intermediates); 260 return new X509Certificate(cert_handle, intermediates);
260 } 261 }
261 262
262 // static 263 // static
263 X509Certificate* X509Certificate::CreateFromDERCertChain( 264 X509Certificate* X509Certificate::CreateFromDERCertChain(
264 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.
267 tracked_objects::ScopedTracker tracking_profile(
268 FROM_HERE_WITH_EXPLICIT_FUNCTION(
269 "424386 X509Certificate::CreateFromDERCertChain"));
270
265 if (der_certs.empty()) 271 if (der_certs.empty())
266 return NULL; 272 return NULL;
267 273
268 X509Certificate::OSCertHandles intermediate_ca_certs; 274 X509Certificate::OSCertHandles intermediate_ca_certs;
269 for (size_t i = 1; i < der_certs.size(); i++) { 275 for (size_t i = 1; i < der_certs.size(); i++) {
270 OSCertHandle handle = CreateOSCertHandleFromBytes( 276 OSCertHandle handle = CreateOSCertHandleFromBytes(
271 const_cast<char*>(der_certs[i].data()), der_certs[i].size()); 277 const_cast<char*>(der_certs[i].data()), der_certs[i].size());
272 if (!handle) 278 if (!handle)
273 break; 279 break;
274 intermediate_ca_certs.push_back(handle); 280 intermediate_ca_certs.push_back(handle);
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 RemoveFromCache(cert_handle_); 756 RemoveFromCache(cert_handle_);
751 FreeOSCertHandle(cert_handle_); 757 FreeOSCertHandle(cert_handle_);
752 } 758 }
753 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) { 759 for (size_t i = 0; i < intermediate_ca_certs_.size(); ++i) {
754 RemoveFromCache(intermediate_ca_certs_[i]); 760 RemoveFromCache(intermediate_ca_certs_[i]);
755 FreeOSCertHandle(intermediate_ca_certs_[i]); 761 FreeOSCertHandle(intermediate_ca_certs_[i]);
756 } 762 }
757 } 763 }
758 764
759 } // namespace net 765 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/ct_known_logs_static.h ('k') | net/dns/host_resolver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698