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

Side by Side Diff: content/browser/loader/resource_loader.cc

Issue 1313363003: Expose OpenSSL's key_exchange_info in the content API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Drop superfluous comment Created 5 years, 3 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 | « no previous file | content/common/ssl_status_serialization.cc » ('j') | net/ssl/ssl_info.h » ('J')
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 "content/browser/loader/resource_loader.h" 5 #include "content/browser/loader/resource_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/profiler/scoped_tracker.h" 10 #include "base/profiler/scoped_tracker.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 int cert_id = 70 int cert_id =
71 CertStore::GetInstance()->StoreCert(ssl_info.cert.get(), child_id); 71 CertStore::GetInstance()->StoreCert(ssl_info.cert.get(), child_id);
72 72
73 SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids; 73 SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids;
74 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps, 74 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps,
75 child_id, &signed_certificate_timestamp_ids); 75 child_id, &signed_certificate_timestamp_ids);
76 76
77 ssl_status->cert_id = cert_id; 77 ssl_status->cert_id = cert_id;
78 ssl_status->cert_status = ssl_info.cert_status; 78 ssl_status->cert_status = ssl_info.cert_status;
79 ssl_status->security_bits = ssl_info.security_bits; 79 ssl_status->security_bits = ssl_info.security_bits;
80 ssl_status->key_exchange_info = ssl_info.key_exchange_info;
80 ssl_status->connection_status = ssl_info.connection_status; 81 ssl_status->connection_status = ssl_info.connection_status;
81 ssl_status->signed_certificate_timestamp_ids = 82 ssl_status->signed_certificate_timestamp_ids =
82 signed_certificate_timestamp_ids; 83 signed_certificate_timestamp_ids;
83 ssl_status->security_style = 84 ssl_status->security_style =
84 SSLPolicy::GetSecurityStyleForResource(url, *ssl_status); 85 SSLPolicy::GetSecurityStyleForResource(url, *ssl_status);
85 } 86 }
86 87
87 void PopulateResourceResponse(ResourceRequestInfoImpl* info, 88 void PopulateResourceResponse(ResourceRequestInfoImpl* info,
88 net::URLRequest* request, 89 net::URLRequest* request,
89 ResourceResponse* response) { 90 ResourceResponse* response) {
(...skipping 24 matching lines...) Expand all
114 115
115 if (request->ssl_info().cert.get()) { 116 if (request->ssl_info().cert.get()) {
116 SSLStatus ssl_status; 117 SSLStatus ssl_status;
117 GetSSLStatusForRequest(request->url(), request->ssl_info(), 118 GetSSLStatusForRequest(request->url(), request->ssl_info(),
118 info->GetChildID(), &ssl_status); 119 info->GetChildID(), &ssl_status);
119 response->head.security_info = SerializeSecurityInfo(ssl_status); 120 response->head.security_info = SerializeSecurityInfo(ssl_status);
120 } else { 121 } else {
121 // We should not have any SSL state. 122 // We should not have any SSL state.
122 DCHECK(!request->ssl_info().cert_status && 123 DCHECK(!request->ssl_info().cert_status &&
123 request->ssl_info().security_bits == -1 && 124 request->ssl_info().security_bits == -1 &&
125 request->ssl_info().key_exchange_info == 0 &&
124 !request->ssl_info().connection_status); 126 !request->ssl_info().connection_status);
davidben 2015/09/15 14:33:17 Nit: Existing thing, but this probably ought to be
sigbjorn 2015/09/15 15:10:56 Done.
125 } 127 }
126 } 128 }
127 129
128 } // namespace 130 } // namespace
129 131
130 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request, 132 ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
131 scoped_ptr<ResourceHandler> handler, 133 scoped_ptr<ResourceHandler> handler,
132 ResourceLoaderDelegate* delegate) 134 ResourceLoaderDelegate* delegate)
133 : deferred_stage_(DEFERRED_NONE), 135 : deferred_stage_(DEFERRED_NONE),
134 request_(request.Pass()), 136 request_(request.Pass()),
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 case net::URLRequestStatus::FAILED: 764 case net::URLRequestStatus::FAILED:
763 status = STATUS_UNDEFINED; 765 status = STATUS_UNDEFINED;
764 break; 766 break;
765 } 767 }
766 768
767 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); 769 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX);
768 } 770 }
769 } 771 }
770 772
771 } // namespace content 773 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/ssl_status_serialization.cc » ('j') | net/ssl/ssl_info.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698