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

Side by Side Diff: content/child/web_url_loader_impl.cc

Issue 2418113002: Revert "Roll src/third_party/boringssl/src 0d81373f9..1991af690" (https://codereview.chromium.org/2… (Closed)
Patch Set: Created 4 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/child/web_url_loader_impl.h" 5 #include "content/child/web_url_loader_impl.h"
6 6
7 #include <openssl/ssl.h> 7 #include <openssl/ssl.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 269
270 int ssl_version = 270 int ssl_version =
271 net::SSLConnectionStatusToVersion(info.ssl_connection_status); 271 net::SSLConnectionStatusToVersion(info.ssl_connection_status);
272 const char* protocol; 272 const char* protocol;
273 net::SSLVersionToString(&protocol, ssl_version); 273 net::SSLVersionToString(&protocol, ssl_version);
274 274
275 const char* key_exchange; 275 const char* key_exchange;
276 const char* cipher; 276 const char* cipher;
277 const char* mac; 277 const char* mac;
278 bool is_aead; 278 bool is_aead;
279 bool is_tls13;
280 uint16_t cipher_suite = 279 uint16_t cipher_suite =
281 net::SSLConnectionStatusToCipherSuite(info.ssl_connection_status); 280 net::SSLConnectionStatusToCipherSuite(info.ssl_connection_status);
282 net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, 281 net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead,
283 &is_tls13, cipher_suite); 282 cipher_suite);
284 if (key_exchange == nullptr) { 283 if (mac == NULL) {
285 DCHECK(is_tls13);
286 key_exchange = "";
287 }
288
289 if (mac == nullptr) {
290 DCHECK(is_aead); 284 DCHECK(is_aead);
291 mac = ""; 285 mac = "";
292 } 286 }
293 287
294 const char* key_exchange_group = ""; 288 const char* key_exchange_group = "";
295 if (info.ssl_key_exchange_group != 0) { 289 if (info.ssl_key_exchange_group != 0) {
296 // Historically the field was named 'curve' rather than 'group'. 290 // Historically the field was named 'curve' rather than 'group'.
297 key_exchange_group = SSL_get_curve_name(info.ssl_key_exchange_group); 291 key_exchange_group = SSL_get_curve_name(info.ssl_key_exchange_group);
298 if (!key_exchange_group) { 292 if (!key_exchange_group) {
299 NOTREACHED(); 293 NOTREACHED();
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 int intra_priority_value) { 1234 int intra_priority_value) {
1241 context_->DidChangePriority(new_priority, intra_priority_value); 1235 context_->DidChangePriority(new_priority, intra_priority_value);
1242 } 1236 }
1243 1237
1244 void WebURLLoaderImpl::setLoadingTaskRunner( 1238 void WebURLLoaderImpl::setLoadingTaskRunner(
1245 blink::WebTaskRunner* loading_task_runner) { 1239 blink::WebTaskRunner* loading_task_runner) {
1246 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner()); 1240 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner());
1247 } 1241 }
1248 1242
1249 } // namespace content 1243 } // namespace content
OLDNEW
« no previous file with comments | « components/webcrypto/algorithms/aes_kw.cc ('k') | net/quic/chromium/quic_chromium_client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698