wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for using devId with one-shot hash functions.

Browse Source
This commit is contained in:
David Garske
2023-12-18 17:14:43 -08:00
parent d5e83310b6
commit 8b203719d3
2 changed files with 166 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
wolfcrypt/src/hash.c
View File

@@ -552,8 +552,8 @@ int wc_HashGetBlockSize(enum wc_HashType hash_type)
} }
/* Generic Hashing Wrapper */ /* Generic Hashing Wrapper */
int wc_Hash(enum wc_HashType hash_type, const byte* data, int wc_Hash_ex(enum wc_HashType hash_type, const byte* data,
word32 data_len, byte* hash, word32 hash_len) word32 data_len, byte* hash, word32 hash_len, void* heap, int devId)
{ {
int ret = HASH_TYPE_E; /* Default to hash type error */ int ret = HASH_TYPE_E; /* Default to hash type error */
int dig_size; int dig_size;
@@ -578,39 +578,39 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
{ {
case WC_HASH_TYPE_MD5: case WC_HASH_TYPE_MD5:
#ifndef NO_MD5 #ifndef NO_MD5
ret = wc_Md5Hash(data, data_len, hash); ret = wc_Md5Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA: case WC_HASH_TYPE_SHA:
#ifndef NO_SHA #ifndef NO_SHA
ret = wc_ShaHash(data, data_len, hash); ret = wc_ShaHash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA224: case WC_HASH_TYPE_SHA224:
#ifdef WOLFSSL_SHA224 #ifdef WOLFSSL_SHA224
ret = wc_Sha224Hash(data, data_len, hash); ret = wc_Sha224Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA256: case WC_HASH_TYPE_SHA256:
#ifndef NO_SHA256 #ifndef NO_SHA256
ret = wc_Sha256Hash(data, data_len, hash); ret = wc_Sha256Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA384: case WC_HASH_TYPE_SHA384:
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
ret = wc_Sha384Hash(data, data_len, hash); ret = wc_Sha384Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA512: case WC_HASH_TYPE_SHA512:
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
ret = wc_Sha512Hash(data, data_len, hash); ret = wc_Sha512Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
#ifndef WOLFSSL_NOSHA512_224 #ifndef WOLFSSL_NOSHA512_224
case WC_HASH_TYPE_SHA512_224: case WC_HASH_TYPE_SHA512_224:
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
#if defined(WOLFSSL_SHA512) && !defined(WOLFSSL_NOSHA512_224) #if defined(WOLFSSL_SHA512) && !defined(WOLFSSL_NOSHA512_224)
ret = wc_Sha512_224Hash(data, data_len, hash); ret = wc_Sha512_224Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
#endif /* !HAVE_FIPS && !HAVE_SELFTEST */ #endif /* !HAVE_FIPS && !HAVE_SELFTEST */
break; break;
@@ -619,44 +619,45 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
case WC_HASH_TYPE_SHA512_256: case WC_HASH_TYPE_SHA512_256:
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
#if defined(WOLFSSL_SHA512) && !defined(WOLFSSL_NOSHA512_224) #if defined(WOLFSSL_SHA512) && !defined(WOLFSSL_NOSHA512_224)
ret = wc_Sha512_256Hash(data, data_len, hash); ret = wc_Sha512_256Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
#endif /* !HAVE_FIPS && !HAVE_SELFTEST */ #endif /* !HAVE_FIPS && !HAVE_SELFTEST */
break; break;
#endif #endif
case WC_HASH_TYPE_MD5_SHA: case WC_HASH_TYPE_MD5_SHA:
#if !defined(NO_MD5) && !defined(NO_SHA) #if !defined(NO_MD5) && !defined(NO_SHA)
ret = wc_Md5Hash(data, data_len, hash); ret = wc_Md5Hash_ex(data, data_len, hash, heap, devId);
if (ret == 0) { if (ret == 0) {
ret = wc_ShaHash(data, data_len, &hash[WC_MD5_DIGEST_SIZE]); ret = wc_ShaHash_ex(data, data_len, &hash[WC_MD5_DIGEST_SIZE],
heap, devId);
} }
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224) #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
ret = wc_Sha3_224Hash(data, data_len, hash); ret = wc_Sha3_224Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256) #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
ret = wc_Sha3_256Hash(data, data_len, hash); ret = wc_Sha3_256Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384) #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
ret = wc_Sha3_384Hash(data, data_len, hash); ret = wc_Sha3_384Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512) #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
ret = wc_Sha3_512Hash(data, data_len, hash); ret = wc_Sha3_512Hash_ex(data, data_len, hash, heap, devId);
#endif #endif
break; break;
#ifdef WOLFSSL_SM3 #ifdef WOLFSSL_SM3
case WC_HASH_TYPE_SM3: case WC_HASH_TYPE_SM3:
ret = wc_Sm3Hash(data, data_len, hash); ret = wc_Sm3Hash_ex(data, data_len, hash, heap, devId);
break; break;
#endif #endif
@@ -678,6 +679,12 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
} }
return ret; return ret;
} }
int wc_Hash(enum wc_HashType hash_type, const byte* data,
word32 data_len, byte* hash, word32 hash_len)
{
return wc_Hash_ex(hash_type, data, data_len, hash, hash_len,
NULL, INVALID_DEVID);
}
int wc_HashInit_ex(wc_HashAlg* hash, enum wc_HashType type, void* heap, int wc_HashInit_ex(wc_HashAlg* hash, enum wc_HashType type, void* heap,
int devId) int devId)
@@ -1279,7 +1286,8 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
#if !defined(WOLFSSL_TI_HASH) #if !defined(WOLFSSL_TI_HASH)
#if !defined(NO_MD5) #if !defined(NO_MD5)
int wc_Md5Hash(const byte* data, word32 len, byte* hash) int wc_Md5Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret; int ret;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1294,7 +1302,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitMd5(md5)) != 0) { if ((ret = wc_InitMd5_ex(md5, heap, devId)) != 0) {
WOLFSSL_MSG("InitMd5 failed"); WOLFSSL_MSG("InitMd5 failed");
} }
else { else {
@@ -1313,10 +1321,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Md5Hash(const byte* data, word32 len, byte* hash)
{
return wc_Md5Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !NO_MD5 */ #endif /* !NO_MD5 */
#if !defined(NO_SHA) #if !defined(NO_SHA)
int wc_ShaHash(const byte* data, word32 len, byte* hash) int wc_ShaHash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1338,7 +1351,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
devId = wc_CryptoCb_GetDevIdAtIndex(0); devId = wc_CryptoCb_GetDevIdAtIndex(0);
#endif #endif
if ((ret = wc_InitSha_ex(sha, NULL, devId)) != 0) { if ((ret = wc_InitSha_ex(sha, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha failed"); WOLFSSL_MSG("InitSha failed");
} }
else { else {
@@ -1357,10 +1370,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_ShaHash(const byte* data, word32 len, byte* hash)
{
return wc_ShaHash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !NO_SHA */ #endif /* !NO_SHA */
#if defined(WOLFSSL_SHA224) #if defined(WOLFSSL_SHA224)
int wc_Sha224Hash(const byte* data, word32 len, byte* hash) int wc_Sha224Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1376,7 +1394,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha224(sha224)) != 0) { if ((ret = wc_InitSha224_ex(sha224, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha224 failed"); WOLFSSL_MSG("InitSha224 failed");
} }
else { else {
@@ -1394,11 +1412,16 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
#endif #endif
return ret; return ret;
} }
int wc_Sha224Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha224Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* WOLFSSL_SHA224 */ #endif /* WOLFSSL_SHA224 */
#if !defined(NO_SHA256) #if !defined(NO_SHA256)
int wc_Sha256Hash(const byte* data, word32 len, byte* hash) int wc_Sha256Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1421,7 +1444,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
devId = wc_CryptoCb_GetDevIdAtIndex(0); devId = wc_CryptoCb_GetDevIdAtIndex(0);
#endif #endif
if ((ret = wc_InitSha256_ex(sha256, NULL, devId)) != 0) { if ((ret = wc_InitSha256_ex(sha256, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha256 failed"); WOLFSSL_MSG("InitSha256 failed");
} }
else { else {
@@ -1441,13 +1464,18 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha256Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha256Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#endif /* !defined(WOLFSSL_TI_HASH) */ #endif /* !defined(WOLFSSL_TI_HASH) */
#if defined(WOLFSSL_SHA512) #if defined(WOLFSSL_SHA512)
int wc_Sha512Hash(const byte* data, word32 len, byte* hash) int wc_Sha512Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1463,7 +1491,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha512(sha512)) != 0) { if ((ret = wc_InitSha512_ex(sha512, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha512 failed"); WOLFSSL_MSG("InitSha512 failed");
} }
else { else {
@@ -1482,9 +1510,14 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha512Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha512Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
#ifndef WOLFSSL_NOSHA512_224 #ifndef WOLFSSL_NOSHA512_224
int wc_Sha512_224Hash(const byte* data, word32 len, byte* hash) int wc_Sha512_224Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1500,7 +1533,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha512_224(sha512)) != 0) { if ((ret = wc_InitSha512_224_ex(sha512, heap, devId)) != 0) {
WOLFSSL_MSG("wc_InitSha512_224 failed"); WOLFSSL_MSG("wc_InitSha512_224 failed");
} }
else { else {
@@ -1519,12 +1552,17 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha512_224Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha512_224Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA512_224 */ #endif /* !WOLFSSL_NOSHA512_224 */
#endif /* !HAVE_FIPS && !HAVE_SELFTEST */ #endif /* !HAVE_FIPS && !HAVE_SELFTEST */
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
#ifndef WOLFSSL_NOSHA512_256 #ifndef WOLFSSL_NOSHA512_256
int wc_Sha512_256Hash(const byte* data, word32 len, byte* hash) int wc_Sha512_256Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1540,7 +1578,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha512_256(sha512)) != 0) { if ((ret = wc_InitSha512_256_ex(sha512, heap, devId)) != 0) {
WOLFSSL_MSG("wc_InitSha512_256 failed"); WOLFSSL_MSG("wc_InitSha512_256 failed");
} }
else { else {
@@ -1559,13 +1597,18 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha512_256Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha512_256Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA512_256 */ #endif /* !WOLFSSL_NOSHA512_256 */
#endif /* !HAVE_FIPS && !HAVE_SELFTEST */ #endif /* !HAVE_FIPS && !HAVE_SELFTEST */
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#if defined(WOLFSSL_SHA384) #if defined(WOLFSSL_SHA384)
int wc_Sha384Hash(const byte* data, word32 len, byte* hash) int wc_Sha384Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1581,7 +1624,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha384(sha384)) != 0) { if ((ret = wc_InitSha384_ex(sha384, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha384 failed"); WOLFSSL_MSG("InitSha384 failed");
} }
else { else {
@@ -1600,11 +1643,16 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha384Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha384Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* WOLFSSL_SHA384 */ #endif /* WOLFSSL_SHA384 */
#if defined(WOLFSSL_SHA3) #if defined(WOLFSSL_SHA3)
#if !defined(WOLFSSL_NOSHA3_224) #if !defined(WOLFSSL_NOSHA3_224)
int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_224Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1620,7 +1668,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha3_224(sha3, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitSha3_224(sha3, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha3_224 failed"); WOLFSSL_MSG("InitSha3_224 failed");
} }
else { else {
@@ -1639,10 +1687,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha3_224Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA3_224 */ #endif /* !WOLFSSL_NOSHA3_224 */
#if !defined(WOLFSSL_NOSHA3_256) #if !defined(WOLFSSL_NOSHA3_256)
int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_256Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1658,7 +1711,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha3_256(sha3, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitSha3_256(sha3, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha3_256 failed"); WOLFSSL_MSG("InitSha3_256 failed");
} }
else { else {
@@ -1677,10 +1730,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha3_256Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA3_256 */ #endif /* !WOLFSSL_NOSHA3_256 */
#if !defined(WOLFSSL_NOSHA3_384) #if !defined(WOLFSSL_NOSHA3_384)
int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_384Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1696,7 +1754,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha3_384(sha3, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitSha3_384(sha3, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha3_384 failed"); WOLFSSL_MSG("InitSha3_384 failed");
} }
else { else {
@@ -1715,10 +1773,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha3_384Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA3_384 */ #endif /* !WOLFSSL_NOSHA3_384 */
#if !defined(WOLFSSL_NOSHA3_512) #if !defined(WOLFSSL_NOSHA3_512)
int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_512Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1734,7 +1797,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSha3_512(sha3, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitSha3_512(sha3, heap, devId)) != 0) {
WOLFSSL_MSG("InitSha3_512 failed"); WOLFSSL_MSG("InitSha3_512 failed");
} }
else { else {
@@ -1753,11 +1816,15 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sha3_512Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA3_512 */ #endif /* !WOLFSSL_NOSHA3_512 */
#ifdef WOLFSSL_SHAKE128 #ifdef WOLFSSL_SHAKE128
int wc_Shake128Hash(const byte* data, word32 len, byte* hash, int wc_Shake128Hash_ex(const byte* data, word32 len, byte* hash,
word32 hashLen) word32 hashLen, void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1773,7 +1840,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitShake128(shake, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitShake128(shake, heap, devId)) != 0) {
WOLFSSL_MSG("InitShake128 failed"); WOLFSSL_MSG("InitShake128 failed");
} }
else { else {
@@ -1792,11 +1859,16 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Shake128Hash(const byte* data, word32 len, byte* hash,
word32 hashLen)
{
return wc_Shake128Hash_ex(data, len, hash, hashLen, NULL, INVALID_DEVID);
}
#endif /* WOLFSSL_SHAKE_128 */ #endif /* WOLFSSL_SHAKE_128 */
#ifdef WOLFSSL_SHAKE256 #ifdef WOLFSSL_SHAKE256
int wc_Shake256Hash(const byte* data, word32 len, byte* hash, int wc_Shake256Hash_ex(const byte* data, word32 len, byte* hash,
word32 hashLen) word32 hashLen, void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1812,7 +1884,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitShake256(shake, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitShake256(shake, heap, devId)) != 0) {
WOLFSSL_MSG("InitShake256 failed"); WOLFSSL_MSG("InitShake256 failed");
} }
else { else {
@@ -1831,11 +1903,17 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Shake256Hash(const byte* data, word32 len, byte* hash,
word32 hashLen)
{
return wc_Shake256Hash_ex(data, len, hash, hashLen, NULL, INVALID_DEVID);
}
#endif /* WOLFSSL_SHAKE_256 */ #endif /* WOLFSSL_SHAKE_256 */
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#ifdef WOLFSSL_SM3 #ifdef WOLFSSL_SM3
int wc_Sm3Hash(const byte* data, word32 len, byte* hash) int wc_Sm3Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId)
{ {
int ret = 0; int ret = 0;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1850,7 +1928,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return MEMORY_E; return MEMORY_E;
#endif #endif
if ((ret = wc_InitSm3(sm3, NULL, INVALID_DEVID)) != 0) { if ((ret = wc_InitSm3(sm3, heap, devId)) != 0) {
WOLFSSL_MSG("InitSm3 failed"); WOLFSSL_MSG("InitSm3 failed");
} }
else { else {
@@ -1869,6 +1947,10 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
int wc_Sm3Hash(const byte* data, word32 len, byte* hash)
{
return wc_Sm3Hash_ex(data, len, hash, NULL, INVALID_DEVID);
}
#endif /* !WOLFSSL_NOSHA3_224 */ #endif /* !WOLFSSL_NOSHA3_224 */
#endif /* !NO_HASH_WRAPPER */ #endif /* !NO_HASH_WRAPPER */

33
wolfssl/wolfcrypt/hash.h
View File

@@ -170,6 +170,9 @@ WOLFSSL_API int wc_HashGetBlockSize(enum wc_HashType hash_type);
WOLFSSL_API int wc_Hash(enum wc_HashType hash_type, WOLFSSL_API int wc_Hash(enum wc_HashType hash_type,
const byte* data, word32 data_len, const byte* data, word32 data_len,
byte* hash, word32 hash_len); byte* hash, word32 hash_len);
WOLFSSL_API int wc_Hash_ex(enum wc_HashType hash_type,
const byte* data, word32 data_len,
byte* hash, word32 hash_len, void* heap, int devId);
/* generic hash operation wrappers */ /* generic hash operation wrappers */
WOLFSSL_API int wc_HashInit_ex(wc_HashAlg* hash, enum wc_HashType type, WOLFSSL_API int wc_HashInit_ex(wc_HashAlg* hash, enum wc_HashType type,
@@ -191,26 +194,36 @@ WOLFSSL_API int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type);
#ifndef NO_MD5 #ifndef NO_MD5
#include <wolfssl/wolfcrypt/md5.h> #include <wolfssl/wolfcrypt/md5.h>
WOLFSSL_API int wc_Md5Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Md5Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Md5Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif #endif
#ifndef NO_SHA #ifndef NO_SHA
#include <wolfssl/wolfcrypt/sha.h> #include <wolfssl/wolfcrypt/sha.h>
WOLFSSL_API int wc_ShaHash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_ShaHash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_ShaHash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif #endif
#ifdef WOLFSSL_SHA224 #ifdef WOLFSSL_SHA224
#include <wolfssl/wolfcrypt/sha256.h> #include <wolfssl/wolfcrypt/sha256.h>
WOLFSSL_API int wc_Sha224Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha224Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha224Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif /* defined(WOLFSSL_SHA224) */ #endif /* defined(WOLFSSL_SHA224) */
#ifndef NO_SHA256 #ifndef NO_SHA256
#include <wolfssl/wolfcrypt/sha256.h> #include <wolfssl/wolfcrypt/sha256.h>
WOLFSSL_API int wc_Sha256Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha256Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha256Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif #endif
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
#include <wolfssl/wolfcrypt/sha512.h> #include <wolfssl/wolfcrypt/sha512.h>
WOLFSSL_API int wc_Sha384Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha384Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha384Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif /* defined(WOLFSSL_SHA384) */ #endif /* defined(WOLFSSL_SHA384) */
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
@@ -218,6 +231,12 @@ WOLFSSL_API int wc_Sha384Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha512Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha512Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha512_224Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha512_224Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha512_256Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha512_256Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha512Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
WOLFSSL_API int wc_Sha512_224Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
WOLFSSL_API int wc_Sha512_256Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#ifdef WOLFSSL_SHA3 #ifdef WOLFSSL_SHA3
@@ -226,18 +245,32 @@ WOLFSSL_API int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sha3_224Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
WOLFSSL_API int wc_Sha3_256Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
WOLFSSL_API int wc_Sha3_384Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
WOLFSSL_API int wc_Sha3_512Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#ifdef WOLFSSL_SHAKE128 #ifdef WOLFSSL_SHAKE128
WOLFSSL_API int wc_Shake128Hash(const byte* data, word32 len, byte* hash, WOLFSSL_API int wc_Shake128Hash(const byte* data, word32 len, byte* hash,
word32 hashLen); word32 hashLen);
WOLFSSL_API int wc_Shake128Hash_ex(const byte* data, word32 len, byte* hash,
word32 hashLen, void* heap, int devId);
#endif #endif
#ifdef WOLFSSL_SHAKE256 #ifdef WOLFSSL_SHAKE256
WOLFSSL_API int wc_Shake256Hash(const byte* data, word32 len, byte* hash, WOLFSSL_API int wc_Shake256Hash(const byte* data, word32 len, byte* hash,
word32 hashLen); word32 hashLen);
WOLFSSL_API int wc_Shake256Hash_ex(const byte* data, word32 len, byte* hash,
word32 hashLen, void* heap, int devId);
#endif #endif
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#ifdef WOLFSSL_SM3 #ifdef WOLFSSL_SM3
WOLFSSL_API int wc_Sm3Hash(const byte* data, word32 len, byte* hash); WOLFSSL_API int wc_Sm3Hash(const byte* data, word32 len, byte* hash);
WOLFSSL_API int wc_Sm3Hash_ex(const byte* data, word32 len, byte* hash,
void* heap, int devId);
#endif #endif
#endif /* !NO_HASH_WRAPPER */ #endif /* !NO_HASH_WRAPPER */