Change ssl3_get_message and the functions using it so that complete

[openssl.git] / ssl / s23_srvr.c

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index e0abbaf834a1988ae86184db31c4a9075652d341..342d145c233cfe93fbcaa6bf116edd69c9daa0c5 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -202,7 +202,7 @@ int ssl23_get_client_hello(SSL *s)
                             *  9/10  client_version  /
                             */
        char *buf= &(buf_space[0]);
                             *  9/10  client_version  /
                             */
        char *buf= &(buf_space[0]);

-       unsigned char *p,*d,*dd;
+       unsigned char *p,*d,*d_len,*dd;

        unsigned int i;
        unsigned int csl,sil,cl;
        int n=0,j;
        unsigned int i;
        unsigned int csl,sil,cl;
        int n=0,j;


@@ -365,6 +365,14 @@ int ssl23_get_client_hello(SSL *s)
                        goto err;
                        }
 
                        goto err;
                        }
 

+               /* record header: version ... */
+               *(d++) = SSL3_VERSION_MAJOR; /* == v[0] */
+               *(d++) = v[1];
+               /* ... and length (actual value will be written later) */
+               d_len = d++;
+               d++;
+
+               /* client_version */

                *(d++) = SSL3_VERSION_MAJOR; /* == v[0] */
                *(d++) = v[1];
 
                *(d++) = SSL3_VERSION_MAJOR; /* == v[0] */
                *(d++) = v[1];
 


@@ -396,6 +404,7 @@ int ssl23_get_client_hello(SSL *s)
                *(d++)=0;
                
                i=(d-(unsigned char *)s->init_buf->data);
                *(d++)=0;
                
                i=(d-(unsigned char *)s->init_buf->data);

+               s2n(i, d_len);

 
                /* get the data reused from the init_buf */
                s->s3->tmp.reuse_message=1;
 
                /* get the data reused from the init_buf */
                s->s3->tmp.reuse_message=1;