From ed304be38e96a682fb5c64e641a81e0295073e63 Mon Sep 17 00:00:00 2001 From: gendalia Date: Tue, 11 Oct 2005 18:07:40 +0000 Subject: [PATCH] fix openssl 2.0 rollback, CAN-2005-2969 approved by: agc --- crypto/dist/openssl/ssl/s23_srvr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crypto/dist/openssl/ssl/s23_srvr.c b/crypto/dist/openssl/ssl/s23_srvr.c index 92f3391f601e..e9edc34328e2 100644 --- a/crypto/dist/openssl/ssl/s23_srvr.c +++ b/crypto/dist/openssl/ssl/s23_srvr.c @@ -528,9 +528,7 @@ int ssl23_get_client_hello(SSL *s) } s->state=SSL2_ST_GET_CLIENT_HELLO_A; - if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) || - use_sslv2_strong || - (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)) + if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3) s->s2->ssl2_rollback=0; else /* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0