Merge pull request #1358 from dgarske/fix_aesgcm_emb

Fix for missing `ret` in some `wc_AesGcmEncrypt` functions
This commit is contained in:
toddouska
2018-02-09 13:16:21 -08:00
committed by GitHub

View File

@@ -7253,9 +7253,9 @@ int wc_AesGcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
return BAD_FUNC_ARG;
}
ret = wc_AesGetKeySize(aes, &keySize);
if (ret != 0)
return ret;
status = wc_AesGetKeySize(aes, &keySize);
if (status)
return status;
status = LTC_AES_EncryptTagGcm(LTC_BASE, in, out, sz, iv, ivSz,
authIn, authInSz, (byte*)aes->key, keySize, authTag, authTagSz);
@@ -7270,6 +7270,7 @@ static INLINE int wc_AesGcmEncrypt_STM32(Aes* aes, byte* out, const byte* in,
byte* authTag, word32 authTagSz,
const byte* authIn, word32 authInSz)
{
int ret;
word32 keySize;
byte initialCounter[AES_BLOCK_SIZE];
#ifdef WOLFSSL_STM32_CUBEMX
@@ -7563,7 +7564,7 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
const byte* authTag, word32 authTagSz,
const byte* authIn, word32 authInSz)
{
int ret = 0;
int ret;
word32 keySize;
status_t status;
@@ -7589,7 +7590,7 @@ int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz,
const byte* authTag, word32 authTagSz,
const byte* authIn, word32 authInSz)
{
int ret = 0;
int ret;
word32 keySize;
#ifdef WOLFSSL_STM32_CUBEMX
CRYP_HandleTypeDef hcryp;