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

Cleanup of hashSigAlgo handling in DoClientHello.

Browse Source
This commit is contained in:
David Garske
2017-11-13 15:02:13 -08:00
parent 9f7e40ad5c
commit b08a99057c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/internal.c
View File

@ -13237,7 +13237,7 @@ int SendCertificateRequest(WOLFSSL* ssl)
/* supported hash/sig */ /* supported hash/sig */
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
c16toa(ssl->suites->hashSigAlgoSz, &output[i]); c16toa(ssl->suites->hashSigAlgoSz, &output[i]);
i += LENGTH_SZ; i += OPAQUE16_LEN;
XMEMCPY(&output[i], XMEMCPY(&output[i],
ssl->suites->hashSigAlgo, ssl->suites->hashSigAlgoSz); ssl->suites->hashSigAlgo, ssl->suites->hashSigAlgoSz);
@ -22765,18 +22765,22 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
return BUFFER_ERROR; return BUFFER_ERROR;
if (extId == HELLO_EXT_SIG_ALGO) { if (extId == HELLO_EXT_SIG_ALGO) {
ato16(&input[i], &clSuites.hashSigAlgoSz); word16 hashSigAlgoSz;
ato16(&input[i], &hashSigAlgoSz);
i += OPAQUE16_LEN; i += OPAQUE16_LEN;
if (OPAQUE16_LEN + clSuites.hashSigAlgoSz > extSz) if (OPAQUE16_LEN + hashSigAlgoSz > extSz)
return BUFFER_ERROR; return BUFFER_ERROR;
XMEMCPY(clSuites.hashSigAlgo, &input[i], clSuites.hashSigAlgoSz = hashSigAlgoSz;
min(clSuites.hashSigAlgoSz, WOLFSSL_MAX_SIGALGO));
i += clSuites.hashSigAlgoSz;
if (clSuites.hashSigAlgoSz > WOLFSSL_MAX_SIGALGO) if (clSuites.hashSigAlgoSz > WOLFSSL_MAX_SIGALGO)
clSuites.hashSigAlgoSz = WOLFSSL_MAX_SIGALGO; clSuites.hashSigAlgoSz = WOLFSSL_MAX_SIGALGO;
XMEMCPY(clSuites.hashSigAlgo, &input[i],
clSuites.hashSigAlgoSz);
i += hashSigAlgoSz;
} }
#ifdef HAVE_EXTENDED_MASTER #ifdef HAVE_EXTENDED_MASTER
else if (extId == HELLO_EXT_EXTMS) else if (extId == HELLO_EXT_EXTMS)