import of openssl-0.9.7j

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)
 int ssl23_accept(SSL *s)
         {
         BUF_MEM *buf;
-        unsigned long Time=time(NULL);
+        unsigned long Time=(unsigned long)time(NULL);
         void (*cb)(const SSL *ssl,int type,int val)=NULL;
         int ret= -1;
         int new_state,state;
@@ -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