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

Merge pull request #2193 from SparkiDev/hash_sha3

Browse Source 
SHA-3 support in Hash
This commit is contained in:
David Garske
2019-04-05 09:04:33 -07:00
committed by GitHub
parent 56d7766ba3 cc5ba81245
commit f5f1fec840
4 changed files with 373 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

370
wolfcrypt/src/hash.c
View File

@ -45,13 +45,17 @@
#ifdef NO_ASN
enum Hash_Sum {
MD2h = 646,
MD5h = 649,
SHAh = 88,
SHA224h = 417,
SHA256h = 414,
SHA384h = 415,
SHA512h = 416
MD2h = 646,
MD5h = 649,
SHAh = 88,
SHA224h = 417,
SHA256h = 414,
SHA384h = 415,
SHA512h = 416,
SHA3_224h = 420,
SHA3_256h = 421,
SHA3_384h = 422,
SHA3_512h = 423
};
#endif /* !NO_ASN */
@ -97,6 +101,20 @@ enum wc_HashType wc_HashTypeConvert(int hashType)
eHashType = WC_HASH_TYPE_SHA512;
break;
#endif /* WOLFSSL_SHA512 */
#ifdef WOLFSSL_SHA3
case WC_SHA3_224:
eHashType = WC_HASH_TYPE_SHA3_224;
break;
case WC_SHA3_256:
eHashType = WC_HASH_TYPE_SHA3_256;
break;
case WC_SHA3_384:
eHashType = WC_HASH_TYPE_SHA3_384;
break;
case WC_SHA3_512:
eHashType = WC_HASH_TYPE_SHA3_512;
break;
#endif /* WOLFSSL_SHA3 */
default:
eHashType = WC_HASH_TYPE_NONE;
break;
@ -152,13 +170,29 @@ int wc_HashGetOID(enum wc_HashType hash_type)
oid = SHA512h;
#endif
break;
case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3
oid = SHA3_224h;
#endif
break;
case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3
oid = SHA3_256h;
#endif
break;
case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3
oid = SHA3_384h;
#endif
break;
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
oid = SHA3_512h;
#endif
break;
/* Not Supported */
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -208,6 +242,20 @@ enum wc_HashType wc_OidGetHash(int oid)
hash_type = WC_HASH_TYPE_SHA512;
#endif
break;
#ifdef WOLFSSL_SHA3
case SHA3_224h:
hash_type = WC_HASH_TYPE_SHA3_224;
break;
case SHA3_256h:
hash_type = WC_HASH_TYPE_SHA3_256;
break;
case SHA3_384h:
hash_type = WC_HASH_TYPE_SHA3_384;
break;
case SHA3_512h:
hash_type = WC_HASH_TYPE_SHA3_512;
break;
#endif /* WOLFSSL_SHA3 */
default:
break;
}
@ -444,13 +492,30 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
#endif
break;
case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_224Hash(data, data_len, hash);
#endif
break;
case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_256Hash(data, data_len, hash);
#endif
break;
case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_384Hash(data, data_len, hash);
#endif
break;
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_512Hash(data, data_len, hash);
#endif
break;
/* Not Supported */
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -499,14 +564,31 @@ int wc_HashInit(wc_HashAlg* hash, enum wc_HashType type)
#endif
break;
case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3
ret = wc_InitSha3_224(&hash->sha3, NULL, INVALID_DEVID);
#endif
break;
case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3
ret = wc_InitSha3_256(&hash->sha3, NULL, INVALID_DEVID);
#endif
break;
case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3
ret = wc_InitSha3_384(&hash->sha3, NULL, INVALID_DEVID);
#endif
break;
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
ret = wc_InitSha3_512(&hash->sha3, NULL, INVALID_DEVID);
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -556,14 +638,31 @@ int wc_HashUpdate(wc_HashAlg* hash, enum wc_HashType type, const byte* data,
#endif
break;
case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_224_Update(&hash->sha3, data, dataSz);
#endif
break;
case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz);
#endif
break;
case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz);
#endif
break;
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz);
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -612,14 +711,31 @@ int wc_HashFinal(wc_HashAlg* hash, enum wc_HashType type, byte* out)
#endif
break;
case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_224_Final(&hash->sha3, out);
#endif
break;
case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_256_Final(&hash->sha3, out);
#endif
break;
case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_384_Final(&hash->sha3, out);
#endif
break;
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_512_Final(&hash->sha3, out);
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -674,14 +790,35 @@ int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type)
#endif
break;
case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3
wc_Sha3_224_Free(&hash->sha3);
ret = 0;
#endif
break;
case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3
wc_Sha3_256_Free(&hash->sha3);
ret = 0;
#endif
break;
case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3
wc_Sha3_384_Free(&hash->sha3);
ret = 0;
#endif
break;
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
wc_Sha3_512_Free(&hash->sha3);
ret = 0;
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -731,14 +868,19 @@ int wc_HashSetFlags(wc_HashAlg* hash, enum wc_HashType type, word32 flags)
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_SetFlags(&hash->sha3, flags);
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -786,14 +928,19 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_SHA3_224:
case WC_HASH_TYPE_SHA3_256:
case WC_HASH_TYPE_SHA3_384:
case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3
ret = wc_Sha3_GetFlags(&hash->sha3, flags);
#endif
break;
/* not supported */
case WC_HASH_TYPE_MD5_SHA:
case WC_HASH_TYPE_MD2:
case WC_HASH_TYPE_MD4:
case WC_HASH_TYPE_BLAKE2B:
case WC_HASH_TYPE_NONE:
default:
@ -1037,6 +1184,151 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
}
#endif /* WOLFSSL_SHA384 */
#if defined(WOLFSSL_SHA3)
int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash)
{
int ret = 0;
#ifdef WOLFSSL_SMALL_STACK
wc_Sha3* sha3;
#else
wc_Sha3 sha3[1];
#endif
#ifdef WOLFSSL_SMALL_STACK
sha3 = (wc_Sha3*)XMALLOC(sizeof(wc_Sha3), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (sha3 == NULL)
return MEMORY_E;
#endif
if ((ret = wc_InitSha3_224(sha3, NULL, INVALID_DEVID)) != 0) {
WOLFSSL_MSG("InitSha3_224 failed");
}
else {
if ((ret = wc_Sha3_224_Update(sha3, data, len)) != 0) {
WOLFSSL_MSG("Sha3_224_Update failed");
}
else if ((ret = wc_Sha3_224_Final(sha3, hash)) != 0) {
WOLFSSL_MSG("Sha3_224_Final failed");
}
wc_Sha3_224_Free(sha3);
}
#ifdef WOLFSSL_SMALL_STACK
XFREE(sha3, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret;
}
int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash)
{
int ret = 0;
#ifdef WOLFSSL_SMALL_STACK
wc_Sha3* sha3;
#else
wc_Sha3 sha3[1];
#endif
#ifdef WOLFSSL_SMALL_STACK
sha3 = (wc_Sha3*)XMALLOC(sizeof(wc_Sha3), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (sha3 == NULL)
return MEMORY_E;
#endif
if ((ret = wc_InitSha3_256(sha3, NULL, INVALID_DEVID)) != 0) {
WOLFSSL_MSG("InitSha3_256 failed");
}
else {
if ((ret = wc_Sha3_256_Update(sha3, data, len)) != 0) {
WOLFSSL_MSG("Sha3_256_Update failed");
}
else if ((ret = wc_Sha3_256_Final(sha3, hash)) != 0) {
WOLFSSL_MSG("Sha3_256_Final failed");
}
wc_Sha3_256_Free(sha3);
}
#ifdef WOLFSSL_SMALL_STACK
XFREE(sha3, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret;
}
int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash)
{
int ret = 0;
#ifdef WOLFSSL_SMALL_STACK
wc_Sha3* sha3;
#else
wc_Sha3 sha3[1];
#endif
#ifdef WOLFSSL_SMALL_STACK
sha3 = (wc_Sha3*)XMALLOC(sizeof(wc_Sha3), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (sha3 == NULL)
return MEMORY_E;
#endif
if ((ret = wc_InitSha3_384(sha3, NULL, INVALID_DEVID)) != 0) {
WOLFSSL_MSG("InitSha3_384 failed");
}
else {
if ((ret = wc_Sha3_384_Update(sha3, data, len)) != 0) {
WOLFSSL_MSG("Sha3_384_Update failed");
}
else if ((ret = wc_Sha3_384_Final(sha3, hash)) != 0) {
WOLFSSL_MSG("Sha3_384_Final failed");
}
wc_Sha3_384_Free(sha3);
}
#ifdef WOLFSSL_SMALL_STACK
XFREE(sha3, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret;
}
int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash)
{
int ret = 0;
#ifdef WOLFSSL_SMALL_STACK
wc_Sha3* sha3;
#else
wc_Sha3 sha3[1];
#endif
#ifdef WOLFSSL_SMALL_STACK
sha3 = (wc_Sha3*)XMALLOC(sizeof(wc_Sha3), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (sha3 == NULL)
return MEMORY_E;
#endif
if ((ret = wc_InitSha3_512(sha3, NULL, INVALID_DEVID)) != 0) {
WOLFSSL_MSG("InitSha3_512 failed");
}
else {
if ((ret = wc_Sha3_512_Update(sha3, data, len)) != 0) {
WOLFSSL_MSG("Sha3_512_Update failed");
}
else if ((ret = wc_Sha3_512_Final(sha3, hash)) != 0) {
WOLFSSL_MSG("Sha3_512_Final failed");
}
wc_Sha3_512_Free(sha3);
}
#ifdef WOLFSSL_SMALL_STACK
XFREE(sha3, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret;
}
#endif /* WOLFSSL_SHA3 */
#ifdef WOLFSSL_HAVE_PRF

41
wolfcrypt/test/test.c
View File

@ -2837,7 +2837,11 @@ int hash_test(void)
#endif
enum wc_HashType typesGood[] = { WC_HASH_TYPE_MD5, WC_HASH_TYPE_SHA,
WC_HASH_TYPE_SHA224, WC_HASH_TYPE_SHA256,
WC_HASH_TYPE_SHA384, WC_HASH_TYPE_SHA512 };
WC_HASH_TYPE_SHA384, WC_HASH_TYPE_SHA512,
WC_HASH_TYPE_SHA3_224,
WC_HASH_TYPE_SHA3_256,
WC_HASH_TYPE_SHA3_384,
WC_HASH_TYPE_SHA3_512 };
enum wc_HashType typesNoImpl[] = {
#ifdef NO_MD5
WC_HASH_TYPE_MD5,
@ -2857,19 +2861,17 @@ int hash_test(void)
#ifndef WOLFSSL_SHA512
WC_HASH_TYPE_SHA512,
#endif
WC_HASH_TYPE_NONE
};
enum wc_HashType typesBad[] = { WC_HASH_TYPE_NONE, WC_HASH_TYPE_MD5_SHA,
WC_HASH_TYPE_MD2, WC_HASH_TYPE_MD4 };
enum wc_HashType typesSha3[] = { WC_HASH_TYPE_SHA3_224,
WC_HASH_TYPE_SHA3_256,
WC_HASH_TYPE_SHA3_384,
WC_HASH_TYPE_SHA3_512 };
enum wc_HashType typesHashBad[] = { WC_HASH_TYPE_MD2, WC_HASH_TYPE_MD4,
#ifndef WOLFSSL_SHA3
WC_HASH_TYPE_SHA3_224,
WC_HASH_TYPE_SHA3_256,
WC_HASH_TYPE_SHA3_384,
WC_HASH_TYPE_SHA3_512,
#endif
WC_HASH_TYPE_NONE
};
enum wc_HashType typesBad[] = { WC_HASH_TYPE_NONE, WC_HASH_TYPE_MD5_SHA,
WC_HASH_TYPE_MD2, WC_HASH_TYPE_MD4 };
enum wc_HashType typesHashBad[] = { WC_HASH_TYPE_MD2, WC_HASH_TYPE_MD4,
WC_HASH_TYPE_BLAKE2B,
WC_HASH_TYPE_NONE };
@ -3054,25 +3056,6 @@ int hash_test(void)
return -3086;
#endif
for (i = 0; i < (int)(sizeof(typesSha3)/sizeof(*typesSha3)); i++) {
ret = wc_HashGetBlockSize(typesSha3[i]);
#ifdef WOLFSSL_SHA3
if (ret == HASH_TYPE_E || ret == BAD_FUNC_ARG)
return -3087;
#else
if (ret != HASH_TYPE_E)
return -3088;
#endif
ret = wc_HashGetDigestSize(typesSha3[i]);
#ifdef WOLFSSL_SHA3
if (ret == HASH_TYPE_E || ret == BAD_FUNC_ARG)
return -3089;
#else
if (ret != HASH_TYPE_E)
return -3090;
#endif
}
ret = wc_HashGetBlockSize(WC_HASH_TYPE_BLAKE2B);
if (ret != BAD_FUNC_ARG)
return -3091;

30
wolfssl/wolfcrypt/asn.h
View File

@ -341,13 +341,17 @@ enum Oid_Types {
enum Hash_Sum {
MD2h = 646,
MD5h = 649,
SHAh = 88,
SHA224h = 417,
SHA256h = 414,
SHA384h = 415,
SHA512h = 416
MD2h = 646,
MD5h = 649,
SHAh = 88,
SHA224h = 417,
SHA256h = 414,
SHA384h = 415,
SHA512h = 416,
SHA3_224h = 420,
SHA3_256h = 421,
SHA3_384h = 422,
SHA3_512h = 423
};
@ -418,10 +422,14 @@ enum KDF_Sum {
enum HMAC_Sum {
HMAC_SHA224_OID = 652,
HMAC_SHA256_OID = 653,
HMAC_SHA384_OID = 654,
HMAC_SHA512_OID = 655
HMAC_SHA224_OID = 652,
HMAC_SHA256_OID = 653,
HMAC_SHA384_OID = 654,
HMAC_SHA512_OID = 655,
HMAC_SHA3_224_OID = 426,
HMAC_SHA3_256_OID = 427,
HMAC_SHA3_384_OID = 428,
HMAC_SHA3_512_OID = 429
};

11
wolfssl/wolfcrypt/hash.h
View File

@ -102,6 +102,9 @@ typedef union {
#ifdef WOLFSSL_SHA512
wc_Sha512 sha512;
#endif
#ifdef WOLFSSL_SHA3
wc_Sha3 sha3;
#endif
} wc_HashAlg;
/* Find largest possible digest size
@ -193,6 +196,14 @@ WOLFSSL_API int wc_Sha384Hash(const byte*, word32, byte*);
WOLFSSL_API int wc_Sha512Hash(const byte*, word32, byte*);
#endif /* WOLFSSL_SHA512 */
#ifdef WOLFSSL_SHA3
#include <wolfssl/wolfcrypt/sha3.h>
WOLFSSL_API int wc_Sha3_224Hash(const byte*, word32, byte*);
WOLFSSL_API int wc_Sha3_256Hash(const byte*, word32, byte*);
WOLFSSL_API int wc_Sha3_384Hash(const byte*, word32, byte*);
WOLFSSL_API int wc_Sha3_512Hash(const byte*, word32, byte*);
#endif /* WOLFSSL_SHA3 */
enum max_prf {
#ifdef HAVE_FFDHE_8192
MAX_PRF_HALF = 516, /* Maximum half secret len */