Document rollback issues.

[openssl.git] / ssl / s23_srvr.c

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 33634efdcb3537e9187ddde05af80563d70e5a7a..a81544a1b62a99a15f54cfa2960ca97d3bb6580a 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -206,8 +206,11 @@ int ssl23_get_client_hello(SSL *s)
        unsigned int i;
        unsigned int csl,sil,cl;
        int n=0,j;
-       int type=0,use_sslv2_strong=0;
+       int type=0;
        int v[2];
+#ifndef NO_RSA
+       int use_sslv2_strong=0;
+#endif
 
        if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
                {
@@ -294,7 +297,7 @@ int ssl23_get_client_hello(SSL *s)
                                        if (n <= 0) return(n);
                                        p=s->packet;
 
-                                       if ((buf=Malloc(n)) == NULL)
+                                       if ((buf=OPENSSL_malloc(n)) == NULL)
                                                {
                                                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,ERR_R_MALLOC_FAILURE);
                                                goto err;
@@ -389,7 +392,6 @@ int ssl23_get_client_hello(SSL *s)
                        }
                }
 
-next_bit:
        if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
                {
                /* we have SSLv3/TLSv1 in an SSLv2 header
@@ -493,9 +495,12 @@ next_bit:
 
                s->state=SSL2_ST_GET_CLIENT_HELLO_A;
                if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) ||
-                       use_sslv2_strong)
+                       use_sslv2_strong ||
+                       (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
+                        * (SSL 3.0 draft/RFC 2246, App. E.2) */
                        s->s2->ssl2_rollback=1;
 
                /* setup the n bytes we have read so we get them from
@@ -557,10 +562,10 @@ next_bit:
                }
        s->init_num=0;
 
-       if (buf != buf_space) Free(buf);
+       if (buf != buf_space) OPENSSL_free(buf);
        s->first_packet=1;
        return(SSL_accept(s));
 err:
-       if (buf != buf_space) Free(buf);
+       if (buf != buf_space) OPENSSL_free(buf);
        return(-1);
        }