wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Suite Size Check

Browse Source 
1. Check that the cipher suite size is even when doing the Client
   Hello message.
2. Check that the cipher suite size is a multiple of three when doing
   the Old Client Hello message.
3. Check that the hash/signature algorithm list size is even when
   processing the extensions.
This commit is contained in:
John Safranek
2020-07-31 11:43:27 -07:00
parent ff08a01f94
commit fd4f8fe7a0
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal.c
View File

@ -26757,6 +26757,9 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (clSuites.suiteSz > WOLFSSL_MAX_SUITE_SZ) if (clSuites.suiteSz > WOLFSSL_MAX_SUITE_SZ)
return BUFFER_ERROR; return BUFFER_ERROR;
/* Make sure the suiteSz is a multiple of 3. (Old Client Hello) */
if (clSuites.suiteSz % 3 != 0)
return BUFFER_ERROR;
clSuites.hashSigAlgoSz = 0; clSuites.hashSigAlgoSz = 0;
/* session size */ /* session size */
@ -27220,6 +27223,10 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ato16(&input[i], &clSuites.suiteSz); ato16(&input[i], &clSuites.suiteSz);
i += OPAQUE16_LEN; i += OPAQUE16_LEN;
/* Cipher suite lists are always multiples of two in length. */
if (clSuites.suiteSz % 2 != 0)
return BUFFER_ERROR;
/* suites and compression length check */ /* suites and compression length check */
if ((i - begin) + clSuites.suiteSz + OPAQUE8_LEN > helloSz) if ((i - begin) + clSuites.suiteSz + OPAQUE8_LEN > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
@ -27431,6 +27438,9 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (OPAQUE16_LEN + hashSigAlgoSz > extSz) if (OPAQUE16_LEN + hashSigAlgoSz > extSz)
return BUFFER_ERROR; return BUFFER_ERROR;
if (hashSigAlgoSz % 2 != 0)
return BUFFER_ERROR;
clSuites.hashSigAlgoSz = hashSigAlgoSz; clSuites.hashSigAlgoSz = hashSigAlgoSz;
if (clSuites.hashSigAlgoSz > WOLFSSL_MAX_SIGALGO) { if (clSuites.hashSigAlgoSz > WOLFSSL_MAX_SIGALGO) {
WOLFSSL_MSG("ClientHello SigAlgo list exceeds max, " WOLFSSL_MSG("ClientHello SigAlgo list exceeds max, "

4
src/tls.c
View File

@ -6423,6 +6423,10 @@ static int TLSX_SignatureAlgorithms_Parse(WOLFSSL *ssl, byte* input,
if (length != OPAQUE16_LEN + len) if (length != OPAQUE16_LEN + len)
return BUFFER_ERROR; return BUFFER_ERROR;
/* Sig Algo list size must be even. */
if (suites->hashSigAlgoSz % 2 != 0)
return BUFFER_ERROR;
/* truncate hashSigAlgo list if too long */ /* truncate hashSigAlgo list if too long */
suites->hashSigAlgoSz = len; suites->hashSigAlgoSz = len;
if (suites->hashSigAlgoSz > WOLFSSL_MAX_SIGALGO) { if (suites->hashSigAlgoSz > WOLFSSL_MAX_SIGALGO) {