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

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 1422293002: Remove RC4 by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 | « net/socket/ssl_client_socket_openssl.cc ('k') | net/ssl/ssl_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index d938674135170bbf492ddbf0c2d5d36d07540593..06be299a729d085e3ddf015f21436828e9321b63 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -2502,8 +2502,8 @@ TEST_F(SSLClientSocketTest, FallbackShardSessionCache) {
SSLConnectionStatusToVersion(ssl_info.connection_status));
}
-// Test that RC4 is only enabled if enable_deprecated_cipher_suites is set.
-TEST_F(SSLClientSocketTest, DeprecatedRC4) {
+// Test that RC4 is only enabled if rc4_enabled is set.
+TEST_F(SSLClientSocketTest, RC4Enabled) {
SpawnedTestServer::SSLOptions ssl_options;
ssl_options.bulk_ciphers = SpawnedTestServer::SSLOptions::BULK_CIPHER_RC4;
ASSERT_TRUE(StartTestServer(ssl_options));
@@ -2514,8 +2514,8 @@ TEST_F(SSLClientSocketTest, DeprecatedRC4) {
ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv));
EXPECT_EQ(ERR_SSL_VERSION_OR_CIPHER_MISMATCH, rv);
- // Enabling deprecated ciphers works fine.
- ssl_config.enable_deprecated_cipher_suites = true;
+ // Enabling RC4 works fine.
+ ssl_config.rc4_enabled = true;
ASSERT_TRUE(CreateAndConnectSSLClientSocket(ssl_config, &rv));
EXPECT_EQ(OK, rv);
}
@@ -2527,7 +2527,7 @@ TEST_F(SSLClientSocketTest, DeprecatedShardSessionCache) {
// Prepare a normal and deprecated SSL config.
SSLConfig ssl_config;
SSLConfig deprecated_ssl_config;
- deprecated_ssl_config.enable_deprecated_cipher_suites = true;
+ deprecated_ssl_config.deprecated_cipher_suites_enabled = true;
// Connect with deprecated ciphers enabled to warm the session cache cache.
int rv;
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/ssl/ssl_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698