openssl-engine-0.9.6 merge

1 files changed, 20 insertions, 12 deletions

diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index 6a3bbb10b9..050618235f 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -297,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;
@@ -348,16 +348,21 @@ int ssl23_get_client_hello(SSL *s)
                          * SSLv3 or tls1 header
                          */
                         
-                        v[0]=p[1]; /* major version */
+                        v[0]=p[1]; /* major version (= SSL3_VERSION_MAJOR) */
                         /* We must look at client_version inside the Client Hello message
-                         * to get the correct minor version: */
-                        v[1]=p[10];
-                        /* However if we have only a pathologically small fragment of the
-                         * Client Hello message, we simply use the version from the
-                         * record header -- this is incorrect but unlikely to fail in
-                         * practice */
+                         * to get the correct minor version.
+                         * However if we have only a pathologically small fragment of the
+                         * Client Hello message, this would be difficult, we'd have
+                         * to read at least one additional record to find out.
+                         * This doesn't usually happen in real life, so we just complain
+                         * for now.
+                         */
                         if (p[3] == 0 && p[4] < 6)
-                                v[1]=p[2];
+                                {
+                                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_TOO_SMALL);
+                                goto err;
+                                }
+                        v[1]=p[10]; /* minor version according to client_version */
                         if (v[1] >= TLS1_VERSION_MINOR)
                                 {
                                 if (!(s->options & SSL_OP_NO_TLSv1))
@@ -495,9 +500,12 @@ int ssl23_get_client_hello(SSL *s)
 
                 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
@@ -559,10 +567,10 @@ int ssl23_get_client_hello(SSL *s)
                 }
         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);
         }