Merge pull request #2491 from aaronjense/fix-shadow-ret

Fix shadow redeclaration
This commit is contained in:
John Safranek
2019-10-02 12:17:35 -07:00
committed by GitHub

View File

@ -496,7 +496,7 @@ int wc_ShaUpdate(wc_Sha* sha, const byte* data, word32 len)
#ifdef WOLF_CRYPTO_CB
if (sha->devId != INVALID_DEVID) {
int ret = wc_CryptoCb_ShaHash(sha, data, len, NULL);
ret = wc_CryptoCb_ShaHash(sha, data, len, NULL);
if (ret != CRYPTOCB_UNAVAILABLE)
return ret;
/* fall-through when unavailable */
@ -650,7 +650,7 @@ int wc_ShaFinal(wc_Sha* sha, byte* hash)
#ifdef WOLF_CRYPTO_CB
if (sha->devId != INVALID_DEVID) {
int ret = wc_CryptoCb_ShaHash(sha, NULL, 0, hash);
ret = wc_CryptoCb_ShaHash(sha, NULL, 0, hash);
if (ret != CRYPTOCB_UNAVAILABLE)
return ret;
/* fall-through when unavailable */