Skip to content

dtls13: free and null the cipher slot on init failure in Dtls13InitAesCipher and ChaCha equivalent #10360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gasbytes wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −3
Open

dtls13: free and null the cipher slot on init failure in Dtls13InitAesCipher and ChaCha equivalent #10360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/dtls13.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2188,16 +2188,27 @@ static int Dtls13InitAesCipher(WOLFSSL* ssl, RecordNumberCiphers* cipher,
XMEMSET(cipher->aes, 0, sizeof(*cipher->aes));

ret = wc_AesInit(cipher->aes, ssl->heap, INVALID_DEVID);
if (ret != 0)
if (ret != 0) {
XFREE(cipher->aes, ssl->heap, DYNAMIC_TYPE_CIPHER);
cipher->aes = NULL;
return ret;
}

ret = wc_AesSetKey(cipher->aes, key, keySize, NULL, AES_ENCRYPTION);
if (ret != 0) {
wc_AesFree(cipher->aes);
XFREE(cipher->aes, ssl->heap, DYNAMIC_TYPE_CIPHER);
cipher->aes = NULL;
}

return wc_AesSetKey(cipher->aes, key, keySize, NULL, AES_ENCRYPTION);
return ret;
}

#ifdef HAVE_CHACHA
static int Dtls13InitChaChaCipher(RecordNumberCiphers* c, byte* key,
word16 keySize, void* heap)
{
int ret;
(void)heap;

if (c->chacha == NULL) {
Expand All @@ -2207,7 +2218,13 @@ static int Dtls13InitChaChaCipher(RecordNumberCiphers* c, byte* key,
return MEMORY_E;
}

return wc_Chacha_SetKey(c->chacha, key, keySize);
ret = wc_Chacha_SetKey(c->chacha, key, keySize);
if (ret != 0) {
XFREE(c->chacha, heap, DYNAMIC_TYPE_CIPHER);
c->chacha = NULL;
}

return ret;
}
#endif /* HAVE_CHACHA */

Expand Down
Loading