Update LMS/HSS

Set SHA-256/SM3 independently.

Author: guanzhi

include/gmssl/lms.h

@@ -15,7 +15,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <gmssl/sm3.h>
-#include <gmssl/hash256.h>
 #ifdef ENABLE_SHA2
 #include <gmssl/sha2.h>
 #endif
@@ -30,12 +29,24 @@ extern "C" {
 #define LMS_MAX_HEIGHT 25
 
 
+typedef uint8_t lms_hash256_t[32];
+
+
 // Crosscheck with data from LMS-reference (SHA-256), except the LMS signature.
+#if defined(ENABLE_LMS_CROSSCHECK) && defined(ENABLE_SHA2) && !defined(LMS_HASH256_CTX)
+# define LMS_HASH256_CTX	SHA256_CTX
+# define lms_hash256_init	sha256_init
+# define lms_hash256_update	sha256_update
+# define lms_hash256_finish	sha256_finish
+#else
+# define LMS_HASH256_CTX	SM3_CTX
+# define lms_hash256_init	sm3_init
+# define lms_hash256_update	sm3_update
+# define lms_hash256_finish	sm3_finish
+#endif
+
+
 #if defined(ENABLE_LMS_CROSSCHECK) && defined(ENABLE_SHA2)
-# define HASH256_CTX	SHA256_CTX
-# define hash256_init	sha256_init
-# define hash256_update	sha256_update
-# define hash256_finish	sha256_finish
 # define LMOTS_HASH256_N32_W8		LMOTS_SHA256_N32_W8
 # define LMOTS_HASH256_N32_W8_NAME	"LMOTS_SHA256_N32_W8"
 # define LMS_HASH256_M32_H5		LMS_SHA256_M32_H5
@@ -49,10 +60,6 @@ extern "C" {
 # define LMS_HASH256_M32_H20_NAME	"LMS_SHA256_M32_H20"
 # define LMS_HASH256_M32_H25_NAME	"LMS_SHA256_M32_H25"
 #else
-# define HASH256_CTX	SM3_CTX
-# define hash256_init	sm3_init
-# define hash256_update	sm3_update
-# define hash256_finish	sm3_finish
 # define LMOTS_HASH256_N32_W8		LMOTS_SM3_N32_W8
 # define LMOTS_HASH256_N32_W8_NAME	"LMOTS_SM3_N32_W8"
 # define LMS_HASH256_M32_H5		LMS_SM3_M32_H5
@@ -67,6 +74,7 @@ extern "C" {
 # define LMS_HASH256_M32_H25_NAME	"LMS_SM3_M32_H25"
 #endif
 
+
 enum {
 	LMOTS_RESERVED		= 0,
 	LMOTS_SHA256_N32_W1	= 1,
@@ -98,50 +106,51 @@ enum {
 
 
 char *lmots_type_name(int lmots_type);
-void lmots_derive_secrets(const hash256_t seed, const uint8_t I[16], int q, hash256_t x[34]);
-void lmots_secrets_to_public_hash(const uint8_t I[16], int q, const hash256_t x[34], hash256_t pub);
-void lmots_compute_signature(const uint8_t I[16], int q, const hash256_t dgst, const hash256_t x[34], hash256_t y[34]);
-void lmots_signature_to_public_hash(const uint8_t I[16], int q, const hash256_t y[34], const hash256_t dgst, hash256_t pub);
+void lmots_derive_secrets(const lms_hash256_t seed, const uint8_t I[16], int q, lms_hash256_t x[34]);
+void lmots_secrets_to_public_hash(const uint8_t I[16], int q, const lms_hash256_t x[34], lms_hash256_t pub);
+void lmots_compute_signature(const uint8_t I[16], int q, const lms_hash256_t dgst, const lms_hash256_t x[34], lms_hash256_t y[34]);
+void lmots_signature_to_public_hash(const uint8_t I[16], int q, const lms_hash256_t y[34], const lms_hash256_t dgst, lms_hash256_t pub);
 
 
 char *lms_type_name(int lms_type);
 int lms_type_from_name(const char *name);
 int lms_type_to_height(int type, size_t *height);
-void lms_derive_merkle_tree(const hash256_t seed, const uint8_t I[16], int height, hash256_t *tree);
-void lms_derive_merkle_root(const hash256_t seed, const uint8_t I[16], int height, hash256_t root);
+void lms_derive_merkle_tree(const lms_hash256_t seed, const uint8_t I[16], int height, lms_hash256_t *tree);
+void lms_derive_merkle_root(const lms_hash256_t seed, const uint8_t I[16], int height, lms_hash256_t root);
 
 
 typedef struct {
 	int lms_type;
 	int lmots_type;
 	uint8_t I[16]; // lms key identifier
-	hash256_t root; // merkle tree root
+	lms_hash256_t root; // merkle tree root
 } LMS_PUBLIC_KEY;
 
 #define LMS_PUBLIC_KEY_SIZE (4 + 4 + 16 + 32) // = 56 bytes
 
 typedef struct {
 	LMS_PUBLIC_KEY public_key;
-	hash256_t *tree;
-	hash256_t seed;
-	uint32_t q; // in [0, 2^h - 1], q++ after every sign
+	lms_hash256_t *tree;
+	lms_hash256_t seed;
+	uint32_t q; // in [0, 2^h - 1], q++ after every sign // 应该改为index
 } LMS_KEY;
 
 #define LMS_PRIVATE_KEY_SIZE (LMS_PUBLIC_KEY_SIZE + 32 + 4) // = 92 bytes
 
 // FIXME: do we need a function to update lms_key->q ?
 
-int lms_key_generate_ex(LMS_KEY *key, int lms_type, const hash256_t seed, const uint8_t I[16], int cache_tree);
+int lms_key_generate_ex(LMS_KEY *key, int lms_type, const lms_hash256_t seed, const uint8_t I[16], int cache_tree);
 int lms_key_generate(LMS_KEY *key, int lms_type);
 int lms_key_check(const LMS_KEY *key, const LMS_PUBLIC_KEY *pub);
 int lms_key_remaining_signs(const LMS_KEY *key, size_t *count);
+
 int lms_public_key_to_bytes(const LMS_KEY *key, uint8_t **out, size_t *outlen);
-int lms_public_key_from_bytes_ex(const LMS_PUBLIC_KEY **key, const uint8_t **in, size_t *inlen);
+int lms_public_key_from_bytes_ex(const LMS_PUBLIC_KEY **key, const uint8_t **in, size_t *inlen); // 这个函数需要修改		
 int lms_public_key_from_bytes(LMS_KEY *key, const uint8_t **in, size_t *inlen);
 int lms_private_key_to_bytes(const LMS_KEY *key, uint8_t **out, size_t *outlen);
 int lms_private_key_from_bytes(LMS_KEY *key, const uint8_t **in, size_t *inlen);
 int lms_public_key_print(FILE *fp, int fmt, int ind, const char *label, const LMS_PUBLIC_KEY *pub);
-int lms_key_print(FILE *fp, int fmt, int ind, const char *label, const LMS_KEY *key);
+int lms_key_print(FILE *fp, int fmt, int ind, const char *label, const LMS_KEY *key); //				
 void lms_key_cleanup(LMS_KEY *key);
 
 
@@ -150,11 +159,11 @@ typedef struct {
 	int q; // index of LMS tree leaf, in [0, 2^h - 1]
 	struct {
 		int lmots_type; // LMOTS_SM3_N32_W8 or LMOTS_SHA256_N32_W8 in compile time
-		hash256_t C; // randomness of every LMOTS signature
-		hash256_t y[34]; // for w = 8 and hash256, 34 winternitz chains
+		lms_hash256_t C; // randomness of every LMOTS signature
+		lms_hash256_t y[34]; // for w = 8 and hash256, 34 winternitz chains
 	} lmots_sig;
 	int lms_type;
-	hash256_t path[25]; // max tree height = 25 when LMS_SM3_M32_H25
+	lms_hash256_t path[25]; // max tree height = 25 when LMS_SM3_M32_H25
 } LMS_SIGNATURE;
 
 // encoded size, SHOULD be changed when supporting text/der encoding
@@ -163,8 +172,8 @@ typedef struct {
 
 
 int lms_signature_to_merkle_root(const uint8_t I[16], size_t h, int q,
-	const hash256_t y[34], const hash256_t *path,
-	const hash256_t dgst, hash256_t root);
+	const lms_hash256_t y[34], const lms_hash256_t *path,
+	const lms_hash256_t dgst, lms_hash256_t root);
 
 
 /*
@@ -178,22 +187,22 @@ int lms_signature_size(int lms_type, size_t *siglen);
 int lms_key_get_signature_size(const LMS_KEY *key, size_t *siglen);
 
 int lms_signature_to_bytes(const LMS_SIGNATURE *sig, uint8_t **out, size_t *outlen);
-int lms_signature_from_bytes_ex(const LMS_SIGNATURE **sig, size_t *siglen, const uint8_t **in, size_t *inlen);
+int lms_signature_from_bytes_ex(const LMS_SIGNATURE **sig, size_t *siglen, const uint8_t **in, size_t *inlen);// 这个接口有点奇怪，siglen?		
 int lms_signature_from_bytes(LMS_SIGNATURE *sig, const uint8_t **in, size_t *inlen);
 int lms_signature_print_ex(FILE *fp, int fmt, int ind, const char *label, const LMS_SIGNATURE *sig);
 int lms_signature_print(FILE *fp, int fmt, int ind, const char *label, const uint8_t *sig, size_t siglen);
 
 
 typedef struct {
-	HASH256_CTX hash256_ctx;
+	LMS_HASH256_CTX lms_hash256_ctx;
 	LMS_PUBLIC_KEY lms_public_key; // FIXME: or use LMS_PUBLIC_KEY to re-use tree?
 	LMS_SIGNATURE lms_sig;
 } LMS_SIGN_CTX;
 
 int lms_sign_init(LMS_SIGN_CTX *ctx, LMS_KEY *key);
 int lms_sign_update(LMS_SIGN_CTX *ctx, const uint8_t *data, size_t datalen);
-int lms_sign_finish(LMS_SIGN_CTX *ctx, uint8_t *sig, size_t *siglen);
 int lms_sign_finish_ex(LMS_SIGN_CTX *ctx, LMS_SIGNATURE *sig);
+int lms_sign_finish(LMS_SIGN_CTX *ctx, uint8_t *sig, size_t *siglen);
 int lms_verify_init_ex(LMS_SIGN_CTX *ctx, const LMS_KEY *key, const LMS_SIGNATURE *sig);
 int lms_verify_init(LMS_SIGN_CTX *ctx, const LMS_KEY *key, const uint8_t *sigbuf, size_t siglen);
 int lms_verify_update(LMS_SIGN_CTX *ctx, const uint8_t *data, size_t datalen);
@@ -204,13 +213,11 @@ int lms_verify_finish(LMS_SIGN_CTX *ctx);
 void lms_sign_ctx_cleanup(LMS_SIGN_CTX *ctx);
 
 
-/*
 // just for reference, HSS_PUBLIC_KEY memory layout might not compatible with HSS_KEY
 typedef struct {
 	uint32_t levels;
 	LMS_PUBLIC_KEY lms_public_key;
 } HSS_PUBLIC_KEY;
-*/
 
 // HSS_PUBLIC_KEY: { level, lms_key[0].public_key }
 #define HSS_PUBLIC_KEY_SIZE (4 + LMS_PUBLIC_KEY_SIZE)