SSL_R_UNSUPPORTED_PROTOCOL (as in s23_clnt.c) for SSL 2 when

[openssl.git] / ssl / s23_srvr.c

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 4735383c7a395f7670688ba83c6ed8081684139f..7fe8027daa1833a5cc803bac4977c0d02f9c349f 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -67,8 +67,10 @@ static SSL_METHOD *ssl23_get_server_method(int ver);
 int ssl23_get_client_hello(SSL *s);
 static SSL_METHOD *ssl23_get_server_method(int ver)
        {
+#ifndef NO_SSL2
        if (ver == SSL2_VERSION)
                return(SSLv2_server_method());
+#endif
        if (ver == SSL3_VERSION)
                return(SSLv3_server_method());
        else if (ver == TLS1_VERSION)
@@ -101,7 +103,7 @@ int ssl23_accept(SSL *s)
        int ret= -1;
        int new_state,state;
 
-       RAND_seed(&Time,sizeof(Time));
+       RAND_add(&Time,sizeof(Time),0);
        ERR_clear_error();
        clear_sys_error();
 
@@ -186,12 +188,23 @@ end:
 
 int ssl23_get_client_hello(SSL *s)
        {
-       char buf_space[10];
+       char buf_space[11]; /* Request this many bytes in initial read.
+                            * We can detect SSL 3.0/TLS 1.0 Client Hellos only
+                            * when the following is in a single record
+                            * (not guaranteed by protocol specs):
+                            * Byte  Content
+                            *  0     type            \
+                            *  1/2   version          > record header
+                            *  3/4   length          /
+                            *  5     msg_type        \
+                            *  6-8   length           > Client Hello message
+                            *  9/10  client_version  /
+                            */
        char *buf= &(buf_space[0]);
        unsigned char *p,*d,*dd;
        unsigned int i;
        unsigned int csl,sil,cl;
-       int n=0,j,tls1=0;
+       int n=0,j;
        int type=0,use_sslv2_strong=0;
        int v[2];
 
@@ -202,8 +215,8 @@ int ssl23_get_client_hello(SSL *s)
 
                if (!ssl3_setup_buffers(s)) goto err;
 
-               n=ssl23_read_bytes(s,10);
-               if (n != 10) return(n); /* n == -1 || n == 0 */
+               n=ssl23_read_bytes(s, sizeof buf_space);
+               if (n != sizeof buf_space) return(n); /* n == -1 || n == 0 */
 
                p=s->packet;
 
@@ -229,12 +242,13 @@ int ssl23_get_client_hello(SSL *s)
                                        {
                                        if (!(s->options & SSL_OP_NO_TLSv1))
                                                {
-                                               tls1=1;
+                                               s->version=TLS1_VERSION;
                                                /* type=2; */ /* done later to survive restarts */
                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                                }
                                        else if (!(s->options & SSL_OP_NO_SSLv3))
                                                {
+                                               s->version=SSL3_VERSION;
                                                /* type=2; */
                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                                }
@@ -245,6 +259,7 @@ int ssl23_get_client_hello(SSL *s)
                                        }
                                else if (!(s->options & SSL_OP_NO_SSLv3))
                                        {
+                                       s->version=SSL3_VERSION;
                                        /* type=2; */
                                        s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                        }
@@ -324,24 +339,25 @@ int ssl23_get_client_hello(SSL *s)
                         */
                        
                        /* we must look at client_version inside the client hello: */
-                       n=ssl23_read_bytes(s,11);
-                       /* restarts are no problem here, stay in initial state */
-                       if (n != 11)
-                               return(n); /* n == -1 || n == 0 */
-
                        v[0]=p[9]; v[1]=p[10];
-                       if (p[2] >= TLS1_VERSION_MINOR)
+                       if (v[1] >= TLS1_VERSION_MINOR)
                                {
                                if (!(s->options & SSL_OP_NO_TLSv1))
                                        {
+                                       s->version=TLS1_VERSION;
                                        type=3;
-                                       tls1=1;
                                        }
                                else if (!(s->options & SSL_OP_NO_SSLv3))
+                                       {
+                                       s->version=SSL3_VERSION;
                                        type=3;
+                                       }
                                }
                        else if (!(s->options & SSL_OP_NO_SSLv3))
+                               {
+                               s->version=SSL3_VERSION;
                                type=3;
+                               }
                        }
                else if ((strncmp("GET ", (char *)p,4) == 0) ||
                         (strncmp("POST ",(char *)p,5) == 0) ||
@@ -361,12 +377,14 @@ int ssl23_get_client_hello(SSL *s)
 next_bit:
        if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
                {
-               /* we have a SSLv3/TLSv1 in a SSLv2 header
-                * (other cases skip this state)* */
+               /* we have SSLv3/TLSv1 in an SSLv2 header
+                * (other cases skip this state) */
+
                type=2;
                p=s->packet;
-               v[0] = p[3];
+               v[0] = p[3]; /* == SSL3_VERSION_MAJOR */
                v[1] = p[4];
+
                n=((p[0]&0x7f)<<8)|p[1];
                if (n > (1024*4))
                        {
@@ -391,11 +409,8 @@ next_bit:
                        goto err;
                        }
 
-               *(d++)=SSL3_VERSION_MAJOR;
-               if (tls1)
-                       *(d++)=TLS1_VERSION_MINOR;
-               else
-                       *(d++)=SSL3_VERSION_MINOR;
+               *(d++) = SSL3_VERSION_MAJOR; /* == v[0] */
+               *(d++) = v[1];
 
                /* lets populate the random area */
                /* get the chalenge_length */
@@ -437,6 +452,10 @@ next_bit:
 
        if (type == 1)
                {
+#ifdef NO_SSL2
+               SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
+               goto err;
+#else
                /* we are talking sslv2 */
                /* we need to clean up the SSLv3/TLSv1 setup and put in the
                 * sslv2 stuff. */
@@ -475,6 +494,7 @@ next_bit:
 
                s->method=SSLv2_server_method();
                s->handshake_func=s->method->ssl_accept;
+#endif
                }
 
        if ((type == 2) || (type == 3))
@@ -504,16 +524,10 @@ next_bit:
                        s->s3->rbuf.offset=0;
                        }
 
-               if (tls1)
-                       {
-                       s->version=TLS1_VERSION;
-                       s->method=TLSv1_server_method();
-                       }
+               if (s->version == TLS1_VERSION)
+                       s->method = TLSv1_server_method();
                else
-                       {
-                       s->version=SSL3_VERSION;
-                       s->method=SSLv3_server_method();
-                       }
+                       s->method = SSLv3_server_method();
 #if 0 /* ssl3_get_client_hello does this */
                s->client_version=(v[0]<<8)|v[1];
 #endif
@@ -535,4 +549,3 @@ err:
        if (buf != buf_space) Free(buf);
        return(-1);
        }
-