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

Unified Diff: net/socket/nss_ssl_util.cc

Issue 60353005: net: disable ChaCha20 based cipher suites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Match against ssl_calg_chacha20 Created 7 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/nss_ssl_util.cc
diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc
index 7e3aee430c4417353bca38270ea2f4564e90a0e0..8547d4dc1cf493f167c4a2ebb731c809029870dc 100644
--- a/net/socket/nss_ssl_util.cc
+++ b/net/socket/nss_ssl_util.cc
@@ -70,6 +70,11 @@ class NSSSSLInitSingleton {
enabled = false;
}
+ // We also disable ChaCha20 based cipher suites for now because we
+ // aren't quite ready to use them in M32.
+ if (info.symCipher == ssl_calg_chacha20)
+ enabled = false;
+
if (ssl_ciphers[i] == TLS_DHE_DSS_WITH_AES_128_CBC_SHA) {
// Enabled to allow servers with only a DSA certificate to function.
enabled = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698