wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7489 from anhu/zero_len_hash

Browse Source 
Allow for zero length hash.  Its not an error.
This commit is contained in:
Daniel Pouzzner
2024-05-09 01:34:24 -04:00
committed by GitHub
parent d53abc2e37 529b6a1eb9
commit af928faca7
2 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wolfcrypt/src/sha256.c
View File

@ -825,7 +825,14 @@ static int InitSha256(wc_Sha256* sha256)
{ {
int ret = 0; int ret = 0;
if (sha256 == NULL || (data == NULL && len > 0)) { if (sha256 == NULL) {
return BAD_FUNC_ARG;
}
if (data == NULL && len == 0) {
/* valid, but do nothing */
return 0;
}
if (data == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
@ -876,6 +883,17 @@ static int InitSha256(wc_Sha256* sha256)
int wc_Sha256Update(wc_Sha256* sha256, const byte* data, word32 len) int wc_Sha256Update(wc_Sha256* sha256, const byte* data, word32 len)
{ {
if (sha256 == NULL) {
return BAD_FUNC_ARG;
}
if (data == NULL && len == 0) {
/* valid, but do nothing */
return 0;
}
if (data == NULL) {
return BAD_FUNC_ARG;
}
return se050_hash_update(&sha256->se050Ctx, data, len); return se050_hash_update(&sha256->se050Ctx, data, len);
} }

41
wolfcrypt/src/sha512.c
View File

@ -166,6 +166,17 @@
} }
int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len) int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len)
{ {
if (sha512 == NULL) {
return BAD_FUNC_ARG;
}
if (data == NULL && len == 0) {
/* valid, but do nothing */
return 0;
}
if (data == NULL) {
return BAD_FUNC_ARG;
}
return se050_hash_update(&sha512->se050Ctx, data, len); return se050_hash_update(&sha512->se050Ctx, data, len);
} }
int wc_Sha512Final(wc_Sha512* sha512, byte* hash) int wc_Sha512Final(wc_Sha512* sha512, byte* hash)
@ -1096,7 +1107,14 @@ static WC_INLINE int Sha512Update(wc_Sha512* sha512, const byte* data, word32 le
int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len) int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len)
{ {
if (sha512 == NULL || (data == NULL && len > 0)) { if (sha512 == NULL) {
return BAD_FUNC_ARG;
}
if (data == NULL && len == 0) {
/* valid, but do nothing */
return 0;
}
if (data == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
@ -1497,6 +1515,17 @@ int wc_Sha512Transform(wc_Sha512* sha, const unsigned char* data)
} }
int wc_Sha384Update(wc_Sha384* sha384, const byte* data, word32 len) int wc_Sha384Update(wc_Sha384* sha384, const byte* data, word32 len)
{ {
if (sha384 == NULL) {
return BAD_FUNC_ARG;
}
if (data == NULL && len == 0) {
/* valid, but do nothing */
return 0;
}
if (data == NULL) {
return BAD_FUNC_ARG;
}
return se050_hash_update(&sha384->se050Ctx, data, len); return se050_hash_update(&sha384->se050Ctx, data, len);
} }
@ -1582,7 +1611,15 @@ static int InitSha384(wc_Sha384* sha384)
int wc_Sha384Update(wc_Sha384* sha384, const byte* data, word32 len) int wc_Sha384Update(wc_Sha384* sha384, const byte* data, word32 len)
{ {
if (sha384 == NULL || (data == NULL && len > 0)) {
if (sha384 == NULL) {
return BAD_FUNC_ARG;
}
if (data == NULL && len == 0) {
/* valid, but do nothing */
return 0;
}
if (data == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }