feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

removed duplicated check for INCOMPLETE_DATA

Browse Source 
added new size enums
This commit is contained in:
Moisés Guimarães
2014-02-24 11:26:55 -03:00
parent 76c8146bf1
commit 78bab91615
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cyassl/internal.h
View File

@@ -599,7 +599,9 @@ enum Misc {
COOKIE_SZ = 20, /* use a 20 byte cookie */ COOKIE_SZ = 20, /* use a 20 byte cookie */
SUITE_LEN = 2, /* cipher suite sz length */ SUITE_LEN = 2, /* cipher suite sz length */
ENUM_LEN = 1, /* always a byte */ ENUM_LEN = 1, /* always a byte */
OPAQUE16_LEN = 2, /* always 2 bytes */ OPAQUE8_LEN = 1, /* 1 byte */
OPAQUE16_LEN = 2, /* 2 bytes */
OPAQUE24_LEN = 3, /* 3 bytes */
COMP_LEN = 1, /* compression length */ COMP_LEN = 1, /* compression length */
CURVE_LEN = 2, /* ecc named curve length */ CURVE_LEN = 2, /* ecc named curve length */
SERVER_ID_LEN = 20, /* server session id length */ SERVER_ID_LEN = 20, /* server session id length */

17
src/internal.c
View File

@@ -3855,18 +3855,15 @@ static int DoHandShakeMsgType(CYASSL* ssl, byte* input, word32* inOutIdx,
static int DoHandShakeMsg(CYASSL* ssl, byte* input, word32* inOutIdx, static int DoHandShakeMsg(CYASSL* ssl, byte* input, word32* inOutIdx,
word32 totalSz) word32 totalSz)
{ {
byte type; byte type;
word32 size; word32 size;
int ret = 0; int ret = 0;
CYASSL_ENTER("DoHandShakeMsg()"); CYASSL_ENTER("DoHandShakeMsg()");
if (GetHandShakeHeader(ssl, input, inOutIdx, &type, &size) != 0) if (GetHandShakeHeader(ssl, input, inOutIdx, &type, &size) != 0)
return PARSE_ERROR; return PARSE_ERROR;
if (*inOutIdx + size > totalSz)
return INCOMPLETE_DATA;
ret = DoHandShakeMsgType(ssl, input, inOutIdx, type, size, totalSz); ret = DoHandShakeMsgType(ssl, input, inOutIdx, type, size, totalSz);
CYASSL_LEAVE("DoHandShakeMsg()", ret); CYASSL_LEAVE("DoHandShakeMsg()", ret);
@@ -7478,7 +7475,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
#endif #endif
/* protocol version, random and session id length check */ /* protocol version, random and session id length check */
if ((i - begin) + OPAQUE16_LEN + RAN_LEN + ENUM_LEN > helloSz) if ((i - begin) + OPAQUE16_LEN + RAN_LEN + OPAQUE8_LEN > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
/* protocol version */ /* protocol version */
@@ -7537,7 +7534,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
} }
/* suite and compression */ /* suite and compression */
if ((i - begin) + OPAQUE16_LEN + ENUM_LEN > helloSz) if ((i - begin) + OPAQUE16_LEN + OPAQUE8_LEN > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
ssl->options.cipherSuite0 = input[i++]; ssl->options.cipherSuite0 = input[i++];
@@ -10040,7 +10037,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
#endif #endif
/* protocol version, random and session id length check */ /* protocol version, random and session id length check */
if ((i - begin) + OPAQUE16_LEN + RAN_LEN + ENUM_LEN > helloSz) if ((i - begin) + OPAQUE16_LEN + RAN_LEN + OPAQUE8_LEN > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
/* protocol version */ /* protocol version */
@@ -10121,7 +10118,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* cookie */ /* cookie */
if (ssl->options.dtls) { if (ssl->options.dtls) {
if ((i - begin) + ENUM_LEN > helloSz) if ((i - begin) + OPAQUE8_LEN > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
b = input[i++]; b = input[i++];
@@ -10160,7 +10157,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
i += OPAQUE16_LEN; i += OPAQUE16_LEN;
/* suites and compression length check */ /* suites and compression length check */
if ((i - begin) + clSuites.suiteSz + ENUM_LEN > helloSz) if ((i - begin) + clSuites.suiteSz + OPAQUE8_LEN > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
if (clSuites.suiteSz > MAX_SUITE_SZ) if (clSuites.suiteSz > MAX_SUITE_SZ)