Update XMSS-SM3

XMSS is in developing, not fully tested

tools/gmssl.c

@@ -72,8 +72,10 @@ extern int hsskeygen_main(int argc, char **argv);
 extern int hsssign_main(int argc, char **argv);
 extern int hssverify_main(int argc, char **argv);
 #endif
-#ifdef ENABLE_SM3_XMSS
-extern int sm3xmss_keygen_main(int argc, char **argv);
+#ifdef ENABLE_XMSS
+extern int xmsskeygen_main(int argc, char **argv);
+extern int xmsssign_main(int argc, char **argv);
+extern int xmssverify_main(int argc, char **argv);
 #endif
 #ifdef ENABLE_SDF
 extern int sdfinfo_main(int argc, char **argv);
@@ -140,15 +142,17 @@ static const char *options =
 	"  cmssign           Generate CMS SignedData\n"
 	"  cmsverify         Verify CMS SignedData\n"
 #ifdef ENABLE_LMS_HSS
-	"  lmskeygen         Generate SM3-LMS keypair\n"
-	"  lmssign           Generate LMS signature\n"
-	"  lmsverify         Verify LMS signature\n"
-	"  hsskeygen         Generate SM3-HSS keypair\n"
-	"  hsssign           Generate HSS signature\n"
-	"  hssverify         Verify HSS signature\n"
+	"  lmskeygen         Generate LMS-SM3 (Leighton-Micali Signature) keypair\n"
+	"  lmssign           Generate LMS-SM3 signature\n"
+	"  lmsverify         Verify LMS-SM3 signature\n"
+	"  hsskeygen         Generate HSS-SM3 keypair\n"
+	"  hsssign           Generate HSS-SM3 signature\n"
+	"  hssverify         Verify HSS-SM3 signature\n"
 #endif
-#ifdef ENABLE_SM3_XMSS
-	"  sm3xmss_keygen    Generate SM3-XMSS keypair\n"
+#ifdef ENABLE_XMSS
+	"  xmsskeygen        Generate XMSS-SM3 keypair\n"
+	"  xmsssign          Generate XMSS-SM3 signature\n"
+	"  xmssverify        Verify XMSS-SM3 signature\n"
 #endif
 #ifdef ENABLE_SDF
 	"  sdfinfo           Print SDF device info\n"
@@ -318,9 +322,13 @@ int main(int argc, char **argv)
 		} else if (!strcmp(*argv, "hssverify")) {
 			return hssverify_main(argc, argv);
 #endif
-#ifdef ENABLE_SM3_XMSS
-		} else if (!strcmp(*argv, "sm3xmss_keygen")) {
-			return sm3xmss_keygen_main(argc, argv);
+#ifdef ENABLE_XMSS
+		} else if (!strcmp(*argv, "xmsskeygen")) {
+			return xmsskeygen_main(argc, argv);
+		} else if (!strcmp(*argv, "xmsssign")) {
+			return xmsssign_main(argc, argv);
+		} else if (!strcmp(*argv, "xmssverify")) {
+			return xmssverify_main(argc, argv);
 #endif
 #ifdef ENABLE_SDF
 		} else if (!strcmp(*argv, "sdfinfo")) {

tools/xmsskeygen.c

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <gmssl/mem.h>
 #include <gmssl/error.h>
-#include <gmssl/sm3_xmss.h>
+#include <gmssl/xmss.h>
 
 
 static const char *usage = "-oid oid [-out file] [-pubout file]\n";
@@ -29,7 +29,7 @@ static const char *help =
 "    -pubout file                Output public key\n"
 "\n";
 
-int sm3xmss_keygen_main(int argc, char **argv)
+int xmsskeygen_main(int argc, char **argv)
 {
 	int ret = 1;
 	char *prog = argv[0];
@@ -39,7 +39,7 @@ int sm3xmss_keygen_main(int argc, char **argv)
 	char *puboutfile = NULL;
 	FILE *outfp = stdout;
 	FILE *puboutfp = stdout;
-	SM3_XMSS_KEY key;
+	XMSS_KEY key;
 	uint8_t *out = NULL;
 	uint8_t *pubout = NULL;
 	size_t outlen, puboutlen;
@@ -103,12 +103,12 @@ bad:
 	}
 
 
-	if (sm3_xmss_key_generate(&key, oid_val) != 1) {
+	if (xmss_key_generate(&key, oid_val) != 1) {
 		error_print();
 		return -1;
 	}
 
-	if (sm3_xmss_key_to_bytes(&key, NULL, &outlen) != 1) {
+	if (xmss_key_to_bytes(&key, NULL, &outlen) != 1) {
 		error_print();
 		goto end;
 	}
@@ -116,11 +116,11 @@ bad:
 		error_print();
 		goto end;
 	}
-	if (sm3_xmss_key_to_bytes(&key, out, &outlen) != 1) {
+	if (xmss_key_to_bytes(&key, out, &outlen) != 1) {
 		error_print();
 	}
 
-	if (sm3_xmss_public_key_to_bytes(&key, NULL, &puboutlen) != 1) {
+	if (xmss_public_key_to_bytes(&key, NULL, &puboutlen) != 1) {
 		error_print();
 		goto end;
 	}
@@ -128,7 +128,7 @@ bad:
 		error_print();
 		goto end;
 	}
-	if (sm3_xmss_public_key_to_bytes(&key, pubout, &puboutlen) != 1) {
+	if (xmss_public_key_to_bytes(&key, pubout, &puboutlen) != 1) {
 		error_print();
 		goto end;
 	}

tools/xmsssign.c

@@ -12,8 +12,10 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <gmssl/mem.h>
+#include <gmssl/file.h>
 #include <gmssl/error.h>
-#include <gmssl/sm3_xmss.h>
+#include <gmssl/xmss.h>
 
 static const char *usage = "-key file [-in file] [-out file]\n";
 
@@ -24,7 +26,7 @@ static const char *help =
 "    -out file                   Output signature file\n"
 "\n";
 
-int sm3xmss_sign_main(int argc, char **argv)
+int xmsssign_main(int argc, char **argv)
 {
 	int ret = 1;
 	char *prog = argv[0];
@@ -34,8 +36,10 @@ int sm3xmss_sign_main(int argc, char **argv)
 	FILE *keyfp = NULL;
 	FILE *infp = stdin;
 	FILE *outfp = stdout;
-	SM3_XMSS_KEY key;
-	SM3_XMSS_SIGN_CTX sign_ctx;
+	uint8_t *keybuf = NULL;
+	size_t keylen;
+	XMSS_KEY key;
+	XMSS_SIGN_CTX sign_ctx;
 	uint8_t *sigbuf = NULL;
 	size_t siglen;
 
@@ -56,10 +60,16 @@ int sm3xmss_sign_main(int argc, char **argv)
 		} else if (!strcmp(*argv, "-key")) {
 			if (--argc < 1) goto bad;
 			keyfile = *(++argv);
+			/*
 			if (!(keyfp = fopen(keyfile, "rb"))) {
 				fprintf(stderr, "%s: open '%s' failure: %s\n", prog, keyfile, strerror(errno));
 				goto end;
 			}
+			*/
+			if (file_read_all(keyfile, &keybuf, &keylen) != 1) {
+				error_print();
+				goto end;
+			}
 		} else if (!strcmp(*argv, "-in")) {
 			if (--argc < 1) goto bad;
 			infile = *(++argv);
@@ -91,17 +101,13 @@ bad:
 		goto end;
 	}
 
-	if (sm3_xmss_key_from_bytes(&key, NULL, 0) != 1) {
+
+	if (xmss_key_from_bytes(&key, keybuf, keylen) != 1) {
 		error_print();
 		goto end;
 	}
 
-	if (fread(&key, 1, sizeof(key), keyfp) != sizeof(key)) {
-		fprintf(stderr, "%s: read private key failure\n", prog);
-		goto end;
-	}
-
-	if (sm3_xmss_sign_init(&sign_ctx, &key) != 1) {
+	if (xmss_sign_init(&sign_ctx, &key) != 1) {
 		error_print();
 		goto end;
 	}
@@ -112,13 +118,13 @@ bad:
 		if (len == 0) {
 			break;
 		}
-		if (sm3_xmss_sign_update(&sign_ctx, buf, len) != 1) {
+		if (xmss_sign_update(&sign_ctx, buf, len) != 1) {
 			error_print();
 			goto end;
 		}
 	}
 
-	if (sm3_xmss_sign_finish(&sign_ctx, &key, NULL, &siglen) != 1) {
+	if (xmss_sign_finish(&sign_ctx, &key, NULL, &siglen) != 1) {
 		error_print();
 		goto end;
 	}
@@ -128,7 +134,7 @@ bad:
 		goto end;
 	}
 
-	if (sm3_xmss_sign_finish(&sign_ctx, &key, sigbuf, &siglen) != 1) {
+	if (xmss_sign_finish(&sign_ctx, &key, sigbuf, &siglen) != 1) {
 		error_print();
 		goto end;
 	}
@@ -147,7 +153,11 @@ end:
 		gmssl_secure_clear(sigbuf, siglen);
 		free(sigbuf);
 	}
-	if (keyfp) fclose(keyfp);
+	if (keybuf) {
+		gmssl_secure_clear(keybuf, keylen);
+		free(keybuf);
+	}
+	//if (keyfp) fclose(keyfp);
 	if (infp && infp != stdin) fclose(infp);
 	if (outfp && outfp != stdout) fclose(outfp);
 	return ret;

tools/xmssverify.c

@@ -0,0 +1,158 @@
+/*
+ *  Copyright 2014-2025 The GmSSL Project. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License); you may
+ *  not use this file except in compliance with the License.
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <gmssl/mem.h>
+#include <gmssl/error.h>
+#include <gmssl/xmss.h>
+
+static const char *usage = "-pubkey file [-in file] -sig file [-verbose]\n";
+
+static const char *options =
+"Options\n"
+"    -pubkey file                Input public key file\n"
+"    -in file                    Input data file (if not using stdin)\n"
+"    -sig file                   Input signature file\n"
+"    -verbose                    Print public key and signature\n"
+"\n";
+
+int xmssverify_main(int argc, char **argv)
+{
+	int ret = 1;
+	char *prog = argv[0];
+	char *pubkeyfile = NULL;
+	char *infile = NULL;
+	char *sigfile = NULL;
+	int verbose = 0;
+	FILE *pubkeyfp = NULL;
+	FILE *infp = stdin;
+	FILE *sigfp = NULL;
+	uint8_t pubkeybuf[XMSS_PUBLIC_KEY_SIZE];
+	size_t pubkeylen = XMSS_PUBLIC_KEY_SIZE;
+	const uint8_t *cp = pubkeybuf;
+	uint8_t sig[XMSS_SIGNATURE_MAX_SIZE];
+	size_t siglen;
+	XMSS_KEY key;
+	XMSS_SIGN_CTX ctx;
+	int vr;
+
+	argc--;
+	argv++;
+
+	if (argc < 1) {
+		fprintf(stderr, "usage: gmssl %s %s\n", prog, usage);
+		return 1;
+	}
+
+	while (argc > 0) {
+		if (!strcmp(*argv, "-help")) {
+			printf("usage: %s %s\n", prog, usage);
+			printf("%s\n", options);
+			ret = 0;
+			goto end;
+		} else if (!strcmp(*argv, "-pubkey")) {
+			if (--argc < 1) goto bad;
+			pubkeyfile = *(++argv);
+			if (!(pubkeyfp = fopen(pubkeyfile, "rb"))) {
+				fprintf(stderr, "%s: open '%s' failure: %s\n", prog, pubkeyfile, strerror(errno));
+				goto end;
+			}
+		} else if (!strcmp(*argv, "-in")) {
+			if (--argc < 1) goto bad;
+			infile = *(++argv);
+			if (!(infp = fopen(infile, "rb"))) {
+				fprintf(stderr, "%s: open '%s' failure: %s\n", prog, infile, strerror(errno));
+				goto end;
+			}
+		} else if (!strcmp(*argv, "-sig")) {
+			if (--argc < 1) goto bad;
+			sigfile = *(++argv);
+			if (!(sigfp = fopen(sigfile, "rb"))) {
+				fprintf(stderr, "%s: open '%s' failure: %s\n", prog, sigfile, strerror(errno));
+				goto end;
+			}
+		} else if (!strcmp(*argv, "-verbose")) {
+			verbose = 1;
+		} else {
+			fprintf(stderr, "%s: illegal option '%s'\n", prog, *argv);
+			goto end;
+bad:
+			fprintf(stderr, "%s: `%s` option value missing\n", prog, *argv);
+			goto end;
+		}
+
+		argc--;
+		argv++;
+	}
+
+	if (!pubkeyfile) {
+		fprintf(stderr, "%s: `-key` option required\n", prog);
+		goto end;
+	}
+	if (!sigfile) {
+		fprintf(stderr, "%s: `-sig` option required\n", prog);
+		goto end;
+	}
+
+	if (fread(pubkeybuf, 1, pubkeylen, pubkeyfp) != pubkeylen)  {
+		fprintf(stderr, "%s: read public key failure\n", prog);
+		goto end;
+	}
+	if (xmss_public_key_from_bytes(&key, cp, pubkeylen) != 1) {
+		error_print();
+		fprintf(stderr, "%s: invalid public key data\n", prog);
+		goto end;
+	}
+	if (verbose) {
+		xmss_key_print(stderr, 0, 0, "xmss_public_key", &key);
+	}
+
+	// read signature even if signature not compatible with the public key
+	if ((siglen = fread(sig, 1, XMSS_SIGNATURE_MAX_SIZE, sigfp)) <= 0) {
+		fprintf(stderr, "%s: read signature failure\n", prog);
+		goto end;
+	}
+	if (verbose) {
+		xmss_signature_print(stderr, 0, 0, "xmss_signature", sig, siglen);
+	}
+	if (xmss_verify_init(&ctx, &key, sig, siglen) != 1) {
+		error_print();
+		goto end;
+	}
+
+	while (1) {
+		uint8_t buf[1024];
+		size_t len = fread(buf, 1, sizeof(buf), infp);
+		if (len == 0) {
+			break;
+		}
+		if (xmss_verify_update(&ctx, buf, len) != 1) {
+			error_print();
+			goto end;
+		}
+	}
+	if ((vr = xmss_verify_finish(&ctx, &key, sig, siglen)) < 0) {
+		error_print();
+		goto end;
+	}
+	fprintf(stdout, "verify : %s\n", vr == 1 ? "success" : "failure");
+	if (vr == 1) {
+		ret = 0;
+	}
+
+end:
+	if (pubkeyfp) fclose(pubkeyfp);
+	if (infp && infp != stdin) fclose(infp);
+	if (sigfp) fclose(sigfp);
+	return ret;
+}