From 1b5ae955d2d1fa90f675de67689439e0f99fd9d4 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Fri, 7 Apr 2017 21:23:10 -0400 Subject: [PATCH] moe clang-format --- src/hashes/blake2s.c | 27 ++++++++++----------------- src/headers/tomcrypt_hash.h | 6 ++---- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/hashes/blake2s.c b/src/hashes/blake2s.c index 3fe8e04..221dc0a 100644 --- a/src/hashes/blake2s.c +++ b/src/hashes/blake2s.c @@ -22,22 +22,19 @@ enum blake2s_constant { BLAKE2S_PERSONALBYTES = 8 }; - struct blake2s_param { - unsigned char digest_length; - unsigned char key_length; - unsigned char fanout; - unsigned char depth; - ulong32 leaf_length; - unsigned char node_offset[6]; - unsigned char node_depth; - unsigned char inner_length; - unsigned char salt[BLAKE2S_SALTBYTES]; - unsigned char personal[BLAKE2S_PERSONALBYTES]; + unsigned char digest_length; + unsigned char key_length; + unsigned char fanout; + unsigned char depth; + ulong32 leaf_length; + unsigned char node_offset[6]; + unsigned char node_depth; + unsigned char inner_length; + unsigned char salt[BLAKE2S_SALTBYTES]; + unsigned char personal[BLAKE2S_PERSONALBYTES]; }; - - const struct ltc_hash_descriptor blake2s_256_desc = { "blake2s_256", @@ -53,7 +50,6 @@ const struct ltc_hash_descriptor blake2s_256_desc = NULL }; - const struct ltc_hash_descriptor blake2s_224_desc = { "blake2s_224", @@ -84,7 +80,6 @@ const struct ltc_hash_descriptor blake2s_160_desc = NULL }; - const struct ltc_hash_descriptor blake2s_128_desc = { "blake2s_128", @@ -100,8 +95,6 @@ const struct ltc_hash_descriptor blake2s_128_desc = NULL }; - - static const ulong32 blake2s_IV[8] = { 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL, 0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL diff --git a/src/headers/tomcrypt_hash.h b/src/headers/tomcrypt_hash.h index 7d6f0d1..062489e 100644 --- a/src/headers/tomcrypt_hash.h +++ b/src/headers/tomcrypt_hash.h @@ -115,8 +115,7 @@ struct chc_state { #ifdef LTC_BLAKE2S - - struct blake2s_state { +struct blake2s_state { ulong32 h[8]; ulong32 t[2]; ulong32 f[2]; @@ -124,8 +123,7 @@ struct chc_state { ulong32 curlen; unsigned char outlen; unsigned char last_node; - }; - +}; #endif typedef union Hash_state {