WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

wolfcrypt/src/asn.c:DecodeSingleResponse(): fix gating for "at" working var, by refactoring gating for WOLFSSL_OCSP_PARSE_STATUS sections for clarity.

pull/7967/head
Daniel Pouzzner 2024-09-12 14:38:50 -05:00
parent 3fac3b71ca
commit eb53a95f57
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wolfcrypt/src/asn.c
View File

@ -36028,7 +36028,7 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
*ioIndex = idx; *ioIndex = idx;
return 0; return 0;
#else #else /* WOLFSSL_ASN_TEMPLATE */
DECL_ASNGETDATA(dataASN, singleResponseASN_Length); DECL_ASNGETDATA(dataASN, singleResponseASN_Length);
int ret = 0; int ret = 0;
word32 ocspDigestSize = OCSP_DIGEST_SIZE; word32 ocspDigestSize = OCSP_DIGEST_SIZE;
@ -36038,10 +36038,6 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
word32 issuerKeyHashLen; word32 issuerKeyHashLen;
word32 thisDateLen; word32 thisDateLen;
word32 nextDateLen; word32 nextDateLen;
#if defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) || \
defined(WOLFSSL_HAPROXY) || defined(HAVE_LIGHTY)
WOLFSSL_ASN1_TIME *at;
#endif
(void)wrapperSz; (void)wrapperSz;
@ -36119,19 +36115,20 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
if (!XVALIDATE_DATE(cs->thisDate, ASN_GENERALIZED_TIME, ASN_BEFORE)) { if (!XVALIDATE_DATE(cs->thisDate, ASN_GENERALIZED_TIME, ASN_BEFORE)) {
ret = ASN_BEFORE_DATE_E; ret = ASN_BEFORE_DATE_E;
} }
#endif /* !NO_ASN_TIME_CHECK && !WOLFSSL_NO_OCSP_DATE_CHECK */
} }
if (ret == 0) {
#endif
#ifdef WOLFSSL_OCSP_PARSE_STATUS #ifdef WOLFSSL_OCSP_PARSE_STATUS
if (ret == 0) {
/* Store ASN.1 version of thisDate. */ /* Store ASN.1 version of thisDate. */
WOLFSSL_ASN1_TIME *at;
cs->thisDateAsn = GetASNItem_Addr( cs->thisDateAsn = GetASNItem_Addr(
dataASN[SINGLERESPONSEASN_IDX_THISUPDATE_GT], source); dataASN[SINGLERESPONSEASN_IDX_THISUPDATE_GT], source);
at = &cs->thisDateParsed; at = &cs->thisDateParsed;
at->type = ASN_GENERALIZED_TIME; at->type = ASN_GENERALIZED_TIME;
XMEMCPY(at->data, cs->thisDate, thisDateLen); XMEMCPY(at->data, cs->thisDate, thisDateLen);
at->length = (int)thisDateLen; at->length = (int)thisDateLen;
#endif
} }
#endif
if ((ret == 0) && if ((ret == 0) &&
(dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0)) { (dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0)) {
/* Store the nextDate format - only one possible. */ /* Store the nextDate format - only one possible. */
@ -36141,20 +36138,22 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
if (!XVALIDATE_DATE(cs->nextDate, ASN_GENERALIZED_TIME, ASN_AFTER)) { if (!XVALIDATE_DATE(cs->nextDate, ASN_GENERALIZED_TIME, ASN_AFTER)) {
ret = ASN_AFTER_DATE_E; ret = ASN_AFTER_DATE_E;
} }
#endif /* !NO_ASN_TIME_CHECK && !WOLFSSL_NO_OCSP_DATE_CHECK */
} }
if ((ret == 0) &&
(dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0)) {
#endif
#ifdef WOLFSSL_OCSP_PARSE_STATUS #ifdef WOLFSSL_OCSP_PARSE_STATUS
if ((ret == 0) &&
(dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT].tag != 0))
{
/* Store ASN.1 version of thisDate. */ /* Store ASN.1 version of thisDate. */
WOLFSSL_ASN1_TIME *at;
cs->nextDateAsn = GetASNItem_Addr( cs->nextDateAsn = GetASNItem_Addr(
dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT], source); dataASN[SINGLERESPONSEASN_IDX_NEXTUPDATE_GT], source);
at = &cs->nextDateParsed; at = &cs->nextDateParsed;
at->type = ASN_GENERALIZED_TIME; at->type = ASN_GENERALIZED_TIME;
XMEMCPY(at->data, cs->nextDate, nextDateLen); XMEMCPY(at->data, cs->nextDate, nextDateLen);
at->length = (int)nextDateLen; at->length = (int)nextDateLen;
#endif
} }
#endif
if (ret == 0) { if (ret == 0) {
/* OcspEntry now used. */ /* OcspEntry now used. */
single->used = 1; single->used = 1;
@ -36162,7 +36161,7 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
FREE_ASNGETDATA(dataASN, NULL); FREE_ASNGETDATA(dataASN, NULL);
return ret; return ret;
#endif #endif /* WOLFSSL_ASN_TEMPLATE */
} }
#ifdef WOLFSSL_ASN_TEMPLATE #ifdef WOLFSSL_ASN_TEMPLATE