WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #239 from ejohnstown/aesctr-fix 

AES-CTR Fix
pull/237/head
JacobBarthelmeh 2020-02-10 14:19:04 -07:00 committed by GitHub
parent 50739b3abe 626fd148a7
commit b3ddb93b65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/internal.c
View File

@ -4821,6 +4821,42 @@ static int DoPacket(WOLFSSH* ssh)
}
#if defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION == 2)
/*
* The FIPSv2 version of wc_AesCtrEncrypt() only works if the input and
* output are different buffers. This helper copies each block into a
* scratch buffer, then calling the AesCtrEncrypt() function on the
* single scratch buffer. But, only in FIPS builds.
*/
static INLINE int AesCtrEncryptHelper(Aes* aes,
byte* out, const byte* in, word32 sz)
{
int ret = 0;
byte scratch[AES_BLOCK_SIZE];
if (aes == NULL || in == NULL || out == NULL || sz == 0)
return WS_BAD_ARGUMENT;
if (sz % AES_BLOCK_SIZE)
return WS_ENCRYPT_E;
while (ret == 0 && sz) {
XMEMCPY(scratch, in, AES_BLOCK_SIZE);
ret = wc_AesCtrEncrypt(aes, out, scratch, AES_BLOCK_SIZE);
out += AES_BLOCK_SIZE;
in += AES_BLOCK_SIZE;
sz -= AES_BLOCK_SIZE;
}
ForceZero(scratch, sizeof(scratch));
return ret;
}
#define AESCTRHELPER(a,b,c,d) AesCtrEncryptHelper((a),(b),(c),(d))
#else
#define AESCTRHELPER(a,b,c,d) wc_AesCtrEncrypt((a),(b),(c),(d))
#endif
static INLINE int Encrypt(WOLFSSH* ssh, byte* cipher, const byte* input,
word16 sz)
{
@ -4847,7 +4883,7 @@ static INLINE int Encrypt(WOLFSSH* ssh, byte* cipher, const byte* input,
#ifdef WOLFSSL_AES_COUNTER
case ID_AES128_CTR:
if (sz % AES_BLOCK_SIZE || wc_AesCtrEncrypt(&ssh->encryptCipher.aes,
if (sz % AES_BLOCK_SIZE || AESCTRHELPER(&ssh->encryptCipher.aes,
cipher, input, sz) < 0) {
ret = WS_ENCRYPT_E;
@ -4891,7 +4927,7 @@ static INLINE int Decrypt(WOLFSSH* ssh, byte* plain, const byte* input,
#ifdef WOLFSSL_AES_COUNTER
case ID_AES128_CTR:
if (sz % AES_BLOCK_SIZE || wc_AesCtrEncrypt(&ssh->decryptCipher.aes,
if (sz % AES_BLOCK_SIZE || AESCTRHELPER(&ssh->decryptCipher.aes,
plain, input, sz) < 0) {
ret = WS_DECRYPT_E;