From 0c9ba76a93cfd74f93df876ba353370b13c4f4a3 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 16 Sep 2020 23:31:23 -0500 Subject: [PATCH] fix rebase error on aes.c --- wolfcrypt/src/aes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c index d7051f760..a0d144d34 100644 --- a/wolfcrypt/src/aes.c +++ b/wolfcrypt/src/aes.c @@ -2851,7 +2851,14 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock) 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,