diff options
Diffstat (limited to 'src/lib/libssl/s23_srvr.c')
-rw-r--r-- | src/lib/libssl/s23_srvr.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c index 92f3391f60..b73abc448f 100644 --- a/src/lib/libssl/s23_srvr.c +++ b/src/lib/libssl/s23_srvr.c | |||
@@ -158,7 +158,7 @@ SSL_METHOD *SSLv23_server_method(void) | |||
158 | int ssl23_accept(SSL *s) | 158 | int ssl23_accept(SSL *s) |
159 | { | 159 | { |
160 | BUF_MEM *buf; | 160 | BUF_MEM *buf; |
161 | unsigned long Time=time(NULL); | 161 | unsigned long Time=(unsigned long)time(NULL); |
162 | void (*cb)(const SSL *ssl,int type,int val)=NULL; | 162 | void (*cb)(const SSL *ssl,int type,int val)=NULL; |
163 | int ret= -1; | 163 | int ret= -1; |
164 | int new_state,state; | 164 | int new_state,state; |
@@ -268,9 +268,6 @@ int ssl23_get_client_hello(SSL *s) | |||
268 | int n=0,j; | 268 | int n=0,j; |
269 | int type=0; | 269 | int type=0; |
270 | int v[2]; | 270 | int v[2]; |
271 | #ifndef OPENSSL_NO_RSA | ||
272 | int use_sslv2_strong=0; | ||
273 | #endif | ||
274 | 271 | ||
275 | if (s->state == SSL23_ST_SR_CLNT_HELLO_A) | 272 | if (s->state == SSL23_ST_SR_CLNT_HELLO_A) |
276 | { | 273 | { |
@@ -528,9 +525,7 @@ int ssl23_get_client_hello(SSL *s) | |||
528 | } | 525 | } |
529 | 526 | ||
530 | s->state=SSL2_ST_GET_CLIENT_HELLO_A; | 527 | s->state=SSL2_ST_GET_CLIENT_HELLO_A; |
531 | if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) || | 528 | if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3) |
532 | use_sslv2_strong || | ||
533 | (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)) | ||
534 | s->s2->ssl2_rollback=0; | 529 | s->s2->ssl2_rollback=0; |
535 | else | 530 | else |
536 | /* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0 | 531 | /* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0 |