wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix rebase error on aes.c

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-09-16 23:31:23 -05:00
parent 60506af5f5
commit 0c9ba76a93
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/aes.c
View File

@ -2851,7 +2851,14 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
ret = wc_AesSetIV(aes, iv); ret = wc_AesSetIV(aes, iv);
return wc_AesSetKeyLocal(aes, userKey, keylen, iv, dir); #if defined(WOLFSSL_DEVCRYPTO) && \
(defined(WOLFSSL_DEVCRYPTO_AES) || defined(WOLFSSL_DEVCRYPTO_CBC))
aes->ctx.cfd = -1;
#endif
#ifdef WOLFSSL_IMX6_CAAM_BLOB
ForceZero(local, sizeof(local));
#endif
return ret;
} }
int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen, int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,