From 647b53d880136dcfc879038d7ef0ef08153281b0 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Fri, 7 Apr 2017 20:50:28 -0400 Subject: [PATCH] add blake2s to various places. --- src/misc/crypt/crypt.c | 3 +++ src/misc/crypt/crypt_sizes.c | 3 +++ testprof/x86_prof.c | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/src/misc/crypt/crypt.c b/src/misc/crypt/crypt.c index 4331406..d3cb1c7 100644 --- a/src/misc/crypt/crypt.c +++ b/src/misc/crypt/crypt.c @@ -180,6 +180,9 @@ const char *crypt_build_settings = #if defined(LTC_WHIRLPOOL) " WHIRLPOOL\n" #endif +#if defined(LTC_BLAKE2S) + " BLAKE2S\n" +#endif #if defined(LTC_CHC_HASH) " CHC_HASH\n" #endif diff --git a/src/misc/crypt/crypt_sizes.c b/src/misc/crypt/crypt_sizes.c index ae5b308..82b98a6 100755 --- a/src/misc/crypt/crypt_sizes.c +++ b/src/misc/crypt/crypt_sizes.c @@ -71,6 +71,9 @@ static const crypt_size _crypt_sizes[] = { #ifdef LTC_TIGER _SZ_STRINGIFY_S(tiger_state), #endif +#ifdef LTC_BLAKE2S + _SZ_STRINGIFY_S(blake2s_state), +#endif #ifdef LTC_CHC_HASH _SZ_STRINGIFY_S(chc_state), #endif diff --git a/testprof/x86_prof.c b/testprof/x86_prof.c index cff316b..1ba1455 100644 --- a/testprof/x86_prof.c +++ b/testprof/x86_prof.c @@ -319,6 +319,12 @@ static void _unregister_all(void) #ifdef LTC_WHIRLPOOL unregister_hash(&whirlpool_desc); #endif +#ifdef LTC_BLAKE2S + unregister_hash(&blake2s_128_desc); + unregister_hash(&blake2s_160_desc); + unregister_hash(&blake2s_224_desc); + unregister_hash(&blake2s_256_desc); +#endif #ifdef LTC_CHC_HASH unregister_hash(&chc_desc); #endif @@ -481,6 +487,12 @@ void reg_algs(void) #ifdef LTC_WHIRLPOOL register_hash (&whirlpool_desc); #endif +#ifdef LTC_BLAKE2S + register_hash(&blake2s_128_desc); + register_hash(&blake2s_160_desc); + register_hash(&blake2s_224_desc); + register_hash(&blake2s_256_desc); +#endif #ifdef LTC_CHC_HASH register_hash(&chc_desc); if ((err = chc_register(register_cipher(&aes_desc))) != CRYPT_OK) {