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: rebase, roll further 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
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e19bf5fc051e969decc0b37214975d882662f0a3..dd6425d64fe227305fde3703df4a553694a27a15 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -276,11 +276,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 = "";
}
« 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