From 76c8146bf160d251345cd492b376acbfd9be77b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es?= <moisesguimaraesm@gmail.com>
Date: Mon, 17 Feb 2014 11:33:51 -0300
Subject: [PATCH] moving available data length check to DoHandShakeMsgType

---
 src/internal.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index 02512906b..55ec5078a 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -70,8 +70,7 @@ CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS
 
 #ifndef NO_CYASSL_CLIENT
     static int DoHelloVerifyRequest(CYASSL* ssl, const byte* input, word32*);
-    static int DoServerHello(CYASSL* ssl, const byte* input, word32*, word32,
-                             word32);
+    static int DoServerHello(CYASSL* ssl, const byte* input, word32*, word32);
     static int DoServerKeyExchange(CYASSL* ssl, const byte* input, word32*);
     #ifndef NO_CERTS
         static int DoCertificateRequest(CYASSL* ssl, const byte* input,word32*);
@@ -80,8 +79,7 @@ CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS
 
 
 #ifndef NO_CYASSL_SERVER
-    static int DoClientHello(CYASSL* ssl, const byte* input, word32*, word32,
-                             word32);
+    static int DoClientHello(CYASSL* ssl, const byte* input, word32*, word32);
     static int DoClientKeyExchange(CYASSL* ssl, byte* input, word32*, word32);
     #if !defined(NO_RSA) || defined(HAVE_ECC)
         static int DoCertificateVerify(CYASSL* ssl, byte*, word32*, word32);
@@ -3724,7 +3722,12 @@ static int DoHandShakeMsgType(CYASSL* ssl, byte* input, word32* inOutIdx,
 
     CYASSL_ENTER("DoHandShakeMsgType");
 
+    /* make sure can read the message */
+    if (*inOutIdx + size > totalSz)
+        return INCOMPLETE_DATA;
+
     HashInput(ssl, input + *inOutIdx, size);
+
 #ifdef CYASSL_CALLBACKS
     /* add name later, add on record and handshake header part back on */
     if (ssl->toInfoOn) {
@@ -3779,7 +3782,7 @@ static int DoHandShakeMsgType(CYASSL* ssl, byte* input, word32* inOutIdx,
             
     case server_hello:
         CYASSL_MSG("processing server hello");
-        ret = DoServerHello(ssl, input, inOutIdx, totalSz, size);
+        ret = DoServerHello(ssl, input, inOutIdx, size);
         break;
 
 #ifndef NO_CERTS
@@ -3821,7 +3824,7 @@ static int DoHandShakeMsgType(CYASSL* ssl, byte* input, word32* inOutIdx,
 #ifndef NO_CYASSL_SERVER
     case client_hello:
         CYASSL_MSG("processing client hello");
-        ret = DoClientHello(ssl, input, inOutIdx, totalSz, size);
+        ret = DoClientHello(ssl, input, inOutIdx, size);
         break;
 
     case client_key_exchange:
@@ -3841,6 +3844,7 @@ static int DoHandShakeMsgType(CYASSL* ssl, byte* input, word32* inOutIdx,
     default:
         CYASSL_MSG("Unknown handshake message type");
         ret = UNKNOWN_HANDSHAKE_TYPE;
+        break;
     }
 
     CYASSL_LEAVE("DoHandShakeMsgType()", ret);
@@ -7460,7 +7464,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
 
 
     static int DoServerHello(CYASSL* ssl, const byte* input, word32* inOutIdx,
-                             word32 totalSz, word32 helloSz)
+                             word32 helloSz)
     {
         byte            b;
         ProtocolVersion pv;
@@ -7473,10 +7477,6 @@ static void PickHashSigAlgo(CYASSL* ssl,
         if (ssl->toInfoOn) AddLateName("ServerHello", &ssl->timeoutInfo);
 #endif
 
-        /* make sure can read the server hello */
-        if (begin + helloSz > totalSz)
-            return INCOMPLETE_DATA;
-
         /* protocol version, random and session id length check */
         if ((i - begin) + OPAQUE16_LEN + RAN_LEN + ENUM_LEN > helloSz)
             return BUFFER_ERROR;
@@ -10026,7 +10026,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
 
 
     static int DoClientHello(CYASSL* ssl, const byte* input, word32* inOutIdx,
-                             word32 totalSz, word32 helloSz)
+                             word32 helloSz)
     {
         byte            b;
         ProtocolVersion pv;
@@ -10039,10 +10039,6 @@ static void PickHashSigAlgo(CYASSL* ssl,
         if (ssl->toInfoOn) AddLateName("ClientHello", &ssl->timeoutInfo);
 #endif
 
-        /* make sure can read the client hello */
-        if (begin + helloSz > totalSz)
-            return INCOMPLETE_DATA;
-
         /* protocol version, random and session id length check */
         if ((i - begin) + OPAQUE16_LEN + RAN_LEN + ENUM_LEN > helloSz)
             return BUFFER_ERROR;