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

Unified Diff: content/child/web_url_loader_impl.cc

Issue 2395323002: Roll src/third_party/boringssl/src 0d81373f9..1991af690 (Closed)
Patch Set: roll further, fix things 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 side-by-side diff with in-line comments
Download patch
Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 43c05870cbd59f597380f317a318429715bd7181..712a2dceb8c4d61863bfefaf588e2de6ecde5fd3 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -238,11 +238,17 @@ void SetSecurityStyleAndDetails(const GURL& url,
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 = "";
}

Powered by Google App Engine
This is Rietveld 408576698