wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with aesgcm and aesni conflict

Browse Source
This commit is contained in:
John Safranek
2012-09-27 14:38:48 -07:00
parent 07c37ed50c
commit c9617e86d6
1 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ctaocrypt/src/aes.c
View File

@@ -859,30 +859,12 @@ int AesSetIV(Aes* aes, const byte* iv)
} }
int AesSetKey(Aes* aes, const byte* userKey, word32 keylen, const byte* iv, static int AesSetKeyLocal(Aes* aes, const byte* userKey, word32 keylen,
int dir) const byte* iv, int dir)
{ {
word32 temp, *rk = aes->key; word32 temp, *rk = aes->key;
unsigned int i = 0; unsigned int i = 0;
if (!((keylen == 16) || (keylen == 24) || (keylen == 32)))
return BAD_FUNC_ARG;
#ifdef CYASSL_AESNI
if (checkAESNI == 0) {
haveAESNI = Check_CPU_support_AES();
checkAESNI = 1;
}
if (haveAESNI) {
if (iv)
XMEMCPY(aes->reg, iv, AES_BLOCK_SIZE);
if (dir == AES_ENCRYPTION)
return AES_set_encrypt_key(userKey, keylen * 8, aes);
else
return AES_set_decrypt_key(userKey, keylen * 8, aes);
}
#endif /* CYASSL_AESNI */
aes->rounds = keylen/4 + 6; aes->rounds = keylen/4 + 6;
XMEMCPY(rk, userKey, keylen); XMEMCPY(rk, userKey, keylen);
@@ -1008,6 +990,32 @@ int AesSetKey(Aes* aes, const byte* userKey, word32 keylen, const byte* iv,
} }
int AesSetKey(Aes* aes, const byte* userKey, word32 keylen, const byte* iv,
int dir)
{
if (!((keylen == 16) || (keylen == 24) || (keylen == 32)))
return BAD_FUNC_ARG;
#ifdef CYASSL_AESNI
if (checkAESNI == 0) {
haveAESNI = Check_CPU_support_AES();
checkAESNI = 1;
}
if (haveAESNI) {
if (iv)
XMEMCPY(aes->reg, iv, AES_BLOCK_SIZE);
if (dir == AES_ENCRYPTION)
return AES_set_encrypt_key(userKey, keylen * 8, aes);
else
return AES_set_decrypt_key(userKey, keylen * 8, aes);
}
#endif /* CYASSL_AESNI */
return AesSetKeyLocal(aes, userKey, keylen, iv, dir);
}
static void AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock) static void AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock)
{ {
word32 s0, s1, s2, s3; word32 s0, s1, s2, s3;
@@ -1547,9 +1555,12 @@ void AesGcmSetKey(Aes* aes, const byte* key, word32 len,
{ {
byte fullIV[AES_BLOCK_SIZE]; byte fullIV[AES_BLOCK_SIZE];
if (!((len == 16) || (len == 24) || (len == 32)))
return;
XMEMSET(fullIV, 0, AES_BLOCK_SIZE); XMEMSET(fullIV, 0, AES_BLOCK_SIZE);
XMEMCPY(fullIV, implicitIV, IMPLICIT_IV_SZ); XMEMCPY(fullIV, implicitIV, IMPLICIT_IV_SZ);
AesSetKey(aes, key, len, fullIV, AES_ENCRYPTION); AesSetKeyLocal(aes, key, len, fullIV, AES_ENCRYPTION);
XMEMSET(fullIV, 0, AES_BLOCK_SIZE); XMEMSET(fullIV, 0, AES_BLOCK_SIZE);
AesEncrypt(aes, fullIV, aes->H); AesEncrypt(aes, fullIV, aes->H);