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

Fix for OCSP single response last optional part handling and restore original size arg since its required for the ASN elements.

Browse Source
This commit is contained in:
David Garske
2020-10-14 14:55:18 -07:00
parent 10b1884993
commit 751f64b4aa
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/asn.c
View File

@ -16531,15 +16531,18 @@ static int GetEnumerated(const byte* input, word32* inOutIdx, int *value,
static int DecodeSingleResponse(byte* source, static int DecodeSingleResponse(byte* source,
word32* ioIndex, OcspResponse* resp, word32 size, CertStatus* cs) word32* ioIndex, OcspResponse* resp, word32 size, int wrapperSz,
CertStatus* cs)
{ {
word32 idx = *ioIndex, oid, localIdx; word32 idx = *ioIndex, prevIndex, oid, localIdx;
int length; int length;
int ret; int ret;
byte tag; byte tag;
WOLFSSL_ENTER("DecodeSingleResponse"); WOLFSSL_ENTER("DecodeSingleResponse");
prevIndex = idx;
/* Wrapper around the Single Response */ /* Wrapper around the Single Response */
if (GetSequence(source, &idx, &length, size) < 0) if (GetSequence(source, &idx, &length, size) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
@ -16616,7 +16619,7 @@ static int DecodeSingleResponse(byte* source,
/* The following items are optional. Only check for them if there is more /* The following items are optional. Only check for them if there is more
* unprocessed data in the singleResponse wrapper. */ * unprocessed data in the singleResponse wrapper. */
localIdx = idx; localIdx = idx;
if (idx < size && if (((int)(idx - prevIndex) < wrapperSz) &&
GetASNTag(source, &localIdx, &tag, size) == 0 && GetASNTag(source, &localIdx, &tag, size) == 0 &&
tag == (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0)) tag == (ASN_CONSTRUCTED | ASN_CONTEXT_SPECIFIC | 0))
{ {
@ -16788,7 +16791,8 @@ static int DecodeResponseData(byte* source,
localIdx = idx; localIdx = idx;
cs = resp->status; cs = resp->status;
while (idx - localIdx < (word32)wrapperSz) { while (idx - localIdx < (word32)wrapperSz) {
if ((ret = DecodeSingleResponse(source, &idx, resp, localIdx + wrapperSz, cs)) < 0) ret = DecodeSingleResponse(source, &idx, resp, size, wrapperSz, cs);
if (ret < 0)
return ret; /* ASN_PARSE_E, ASN_BEFORE_DATE_E, ASN_AFTER_DATE_E */ return ret; /* ASN_PARSE_E, ASN_BEFORE_DATE_E, ASN_AFTER_DATE_E */
if (idx - localIdx < (word32)wrapperSz) { if (idx - localIdx < (word32)wrapperSz) {
cs->next = (CertStatus*)XMALLOC(sizeof(CertStatus), resp->heap, cs->next = (CertStatus*)XMALLOC(sizeof(CertStatus), resp->heap,