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

Unified Diff: chrome/browser/ui/website_settings/website_settings.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 48af6a2c3baf676a665a7c5b7db799cf836d17d3..ac64aec7a7da5edc97eb9ef8fa9dd44bdd3c8674 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/website_settings/website_settings.h"
-#include <openssl/ssl.h>
#include <stddef.h>
#include <stdint.h>
@@ -648,21 +647,12 @@ void WebsiteSettings::Init(
(security_info.connection_status &
net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
const char *key_exchange, *cipher, *mac;
- bool is_aead, is_tls13;
- net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead,
- &is_tls13, cipher_suite);
+ bool is_aead;
+ net::SSLCipherSuiteToStrings(
+ &key_exchange, &cipher, &mac, &is_aead, cipher_suite);
site_connection_details_ += ASCIIToUTF16("\n\n");
if (is_aead) {
- if (is_tls13) {
- // For TLS 1.3 ciphers, report the group (historically, curve) as the
- // key exchange.
- key_exchange = SSL_get_curve_name(security_info.key_exchange_group);
- if (!key_exchange) {
- NOTREACHED();
- key_exchange = "";
- }
- }
site_connection_details_ += l10n_util::GetStringFUTF16(
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD,
ASCIIToUTF16(cipher), ASCIIToUTF16(key_exchange));
« no previous file with comments | « chrome/browser/ssl/chrome_security_state_model_client_unittest.cc ('k') | components/webcrypto/algorithms/aes_kw.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698