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

Use BUFFER_E instead of ASN_PARSE_E when buffer is too small

Browse Source
This commit is contained in:
Eric Blankenhorn
2025-01-20 08:40:36 -06:00
parent 462aa5bec6
commit 9c4ef7cd30
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/api.c
View File

@@ -26522,9 +26522,9 @@ static int test_wc_ecc_rs_to_sig(void)
WC_NO_ERR_TRACE(ECC_BAD_ARG_E)); WC_NO_ERR_TRACE(ECC_BAD_ARG_E));
#if !defined(HAVE_SELFTEST) && !defined(HAVE_FIPS) #if !defined(HAVE_SELFTEST) && !defined(HAVE_FIPS)
ExpectIntEQ(wc_ecc_sig_to_rs(sig, siglen, r, &zeroLen, s, &slen), ExpectIntEQ(wc_ecc_sig_to_rs(sig, siglen, r, &zeroLen, s, &slen),
WC_NO_ERR_TRACE(ASN_PARSE_E)); WC_NO_ERR_TRACE(BUFFER_E));
ExpectIntEQ(wc_ecc_sig_to_rs(sig, siglen, r, &rlen, s, &zeroLen), ExpectIntEQ(wc_ecc_sig_to_rs(sig, siglen, r, &rlen, s, &zeroLen),
WC_NO_ERR_TRACE(ASN_PARSE_E)); WC_NO_ERR_TRACE(BUFFER_E));
#endif #endif
#endif #endif
return EXPECT_RESULT(); return EXPECT_RESULT();

8
wolfcrypt/src/asn.c
View File

@@ -1300,7 +1300,7 @@ static int GetASN_StoreData(const ASNItem* asn, ASNGetData* data,
WOLFSSL_MSG_VSNPRINTF("Buffer too small for data: %d %d", len, WOLFSSL_MSG_VSNPRINTF("Buffer too small for data: %d %d", len,
*data->data.buffer.length); *data->data.buffer.length);
#endif #endif
return ASN_PARSE_E; return BUFFER_E;
} }
/* Copy in data and record actual length seen. */ /* Copy in data and record actual length seen. */
XMEMCPY(data->data.buffer.data, input + idx, (size_t)len); XMEMCPY(data->data.buffer.data, input + idx, (size_t)len);
@@ -33784,7 +33784,7 @@ int DecodeECC_DSA_Sig_Bin(const byte* sig, word32 sigLen, byte* r, word32* rLen,
*rLen = (word32)len; *rLen = (word32)len;
else { else {
/* Buffer too small to hold r value */ /* Buffer too small to hold r value */
return ASN_PARSE_E; return BUFFER_E;
} }
} }
if (r) if (r)
@@ -33798,8 +33798,8 @@ int DecodeECC_DSA_Sig_Bin(const byte* sig, word32 sigLen, byte* r, word32* rLen,
if (*sLen >= (word32)len) if (*sLen >= (word32)len)
*sLen = (word32)len; *sLen = (word32)len;
else { else {
/* Buffer too small to hold r value */ /* Buffer too small to hold s value */
return ASN_PARSE_E; return BUFFER_E;
} }
} }
if (s) if (s)