wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #770 from JacobBarthelmeh/master

Browse Source 
adjust return value of hash update and address warning with NO_SHA
This commit is contained in:
dgarske
2017-02-28 14:56:43 -08:00
committed by GitHub
parent b86dfd582f 0ed8024bcf
commit 0608cd0dd3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/hash.c
View File

@@ -166,7 +166,7 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
if (hash_len < dig_size) { if (hash_len < dig_size) {
return BUFFER_E; return BUFFER_E;
} }
/* Suppress possible unused arg if all hashing is disabled */ /* Suppress possible unused arg if all hashing is disabled */
(void)data; (void)data;
(void)data_len; (void)data_len;
@@ -283,7 +283,7 @@ int wc_HashInit(wc_HashAlg* hash, enum wc_HashType type)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}; };
return 0; return ret;
} }
int wc_HashUpdate(wc_HashAlg* hash, enum wc_HashType type, const byte* data, int wc_HashUpdate(wc_HashAlg* hash, enum wc_HashType type, const byte* data,
@@ -304,8 +304,8 @@ int wc_HashUpdate(wc_HashAlg* hash, enum wc_HashType type, const byte* data,
#ifndef NO_SHA #ifndef NO_SHA
ret = wc_ShaUpdate(&hash->sha, data, dataSz); ret = wc_ShaUpdate(&hash->sha, data, dataSz);
if (ret != 0) if (ret != 0)
#endif
return ret; return ret;
#endif
break; break;
case WC_HASH_TYPE_SHA224: case WC_HASH_TYPE_SHA224:
#ifdef WOLFSSL_SHA224 #ifdef WOLFSSL_SHA224
@@ -345,7 +345,7 @@ int wc_HashUpdate(wc_HashAlg* hash, enum wc_HashType type, const byte* data,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
}; };
return 0; return ret;
} }
int wc_HashFinal(wc_HashAlg* hash, enum wc_HashType type, byte* out) int wc_HashFinal(wc_HashAlg* hash, enum wc_HashType type, byte* out)