From 5e420cb84a401a04557d63a60d30f42699270509 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Sun, 31 Mar 2019 17:20:09 -0400 Subject: Hashsig cleanup. - Move hashsig.h contents into hal.h. - Uppercase lmots and lms algorithm types, because we have a convention that enum values are uppercase. - Change all I to hal_uuid_t, because that how we're using them, and it seems silly to have two different 16-byte array types. - Change all "memcpy(&this, &that, sizeof(this))" to "this = that", because it's more succinct, more type-safe, and harder to get wrong. - Slightly tighten up lmots_generate, lmots_sign, and lmots_public_key_candidate. - Remove verbatim draft text, now that I'm pretty sure I implemented it correctly. --- tests/test-rpc_hashsig.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/test-rpc_hashsig.c b/tests/test-rpc_hashsig.c index 2d4c396..1c5765b 100644 --- a/tests/test-rpc_hashsig.c +++ b/tests/test-rpc_hashsig.c @@ -48,7 +48,6 @@ #include #include -#include #include "test-hashsig.h" #include @@ -170,11 +169,11 @@ static void hexdump(const char * const label, const uint8_t * const buf, const s static inline size_t lms_type_to_h(const hal_lms_algorithm_t lms_type) { switch (lms_type) { - case hal_lms_sha256_n32_h5: return 5; - case hal_lms_sha256_n32_h10: return 10; - case hal_lms_sha256_n32_h15: return 15; - case hal_lms_sha256_n32_h20: return 20; - case hal_lms_sha256_n32_h25: return 25; + case HAL_LMS_SHA256_N32_H5: return 5; + case HAL_LMS_SHA256_N32_H10: return 10; + case HAL_LMS_SHA256_N32_H15: return 15; + case HAL_LMS_SHA256_N32_H20: return 20; + case HAL_LMS_SHA256_N32_H25: return 25; default: return 0; } } @@ -182,10 +181,10 @@ static inline size_t lms_type_to_h(const hal_lms_algorithm_t lms_type) static inline size_t lmots_type_to_w(const hal_lmots_algorithm_t lmots_type) { switch (lmots_type) { - case hal_lmots_sha256_n32_w1: return 1; - case hal_lmots_sha256_n32_w2: return 2; - case hal_lmots_sha256_n32_w4: return 4; - case hal_lmots_sha256_n32_w8: return 8; + case HAL_LMOTS_SHA256_N32_W1: return 1; + case HAL_LMOTS_SHA256_N32_W2: return 2; + case HAL_LMOTS_SHA256_N32_W4: return 4; + case HAL_LMOTS_SHA256_N32_W8: return 8; default: return 0; } } @@ -193,10 +192,10 @@ static inline size_t lmots_type_to_w(const hal_lmots_algorithm_t lmots_type) static inline size_t lmots_type_to_p(const hal_lmots_algorithm_t lmots_type) { switch (lmots_type) { - case hal_lmots_sha256_n32_w1: return 265; - case hal_lmots_sha256_n32_w2: return 133; - case hal_lmots_sha256_n32_w4: return 67; - case hal_lmots_sha256_n32_w8: return 34; + case HAL_LMOTS_SHA256_N32_W1: return 265; + case HAL_LMOTS_SHA256_N32_W2: return 133; + case HAL_LMOTS_SHA256_N32_W4: return 67; + case HAL_LMOTS_SHA256_N32_W8: return 34; default: return 0; } } -- cgit v1.2.3