diff options
| author | Bodo Möller <bodo@openssl.org> | 2005-10-26 19:40:45 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2005-10-26 19:40:45 +0000 |
| commit | 72dce7685ecd1017420af0a0497923a88d60735a (patch) | |
| tree | cb86c5fa34affa787b5e181034ba733d18a372d5 /ssl | |
| parent | ee8836c442409252931c3952606eb7aadfa334f1 (diff) | |
Add fixes for CAN-2005-2969.
(This were in 0.9.7-stable and 0.9.8-stable, but not in HEAD so far.)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s23_srvr.c | 7 | ||||
| -rw-r--r-- | ssl/ssl.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 7168385659..5bf37c94d6 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 @@ -480,7 +480,7 @@ typedef struct ssl_session_st #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L -#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L +#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */ #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L #define SSL_OP_TLS_D5_BUG 0x00000100L #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L |