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

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
toddouska
2014-10-07 15:51:38 -07:00
parent 54049c6000 557f19db0b
commit 5019eab073
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/internal.c
View File

@ -1806,7 +1806,7 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
/* arrays */ /* arrays */
ssl->arrays = (Arrays*)XMALLOC(sizeof(Arrays), ssl->heap, ssl->arrays = (Arrays*)XMALLOC(sizeof(Arrays), ssl->heap,
DYNAMIC_TYPE_ARRAYS); DYNAMIC_TYPE_ARRAYS);
if (ssl->arrays == NULL) { if (ssl->arrays == NULL) {
CYASSL_MSG("Arrays Memory error"); CYASSL_MSG("Arrays Memory error");
return MEMORY_E; return MEMORY_E;
@ -9079,18 +9079,19 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* session id */ /* session id */
b = input[i++]; b = input[i++];
if (b == ID_LEN) { if (b > ID_LEN) {
if ((i - begin) + ID_LEN > helloSz) CYASSL_MSG("Invalid session ID size");
return BUFFER_ERROR; return BUFFER_ERROR;
XMEMCPY(ssl->arrays->sessionID, input + i, min(b, ID_LEN));
i += ID_LEN;
ssl->options.haveSessionId = 1;
} }
else if (b) { else if (b) {
CYASSL_MSG("Invalid session ID size"); if ((i - begin) + b > helloSz)
return BUFFER_ERROR; /* session ID nor 0 neither 32 bytes long */ return BUFFER_ERROR;
XMEMCPY(ssl->arrays->sessionID, input + i, b);
i += b;
ssl->options.haveSessionId = 1;
} }
/* suite and compression */ /* suite and compression */
if ((i - begin) + OPAQUE16_LEN + OPAQUE8_LEN > helloSz) if ((i - begin) + OPAQUE16_LEN + OPAQUE8_LEN > helloSz)