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

Unified Diff: net/socket/ssl_server_socket_openssl.cc

Issue 1139013002: Completely remove SSLv3 support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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: net/socket/ssl_server_socket_openssl.cc
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index 6bc13e6a3469942dcf75cd31ee29be8185780980..52dc618cfe1da7c189d2bc66a4e91d15cdf1a4f1 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -654,24 +654,14 @@ int SSLServerSocketOpenSSL::Init() {
return ERR_UNEXPECTED;
}
+ DCHECK_LT(SSL3_VERSION, ssl_config_.version_min);
+ DCHECK_LT(SSL3_VERSION, ssl_config_.version_max);
+ SSL_set_min_version(ssl_, ssl_config_.version_min);
+ SSL_set_max_version(ssl_, ssl_config_.version_max);
+
// OpenSSL defaults some options to on, others to off. To avoid ambiguity,
// set everything we care about to an absolute value.
SslSetClearMask options;
- options.ConfigureFlag(SSL_OP_NO_SSLv2, true);
- bool ssl3_enabled = (ssl_config_.version_min == SSL_PROTOCOL_VERSION_SSL3);
- options.ConfigureFlag(SSL_OP_NO_SSLv3, !ssl3_enabled);
- bool tls1_enabled = (ssl_config_.version_min <= SSL_PROTOCOL_VERSION_TLS1 &&
- ssl_config_.version_max >= SSL_PROTOCOL_VERSION_TLS1);
- options.ConfigureFlag(SSL_OP_NO_TLSv1, !tls1_enabled);
- bool tls1_1_enabled =
- (ssl_config_.version_min <= SSL_PROTOCOL_VERSION_TLS1_1 &&
- ssl_config_.version_max >= SSL_PROTOCOL_VERSION_TLS1_1);
- options.ConfigureFlag(SSL_OP_NO_TLSv1_1, !tls1_1_enabled);
- bool tls1_2_enabled =
- (ssl_config_.version_min <= SSL_PROTOCOL_VERSION_TLS1_2 &&
- ssl_config_.version_max >= SSL_PROTOCOL_VERSION_TLS1_2);
- options.ConfigureFlag(SSL_OP_NO_TLSv1_2, !tls1_2_enabled);
-
options.ConfigureFlag(SSL_OP_NO_COMPRESSION, true);
SSL_set_options(ssl_, options.set_mask);

Powered by Google App Engine
This is Rietveld 408576698