diff options
| author | Mark J. Cox <mark@openssl.org> | 2005-10-11 10:16:21 +0000 |
|---|---|---|
| committer | Mark J. Cox <mark@openssl.org> | 2005-10-11 10:16:21 +0000 |
| commit | 64932f9e4aab568f758ad8318ea99774bbcfbbbd (patch) | |
| tree | 658a10fbf02a226c7b0324029a238caaa837f04b /ssl/s23_srvr.c | |
| parent | 5a20efcf172df3e4b6049322f4e7f3a6d4a5b357 (diff) | |
Add fixes for CAN-2005-2969OpenSSL_0_9_8a
Bump release ready for OpenSSL_0_9_8a tag
Diffstat (limited to 'ssl/s23_srvr.c')
| -rw-r--r-- | ssl/s23_srvr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 945a2c9872..5cd00f850e 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -250,9 +250,6 @@ int ssl23_get_client_hello(SSL *s) int n=0,j; int type=0; int v[2]; -#ifndef OPENSSL_NO_RSA - int use_sslv2_strong=0; -#endif if (s->state == SSL23_ST_SR_CLNT_HELLO_A) { @@ -501,9 +498,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 |