Make previous bugfix actually work

[openssl.git] / ssl / s23_srvr.c

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index e74e019f1ddd32e860745c818f62e7078b9fb19c..9095df279334146ed0f8fec95deb31785379213d 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -67,10 +67,8 @@ 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_RSA
        if (ver == SSL2_VERSION)
                return(SSLv2_server_method());
-#endif
        if (ver == SSL3_VERSION)
                return(SSLv3_server_method());
        else if (ver == TLS1_VERSION)
@@ -188,7 +186,7 @@ end:
 
 int ssl23_get_client_hello(SSL *s)
        {
-       char buf_space[8];
+       char buf_space[11];
        char *buf= &(buf_space[0]);
        unsigned char *p,*d,*dd;
        unsigned int i;
@@ -197,14 +195,15 @@ int ssl23_get_client_hello(SSL *s)
        int type=0,use_sslv2_strong=0;
        int v[2];
 
-       /* read the initial header */
-       v[0]=v[1]=0;
        if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
                {
+               /* read the initial header */
+               v[0]=v[1]=0;
+
                if (!ssl3_setup_buffers(s)) goto err;
 
-               n=ssl23_read_bytes(s,7);
-               if (n != 7) return(n); /* n == -1 || n == 0 */
+               n=ssl23_read_bytes(s,11);
+               if (n != 11) return(n); /* n == -1 || n == 0 */
 
                p=s->packet;
 
@@ -212,7 +211,9 @@ int ssl23_get_client_hello(SSL *s)
 
                if ((p[0] & 0x80) && (p[2] == SSL2_MT_CLIENT_HELLO))
                        {
-                       /* SSLv2 header */
+                       /*
+                        * SSLv2 header
+                        */
                        if ((p[3] == 0x00) && (p[4] == 0x02))
                                {
                                v[0]=p[3]; v[1]=p[4];
@@ -229,10 +230,12 @@ int ssl23_get_client_hello(SSL *s)
                                        if (!(s->options & SSL_OP_NO_TLSv1))
                                                {
                                                tls1=1;
+                                               /* type=2; */ /* done later to survive restarts */
                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                                }
                                        else if (!(s->options & SSL_OP_NO_SSLv3))
                                                {
+                                               /* type=2; */
                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                                }
                                        else if (!(s->options & SSL_OP_NO_SSLv2))
@@ -241,11 +244,23 @@ int ssl23_get_client_hello(SSL *s)
                                                }
                                        }
                                else if (!(s->options & SSL_OP_NO_SSLv3))
+                                       {
+                                       /* type=2; */
                                        s->state=SSL23_ST_SR_CLNT_HELLO_B;
+                                       }
                                else if (!(s->options & SSL_OP_NO_SSLv2))
                                        type=1;
 
                                if (s->options & SSL_OP_NON_EXPORT_FIRST)
+                                       /* Not only utterly confusing, but broken
+                                        * ('fractured programming'?) -- the details
+                                        * of this block nearly make it work
+                                        * as intended in this environment, but on one
+                                        * of the fine points (w.r.t. restarts) it fails.
+                                        * The obvious fix would be even more devastating
+                                        * to program structure; if you want the functionality,
+                                        * throw this away and implement it in a way
+                                        * that makes sense */
                                        {
                                        STACK_OF(SSL_CIPHER) *sk;
                                        SSL_CIPHER *c;
@@ -301,11 +316,16 @@ int ssl23_get_client_hello(SSL *s)
                        }
                else if ((p[0] == SSL3_RT_HANDSHAKE) &&
                         (p[1] == SSL3_VERSION_MAJOR) &&
-                        (p[5] == SSL3_MT_CLIENT_HELLO))
+                        (p[5] == SSL3_MT_CLIENT_HELLO) &&
+                        (p[9] == p[1]))
                        {
-                       v[0]=p[1]; v[1]=p[2];
-                       /* true SSLv3 or tls1 */
-                       if (p[2] >= TLS1_VERSION_MINOR)
+                       /*
+                        * SSLv3 or tls1 header
+                        */
+                       
+                       /* we must look at client_version inside the client hello: */
+                       v[0]=p[9]; v[1]=p[10];
+                       if (v[1] >= TLS1_VERSION_MINOR)
                                {
                                if (!(s->options & SSL_OP_NO_TLSv1))
                                        {
@@ -336,9 +356,12 @@ 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 */
+               /* we have a SSLv3/TLSv1 in a SSLv2 header
+                * (other cases skip this state)* */
                type=2;
                p=s->packet;
+               v[0] = p[3];
+               v[1] = p[4];
                n=((p[0]&0x7f)<<8)|p[1];
                if (n > (1024*4))
                        {
@@ -404,11 +427,11 @@ next_bit:
                s->s3->tmp.message_size=i;
                }
 
+       /* imaginary new state (for program structure): */
+       /* s->state = SSL23_SR_CLNT_HELLO_C */
+
        if (type == 1)
                {
-#ifdef NO_RSA
-               goto err;
-#else
                /* we are talking sslv2 */
                /* we need to clean up the SSLv3/TLSv1 setup and put in the
                 * sslv2 stuff. */
@@ -436,7 +459,7 @@ next_bit:
                else
                        s->s2->ssl2_rollback=1;
 
-               /* setup the 5 bytes we have read so we get them from
+               /* setup the n bytes we have read so we get them from
                 * the sslv2 buffer */
                s->rstate=SSL_ST_READ_HEADER;
                s->packet_length=n;
@@ -447,12 +470,11 @@ next_bit:
 
                s->method=SSLv2_server_method();
                s->handshake_func=s->method->ssl_accept;
-#endif
                }
 
        if ((type == 2) || (type == 3))
                {
-               /* we have SSLv3/TLSv1 */
+               /* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */
 
                if (!ssl_init_wbio_buffer(s,1)) goto err;
 
@@ -487,7 +509,9 @@ next_bit:
                        s->version=SSL3_VERSION;
                        s->method=SSLv3_server_method();
                        }
+#if 0 /* ssl3_get_client_hello does this */
                s->client_version=(v[0]<<8)|v[1];
+#endif
                s->handshake_func=s->method->ssl_accept;
                }