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

Merge pull request #5287 from haydenroche5/aes_ctr_clear_left_on_iv_set

Browse Source 
Clear the leftover byte count in Aes struct when setting IV.
This commit is contained in:
Sean Parkinson
2022-06-29 08:30:01 +10:00
committed by GitHub
parent 28df62921a 10dfd8d129
commit 092b37f709
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl.c
View File

@ -24082,10 +24082,13 @@ void wolfSSL_AES_cfb128_encrypt(const unsigned char *in, unsigned char* out,
}
aes = (Aes*)key;
if (wc_AesSetIV(aes, (const byte*)iv) != 0) {
WOLFSSL_MSG("Error with setting iv");
return;
}
/*
* We copy the IV directly into reg here because using wc_AesSetIV will
* clear the leftover bytes field "left", and this function relies on the
* leftover bytes being preserved between calls.
*/
XMEMCPY(aes->reg, iv, AES_BLOCK_SIZE);
if (enc == AES_ENCRYPT) {
if (wc_AesCfbEncrypt(aes, out, in, (word32)len) != 0) {

7
wolfcrypt/src/aes.c
View File

@ -3212,6 +3212,13 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
XMEMCPY(aes->reg, iv, AES_BLOCK_SIZE);
else
XMEMSET(aes->reg, 0, AES_BLOCK_SIZE);
#if defined(WOLFSSL_AES_COUNTER) || defined(WOLFSSL_AES_CFB) || \
defined(WOLFSSL_AES_OFB) || defined(WOLFSSL_AES_XTS)
/* Clear any unused bytes from last cipher op. */
aes->left = 0;
#endif
return 0;
}