wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5974 from SparkiDev/aessiv_uninit_aes

Browse Source 
AES SIV: Allocate memory for AES as late as possbile
This commit is contained in:
David Garske
2023-01-14 11:13:09 -08:00
committed by GitHub
parent 2d8c19ac42 0a2ee6c530
commit bf3673c0b2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wolfcrypt/src/aes.c
View File

@@ -12345,15 +12345,6 @@ static WARN_UNUSED_RESULT int AesSivCipher(
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
#ifdef WOLFSSL_SMALL_STACK
if (ret == 0) {
aes = (Aes*)XMALLOC(sizeof(Aes), NULL, DYNAMIC_TYPE_AES);
if (aes == NULL) {
ret = MEMORY_E;
}
}
#endif
if (ret == 0) { if (ret == 0) {
if (enc == 1) { if (enc == 1) {
ret = S2V(key, keySz / 2, assoc, assocSz, nonce, nonceSz, data, ret = S2V(key, keySz / 2, assoc, assocSz, nonce, nonceSz, data,
@@ -12370,6 +12361,15 @@ static WARN_UNUSED_RESULT int AesSivCipher(
} }
} }
#ifdef WOLFSSL_SMALL_STACK
if (ret == 0) {
aes = (Aes*)XMALLOC(sizeof(Aes), NULL, DYNAMIC_TYPE_AES);
if (aes == NULL) {
ret = MEMORY_E;
}
}
#endif
if (ret == 0) { if (ret == 0) {
ret = wc_AesInit(aes, NULL, INVALID_DEVID); ret = wc_AesInit(aes, NULL, INVALID_DEVID);
if (ret != 0) { if (ret != 0) {