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

chrome/browser/ui/website_settings/website_settings.cc

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 914ce96d88e626900c329b620da2c5a75a58689a..e8f82bcdc9ac2d81944c81d52e77a51c01df6d36 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
+#include <openssl/ssl.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -638,12 +639,21 @@ void WebsiteSettings::Init(
         (security_info.connection_status &
          net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
     const char *key_exchange, *cipher, *mac;
-    bool is_aead;
-    net::SSLCipherSuiteToStrings(
-        &key_exchange, &cipher, &mac, &is_aead, cipher_suite);
+    bool is_aead, is_tls13;
+    net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead,
+                                 &is_tls13, 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));