fix aes gcm set key return

This commit is contained in:
toddouska
2014-12-04 11:51:19 -08:00
parent da5f235d75
commit 5f9660b23e

View File

@@ -2619,6 +2619,7 @@ static void GenerateM0(Aes* aes)
int AesGcmSetKey(Aes* aes, const byte* key, word32 len) int AesGcmSetKey(Aes* aes, const byte* key, word32 len)
{ {
int ret;
byte iv[AES_BLOCK_SIZE]; byte iv[AES_BLOCK_SIZE];
#ifdef FREESCALE_MMCAU #ifdef FREESCALE_MMCAU
@@ -2629,8 +2630,9 @@ int AesGcmSetKey(Aes* aes, const byte* key, word32 len)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
XMEMSET(iv, 0, AES_BLOCK_SIZE); XMEMSET(iv, 0, AES_BLOCK_SIZE);
AesSetKey(aes, key, len, iv, AES_ENCRYPTION); ret = AesSetKey(aes, key, len, iv, AES_ENCRYPTION);
if (ret == 0) {
#ifdef FREESCALE_MMCAU #ifdef FREESCALE_MMCAU
cau_aes_encrypt(iv, rk, aes->rounds, aes->H); cau_aes_encrypt(iv, rk, aes->rounds, aes->H);
#else #else
@@ -2639,8 +2641,9 @@ int AesGcmSetKey(Aes* aes, const byte* key, word32 len)
#ifdef GCM_TABLE #ifdef GCM_TABLE
GenerateM0(aes); GenerateM0(aes);
#endif /* GCM_TABLE */ #endif /* GCM_TABLE */
}
return 0; return ret;
} }