feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add macro guards

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-04-23 13:51:58 -06:00
parent 378f5c0d4b
commit 2a6ab9549b
2 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
wolfcrypt/src/hash.c
View File

@ -171,22 +171,22 @@ int wc_HashGetOID(enum wc_HashType hash_type)
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
oid = SHA3_224h; oid = SHA3_224h;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
oid = SHA3_256h; oid = SHA3_256h;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
oid = SHA3_384h; oid = SHA3_384h;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
oid = SHA3_512h; oid = SHA3_512h;
#endif #endif
break; break;
@ -318,22 +318,22 @@ int wc_HashGetDigestSize(enum wc_HashType hash_type)
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
dig_size = WC_SHA3_224_DIGEST_SIZE; dig_size = WC_SHA3_224_DIGEST_SIZE;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
dig_size = WC_SHA3_256_DIGEST_SIZE; dig_size = WC_SHA3_256_DIGEST_SIZE;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
dig_size = WC_SHA3_384_DIGEST_SIZE; dig_size = WC_SHA3_384_DIGEST_SIZE;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
dig_size = WC_SHA3_512_DIGEST_SIZE; dig_size = WC_SHA3_512_DIGEST_SIZE;
#endif #endif
break; break;
@ -402,22 +402,22 @@ int wc_HashGetBlockSize(enum wc_HashType hash_type)
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
block_size = WC_SHA3_224_BLOCK_SIZE; block_size = WC_SHA3_224_BLOCK_SIZE;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
block_size = WC_SHA3_256_BLOCK_SIZE; block_size = WC_SHA3_256_BLOCK_SIZE;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
block_size = WC_SHA3_384_BLOCK_SIZE; block_size = WC_SHA3_384_BLOCK_SIZE;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
block_size = WC_SHA3_512_BLOCK_SIZE; block_size = WC_SHA3_512_BLOCK_SIZE;
#endif #endif
break; break;
@ -493,22 +493,22 @@ int wc_Hash(enum wc_HashType hash_type, const byte* data,
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
ret = wc_Sha3_224Hash(data, data_len, hash); ret = wc_Sha3_224Hash(data, data_len, hash);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
ret = wc_Sha3_256Hash(data, data_len, hash); ret = wc_Sha3_256Hash(data, data_len, hash);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
ret = wc_Sha3_384Hash(data, data_len, hash); ret = wc_Sha3_384Hash(data, data_len, hash);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
ret = wc_Sha3_512Hash(data, data_len, hash); ret = wc_Sha3_512Hash(data, data_len, hash);
#endif #endif
break; break;
@ -565,22 +565,22 @@ int wc_HashInit(wc_HashAlg* hash, enum wc_HashType type)
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
ret = wc_InitSha3_224(&hash->sha3, NULL, INVALID_DEVID); ret = wc_InitSha3_224(&hash->sha3, NULL, INVALID_DEVID);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
ret = wc_InitSha3_256(&hash->sha3, NULL, INVALID_DEVID); ret = wc_InitSha3_256(&hash->sha3, NULL, INVALID_DEVID);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
ret = wc_InitSha3_384(&hash->sha3, NULL, INVALID_DEVID); ret = wc_InitSha3_384(&hash->sha3, NULL, INVALID_DEVID);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
ret = wc_InitSha3_512(&hash->sha3, NULL, INVALID_DEVID); ret = wc_InitSha3_512(&hash->sha3, NULL, INVALID_DEVID);
#endif #endif
break; break;
@ -639,23 +639,23 @@ int wc_HashUpdate(wc_HashAlg* hash, enum wc_HashType type, const byte* data,
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
ret = wc_Sha3_224_Update(&hash->sha3, data, dataSz); ret = wc_Sha3_224_Update(&hash->sha3, data, dataSz);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz); ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz); ret = wc_Sha3_384_Update(&hash->sha3, data, dataSz);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
ret = wc_Sha3_256_Update(&hash->sha3, data, dataSz); ret = wc_Sha3_512_Update(&hash->sha3, data, dataSz);
#endif #endif
break; break;
@ -712,22 +712,22 @@ int wc_HashFinal(wc_HashAlg* hash, enum wc_HashType type, byte* out)
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
ret = wc_Sha3_224_Final(&hash->sha3, out); ret = wc_Sha3_224_Final(&hash->sha3, out);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
ret = wc_Sha3_256_Final(&hash->sha3, out); ret = wc_Sha3_256_Final(&hash->sha3, out);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
ret = wc_Sha3_384_Final(&hash->sha3, out); ret = wc_Sha3_384_Final(&hash->sha3, out);
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
ret = wc_Sha3_512_Final(&hash->sha3, out); ret = wc_Sha3_512_Final(&hash->sha3, out);
#endif #endif
break; break;
@ -791,25 +791,25 @@ int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type)
break; break;
case WC_HASH_TYPE_SHA3_224: case WC_HASH_TYPE_SHA3_224:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_224)
wc_Sha3_224_Free(&hash->sha3); wc_Sha3_224_Free(&hash->sha3);
ret = 0; ret = 0;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_256: case WC_HASH_TYPE_SHA3_256:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_256)
wc_Sha3_256_Free(&hash->sha3); wc_Sha3_256_Free(&hash->sha3);
ret = 0; ret = 0;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_384: case WC_HASH_TYPE_SHA3_384:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_384)
wc_Sha3_384_Free(&hash->sha3); wc_Sha3_384_Free(&hash->sha3);
ret = 0; ret = 0;
#endif #endif
break; break;
case WC_HASH_TYPE_SHA3_512: case WC_HASH_TYPE_SHA3_512:
#ifdef WOLFSSL_SHA3 #if defined(WOLFSSL_SHA3) && !defined(WOLFSSL_NOSHA3_512)
wc_Sha3_512_Free(&hash->sha3); wc_Sha3_512_Free(&hash->sha3);
ret = 0; ret = 0;
#endif #endif
@ -1185,6 +1185,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
#endif /* WOLFSSL_SHA384 */ #endif /* WOLFSSL_SHA384 */
#if defined(WOLFSSL_SHA3) #if defined(WOLFSSL_SHA3)
#if !defined(WOLFSSL_NOSHA3_224)
int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_224Hash(const byte* data, word32 len, byte* hash)
{ {
int ret = 0; int ret = 0;
@ -1220,7 +1221,9 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
#endif /* !WOLFSSL_NOSHA3_224 */
#if !defined(WOLFSSL_NOSHA3_256)
int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_256Hash(const byte* data, word32 len, byte* hash)
{ {
int ret = 0; int ret = 0;
@ -1256,7 +1259,9 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
#endif /* !WOLFSSL_NOSHA3_256 */
#if !defined(WOLFSSL_NOSHA3_384)
int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_384Hash(const byte* data, word32 len, byte* hash)
{ {
int ret = 0; int ret = 0;
@ -1292,7 +1297,9 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
#endif /* !WOLFSSL_NOSHA3_384 */
#if !defined(WOLFSSL_NOSHA3_512)
int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash) int wc_Sha3_512Hash(const byte* data, word32 len, byte* hash)
{ {
int ret = 0; int ret = 0;
@ -1328,6 +1335,7 @@ int wc_HashGetFlags(wc_HashAlg* hash, enum wc_HashType type, word32* flags)
return ret; return ret;
} }
#endif /* !WOLFSSL_NOSHA3_512 */
#endif /* WOLFSSL_SHA3 */ #endif /* WOLFSSL_SHA3 */
#ifdef WOLFSSL_HAVE_PRF #ifdef WOLFSSL_HAVE_PRF

12
wolfcrypt/test/test.c
View File

@ -2849,7 +2849,7 @@ int hash_test(void)
int ret, exp_ret; int ret, exp_ret;
int i, j; int i, j;
int digestSz; int digestSz;
byte data[] = "0123456789abcdef0123456789abcdef012345"; byte data[] = "0123456789abcdef0123456789abcdef0123456";
byte out[WC_MAX_DIGEST_SIZE]; byte out[WC_MAX_DIGEST_SIZE];
byte hashOut[WC_MAX_DIGEST_SIZE]; byte hashOut[WC_MAX_DIGEST_SIZE];
#if !defined(NO_ASN) || !defined(NO_DH) || defined(HAVE_ECC) #if !defined(NO_ASN) || !defined(NO_DH) || defined(HAVE_ECC)
@ -2881,10 +2881,16 @@ int hash_test(void)
#ifndef WOLFSSL_SHA512 #ifndef WOLFSSL_SHA512
WC_HASH_TYPE_SHA512, WC_HASH_TYPE_SHA512,
#endif #endif
#ifndef WOLFSSL_SHA3 #if !defined(WOLFSSL_SHA3) || defined(WOLFSSL_NOSHA3_224)
WC_HASH_TYPE_SHA3_224, WC_HASH_TYPE_SHA3_224,
#endif
#if !defined(WOLFSSL_SHA3) || defined(WOLFSSL_NOSHA3_256)
WC_HASH_TYPE_SHA3_256, WC_HASH_TYPE_SHA3_256,
#endif
#if !defined(WOLFSSL_SHA3) || defined(WOLFSSL_NOSHA3_384)
WC_HASH_TYPE_SHA3_384, WC_HASH_TYPE_SHA3_384,
#endif
#if !defined(WOLFSSL_SHA3) || defined(WOLFSSL_NOSHA3_512)
WC_HASH_TYPE_SHA3_512, WC_HASH_TYPE_SHA3_512,
#endif #endif
WC_HASH_TYPE_NONE WC_HASH_TYPE_NONE
@ -7068,7 +7074,7 @@ int aesgcm_test(void)
#define BENCH_AESGCM_LARGE 1024 #define BENCH_AESGCM_LARGE 1024
#endif #endif
byte large_input[BENCH_AESGCM_LARGE]; byte large_input[BENCH_AESGCM_LARGE];
byte large_output[BENCH_AESGCM_LARGE]; byte large_output[BENCH_AESGCM_LARGE + AES_BLOCK_SIZE];
byte large_outdec[BENCH_AESGCM_LARGE]; byte large_outdec[BENCH_AESGCM_LARGE];
XMEMSET(large_input, 0, sizeof(large_input)); XMEMSET(large_input, 0, sizeof(large_input));