diff options
| author | Mark J. Cox <[email protected]> | 2005-10-11 12:10:05 +0200 |
|---|---|---|
| committer | Mark J. Cox <[email protected]> | 2005-10-11 12:10:05 +0200 |
| commit | a40916cbba82e54f632c5312b4c02248ba49760e (patch) | |
| tree | 24c16b2fcef0a65665b346592cb1375c7295a801 /ssl | |
| parent | successfully updating the db shouldn't result in an error message (diff) | |
| download | openssl-OpenSSL_0_9_7h.tar.gz openssl-OpenSSL_0_9_7h.zip | |
Add fixes for CAN-2005-2969OpenSSL_0_9_7h
Bump release ready for OpenSSL_0_9_7h tag
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 92f3391f601..1612ba2b1de 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -268,9 +268,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) { @@ -528,9 +525,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 diff --git a/ssl/ssl.h b/ssl/ssl.h index 13b8abe3c24..f553be62626 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -467,7 +467,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 |