Make previous bugfix actually work

[openssl.git] / ssl / s23_srvr.c

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 888ffaca066dd0bb362881d0953bdd26adab9bf4..9095df279334146ed0f8fec95deb31785379213d 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -57,26 +57,19 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

-#include "buffer.h"
-#include "rand.h"
-#include "objects.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>

 #include "ssl_locl.h"
 
 #include "ssl_locl.h"
 

-#define BREAK break
-
-#ifndef NOPROTO
+static SSL_METHOD *ssl23_get_server_method(int ver);

 int ssl23_get_client_hello(SSL *s);
 int ssl23_get_client_hello(SSL *s);

-#else
-int ssl23_get_client_hello();
-#endif
-
-static SSL_METHOD *ssl23_get_server_method(ver)
-int ver;
+static SSL_METHOD *ssl23_get_server_method(int ver)

        {
        if (ver == SSL2_VERSION)
                return(SSLv2_server_method());
        {
        if (ver == SSL2_VERSION)
                return(SSLv2_server_method());

-       else if (ver == SSL3_VERSION)
+       if (ver == SSL3_VERSION)

                return(SSLv3_server_method());
        else if (ver == TLS1_VERSION)
                return(TLSv1_server_method());
                return(SSLv3_server_method());
        else if (ver == TLS1_VERSION)
                return(TLSv1_server_method());


@@ -84,24 +77,23 @@ int ver;
                return(NULL);
        }
 
                return(NULL);
        }
 

-SSL_METHOD *SSLv23_server_method()
+SSL_METHOD *SSLv23_server_method(void)

        {
        static int init=1;
        static SSL_METHOD SSLv23_server_data;
 
        if (init)
                {
        {
        static int init=1;
        static SSL_METHOD SSLv23_server_data;
 
        if (init)
                {

-               init=0;

                memcpy((char *)&SSLv23_server_data,
                        (char *)sslv23_base_method(),sizeof(SSL_METHOD));
                SSLv23_server_data.ssl_accept=ssl23_accept;
                SSLv23_server_data.get_ssl_method=ssl23_get_server_method;
                memcpy((char *)&SSLv23_server_data,
                        (char *)sslv23_base_method(),sizeof(SSL_METHOD));
                SSLv23_server_data.ssl_accept=ssl23_accept;
                SSLv23_server_data.get_ssl_method=ssl23_get_server_method;

+               init=0;

                }
        return(&SSLv23_server_data);
        }
 
                }
        return(&SSLv23_server_data);
        }
 

-int ssl23_accept(s)
-SSL *s;
+int ssl23_accept(SSL *s)

        {
        BUF_MEM *buf;
        unsigned long Time=time(NULL);
        {
        BUF_MEM *buf;
        unsigned long Time=time(NULL);


@@ -109,7 +101,7 @@ SSL *s;
        int ret= -1;
        int new_state,state;
 
        int ret= -1;
        int new_state,state;
 

-       RAND_seed((unsigned char *)&Time,sizeof(Time));
+       RAND_seed(&Time,sizeof(Time));

        ERR_clear_error();
        clear_sys_error();
 
        ERR_clear_error();
        clear_sys_error();
 


@@ -132,6 +124,7 @@ SSL *s;
                case SSL_ST_BEFORE|SSL_ST_ACCEPT:
                case SSL_ST_OK|SSL_ST_ACCEPT:
 
                case SSL_ST_BEFORE|SSL_ST_ACCEPT:
                case SSL_ST_OK|SSL_ST_ACCEPT:
 

+                       s->server=1;

                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
 
                        /* s->version=SSL3_VERSION; */
                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
 
                        /* s->version=SSL3_VERSION; */


@@ -155,7 +148,7 @@ SSL *s;
                        ssl3_init_finished_mac(s);
 
                        s->state=SSL23_ST_SR_CLNT_HELLO_A;
                        ssl3_init_finished_mac(s);
 
                        s->state=SSL23_ST_SR_CLNT_HELLO_A;

-                       s->ctx->sess_accept++;
+                       s->ctx->stats.sess_accept++;

                        s->init_num=0;
                        break;
 
                        s->init_num=0;
                        break;
 


@@ -191,24 +184,26 @@ end:
        }
 
 
        }
 
 

-int ssl23_get_client_hello(s)
-SSL *s;
+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;
        unsigned int csl,sil,cl;
        int n=0,j,tls1=0;
        int type=0,use_sslv2_strong=0;
        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 type=0,use_sslv2_strong=0;

+       int v[2];

 
 

-       /* read the initial header */

        if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
                {
        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;
 
                if (!ssl3_setup_buffers(s)) goto err;
 

-               n=ssl23_read_bytes(s,7);
-               if (n != 7) return(n);
+               n=ssl23_read_bytes(s,11);
+               if (n != 11) return(n); /* n == -1 || n == 0 */

 
                p=s->packet;
 
 
                p=s->packet;
 


@@ -216,25 +211,31 @@ SSL *s;
 
                if ((p[0] & 0x80) && (p[2] == SSL2_MT_CLIENT_HELLO))
                        {
 
                if ((p[0] & 0x80) && (p[2] == SSL2_MT_CLIENT_HELLO))
                        {

-                       /* SSLv2 header */
+                       /*
+                        * SSLv2 header
+                        */

                        if ((p[3] == 0x00) && (p[4] == 0x02))
                                {
                        if ((p[3] == 0x00) && (p[4] == 0x02))
                                {

+                               v[0]=p[3]; v[1]=p[4];

                                /* SSLv2 */
                                if (!(s->options & SSL_OP_NO_SSLv2))
                                        type=1;
                                }
                        else if (p[3] == SSL3_VERSION_MAJOR)
                                {
                                /* SSLv2 */
                                if (!(s->options & SSL_OP_NO_SSLv2))
                                        type=1;
                                }
                        else if (p[3] == SSL3_VERSION_MAJOR)
                                {

+                               v[0]=p[3]; v[1]=p[4];

                                /* SSLv3/TLSv1 */
                                if (p[4] >= TLS1_VERSION_MINOR)
                                        {
                                        if (!(s->options & SSL_OP_NO_TLSv1))
                                                {
                                                tls1=1;
                                /* SSLv3/TLSv1 */
                                if (p[4] >= TLS1_VERSION_MINOR)
                                        {
                                        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))
                                                {
                                                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))
                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                                }
                                        else if (!(s->options & SSL_OP_NO_SSLv2))


@@ -243,13 +244,25 @@ SSL *s;
                                                }
                                        }
                                else if (!(s->options & SSL_OP_NO_SSLv3))
                                                }
                                        }
                                else if (!(s->options & SSL_OP_NO_SSLv3))

+                                       {
+                                       /* type=2; */

                                        s->state=SSL23_ST_SR_CLNT_HELLO_B;
                                        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)
                                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 *sk;
+                                       STACK_OF(SSL_CIPHER) *sk;

                                        SSL_CIPHER *c;
                                        int ne2,ne3;
 
                                        SSL_CIPHER *c;
                                        int ne2,ne3;
 


@@ -280,10 +293,10 @@ SSL *s;
                                        if (sk != NULL)
                                                {
                                                ne2=ne3=0;
                                        if (sk != NULL)
                                                {
                                                ne2=ne3=0;

-                                               for (j=0; j<sk_num(sk); j++)
+                                               for (j=0; j<sk_SSL_CIPHER_num(sk); j++)

                                                        {
                                                        {

-                                                       c=(SSL_CIPHER *)sk_value(sk,j);
-                                                       if (!(c->algorithms & SSL_EXP))
+                                                       c=sk_SSL_CIPHER_value(sk,j);
+                                                       if (!SSL_C_IS_EXPORT(c))

                                                                {
                                                                if ((c->id>>24L) == 2L)
                                                                        ne2=1;
                                                                {
                                                                if ((c->id>>24L) == 2L)
                                                                        ne2=1;


@@ -303,10 +316,16 @@ SSL *s;
                        }
                else if ((p[0] == SSL3_RT_HANDSHAKE) &&
                         (p[1] == SSL3_VERSION_MAJOR) &&
                        }
                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]))

                        {
                        {

-                       /* 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))
                                        {
                                {
                                if (!(s->options & SSL_OP_NO_TLSv1))
                                        {


@@ -337,9 +356,12 @@ SSL *s;
 next_bit:
        if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
                {
 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;
                type=2;
                p=s->packet;

+               v[0] = p[3];
+               v[1] = p[4];

                n=((p[0]&0x7f)<<8)|p[1];
                if (n > (1024*4))
                        {
                n=((p[0]&0x7f)<<8)|p[1];
                if (n > (1024*4))
                        {


@@ -405,6 +427,9 @@ next_bit:
                s->s3->tmp.message_size=i;
                }
 
                s->s3->tmp.message_size=i;
                }
 

+       /* imaginary new state (for program structure): */
+       /* s->state = SSL23_SR_CLNT_HELLO_C */
+

        if (type == 1)
                {
                /* we are talking sslv2 */
        if (type == 1)
                {
                /* we are talking sslv2 */


@@ -434,7 +459,7 @@ next_bit:
                else
                        s->s2->ssl2_rollback=1;
 
                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;
                 * the sslv2 buffer */
                s->rstate=SSL_ST_READ_HEADER;
                s->packet_length=n;


@@ -449,7 +474,7 @@ next_bit:
 
        if ((type == 2) || (type == 3))
                {
 
        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;
 
 
                if (!ssl_init_wbio_buffer(s,1)) goto err;
 


@@ -484,6 +509,9 @@ next_bit:
                        s->version=SSL3_VERSION;
                        s->method=SSLv3_server_method();
                        }
                        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;
                }
        
                s->handshake_func=s->method->ssl_accept;
                }