Roll src/third_party/boringssl/src 0d81373f9..1991af690

content/child/web_url_loader_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/web_url_loader_impl.h"
 
 #include <openssl/ssl.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 258 matching lines @@
 
   int ssl_version =
       net::SSLConnectionStatusToVersion(info.ssl_connection_status);
   const char* protocol;
   net::SSLVersionToString(&protocol, ssl_version);
 
   const char* key_exchange;
   const char* cipher;
   const char* mac;
   bool is_aead;
+  bool is_tls13;
   uint16_t cipher_suite =
       net::SSLConnectionStatusToCipherSuite(info.ssl_connection_status);
   net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead,
-                               cipher_suite);
-  if (mac == NULL) {
+                               &is_tls13, cipher_suite);
+  if (key_exchange == nullptr) {
+    DCHECK(is_tls13);
+    key_exchange = "";
+  }
+
+  if (mac == nullptr) {
     DCHECK(is_aead);
     mac = "";
   }
 
   const char* key_exchange_group = "";
   if (info.ssl_key_exchange_group != 0) {
     // Historically the field was named 'curve' rather than 'group'.
     key_exchange_group = SSL_get_curve_name(info.ssl_key_exchange_group);
     if (!key_exchange_group) {
       NOTREACHED();
@@ skipping 940 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 void WebURLLoaderImpl::setLoadingTaskRunner(
     blink::WebTaskRunner* loading_task_runner) {
   context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner());
 }
 
 }  // namespace content