net: add a new message for AEAD ciphers.
Currently we display GCM ciphersuites as "CTR" mode for the encryption with a
MAC of "GHASH". This change adds a new template for AEAD modes that lets us
express that both encryption and authentication are provided by the same
primitive.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/15714010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205848 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 4b5d9019..6c3db3f3 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -419,12 +419,20 @@
(ssl.connection_status &
net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
const char *key_exchange, *cipher, *mac;
- net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, cipher_suite);
+ bool is_aead;
+ net::SSLCipherSuiteToStrings(
+ &key_exchange, &cipher, &mac, &is_aead, cipher_suite);
site_connection_details_ += ASCIIToUTF16("\n\n");
- site_connection_details_ += l10n_util::GetStringFUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
- ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
+ if (is_aead) {
+ site_connection_details_ += l10n_util::GetStringFUTF16(
+ IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD,
+ ASCIIToUTF16(cipher), ASCIIToUTF16(key_exchange));
+ } else {
+ site_connection_details_ += l10n_util::GetStringFUTF16(
+ IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
+ ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
+ }
if (did_fallback) {
// For now, only SSLv3 fallback will trigger a warning icon.
