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

Merge pull request #2191 from ejohnstown/aesctr-sameio

Browse Source 
AES-CTR In Place
This commit is contained in:
David Garske
2019-04-04 11:14:06 -07:00
committed by GitHub
parent b224f6fac9 a59488b299
commit db83e6dd31
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/aes.c
View File

@ -3267,6 +3267,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
int wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz) int wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
{ {
byte* tmp; byte* tmp;
byte scratch[AES_BLOCK_SIZE];
if (aes == NULL || out == NULL || in == NULL) { if (aes == NULL || out == NULL || in == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -3285,8 +3286,9 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
#ifdef XTRANSFORM_AESCTRBLOCK #ifdef XTRANSFORM_AESCTRBLOCK
XTRANSFORM_AESCTRBLOCK(aes, out, in); XTRANSFORM_AESCTRBLOCK(aes, out, in);
#else #else
wc_AesEncrypt(aes, (byte*)aes->reg, out); wc_AesEncrypt(aes, (byte*)aes->reg, scratch);
xorbuf(out, in, AES_BLOCK_SIZE); xorbuf(scratch, in, AES_BLOCK_SIZE);
XMEMCPY(out, scratch, AES_BLOCK_SIZE);
#endif #endif
IncrementAesCounter((byte*)aes->reg); IncrementAesCounter((byte*)aes->reg);
@ -3295,6 +3297,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
sz -= AES_BLOCK_SIZE; sz -= AES_BLOCK_SIZE;
aes->left = 0; aes->left = 0;
} }
ForceZero(scratch, AES_BLOCK_SIZE);
/* handle non block size remaining and store unused byte count in left */ /* handle non block size remaining and store unused byte count in left */
if (sz) { if (sz) {