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

Fix for possible memory leak on failure in RSA/DH public key decode with heap based math.

Browse Source
This commit is contained in:
David Garske
2022-09-23 13:53:16 -07:00
parent c29e602ea5
commit 7a69415e79
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/asn.c
View File

@@ -9499,6 +9499,9 @@ int wc_RsaPublicKeyDecode(const byte* input, word32* inOutIdx, RsaKey* key,
(int)(rsaPublicKeyASN_Length - RSAPUBLICKEYASN_IDX_PUBKEY_RSA_SEQ), (int)(rsaPublicKeyASN_Length - RSAPUBLICKEYASN_IDX_PUBKEY_RSA_SEQ),
0, input, inOutIdx, inSz); 0, input, inOutIdx, inSz);
if (ret != 0) { if (ret != 0) {
mp_free(&key->n);
mp_free(&key->e);
/* Didn't work - try whole SubjectKeyInfo instead. */ /* Didn't work - try whole SubjectKeyInfo instead. */
/* Set the OID to expect. */ /* Set the OID to expect. */
GetASN_ExpBuffer(&dataASN[RSAPUBLICKEYASN_IDX_ALGOID_OID], GetASN_ExpBuffer(&dataASN[RSAPUBLICKEYASN_IDX_ALGOID_OID],
@@ -9849,6 +9852,9 @@ int wc_DhKeyDecode(const byte* input, word32* inOutIdx, DhKey* key, word32 inSz)
inOutIdx, inSz); inOutIdx, inSz);
#ifdef WOLFSSL_DH_EXTRA #ifdef WOLFSSL_DH_EXTRA
if (ret != 0) { if (ret != 0) {
mp_free(&key->p);
mp_free(&key->g);
/* Initialize data and set mp_ints to hold p, g, q, priv and pub. */ /* Initialize data and set mp_ints to hold p, g, q, priv and pub. */
XMEMSET(dataASN, 0, sizeof(*dataASN) * dhKeyPkcs8ASN_Length); XMEMSET(dataASN, 0, sizeof(*dataASN) * dhKeyPkcs8ASN_Length);
GetASN_ExpBuffer(&dataASN[DHKEYPKCS8ASN_IDX_PKEYALGO_OID], GetASN_ExpBuffer(&dataASN[DHKEYPKCS8ASN_IDX_PKEYALGO_OID],