abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-06 16:36:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add XMSS-SM3 signature

Browse Source
This commit is contained in:
Zhi Guan
2025-12-18 18:35:15 +08:00
parent 4791a30466
commit a03f5132cd
7 changed files with 2434 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
tools/xmsskeygen.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 The GmSSL Project. All Rights Reserved.
* 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.
@@ -17,58 +17,58 @@
#include <gmssl/xmss.h>
static const char *usage = "-oid oid [-out file] [-pubout file]\n";
static const char *usage = "-xmss_type type -out file [-pubout file] [-verbose]\n";
static const char *help =
static const char *options =
"Options\n"
" -oid oid XMSS algorithm OID\n"
" XMSS_SM3_10\n"
" XMSS_SM3_16\n"
" XMSS_SM3_20\n"
" -xmss_type type XMSS Algorithm Type\n"
" "XMSS_HASH256_10_256_NAME"\n"
" "XMSS_HASH256_16_256_NAME"\n"
" "XMSS_HASH256_20_256_NAME"\n"
" -out file Output private key\n"
" -pubout file Output public key\n"
" -verbose Print public key\n"
"\n";
int xmsskeygen_main(int argc, char **argv)
{
int ret = 1;
char *prog = argv[0];
char *oid = NULL;
uint32_t oid_val = 0;
char *xmss_type = NULL;
int xmss_type_val = 0;
char *outfile = NULL;
char *puboutfile = NULL;
FILE *outfp = stdout;
int verbose = 0;
FILE *outfp = NULL;
FILE *puboutfp = stdout;
XMSS_KEY key;
uint8_t *out = NULL;
uint8_t *pubout = NULL;
size_t outlen, puboutlen;
uint8_t out[XMSS_PRIVATE_KEY_SIZE];
uint8_t pubout[XMSS_PUBLIC_KEY_SIZE];
uint8_t *pout = out;
uint8_t *ppubout = pubout;
size_t outlen = 0, puboutlen = 0;
memset(&key, 0, sizeof(key));
argc--;
argv++;
if (argc < 1) {
fprintf(stderr, "usage: %s %s\n", prog, help);
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", help);
printf("usage: gmssl %s %s\n", prog, usage);
printf("%s\n", options);
ret = 0;
goto end;
} else if (!strcmp(*argv, "-oid")) {
} else if (!strcmp(*argv, "-xmss_type")) {
if (--argc < 1) goto bad;
oid = *(++argv);
if (strcmp(oid, "XMSS_SM3_10") == 0) {
oid_val = XMSS_SM3_10;
} else if (strcmp(oid, "XMSS_SM3_16") == 0) {
oid_val = XMSS_SM3_16;
} else if (strcmp(oid, "XMSS_SM3_20") == 0) {
oid_val = XMSS_SM3_20;
} else {
fprintf(stderr, "%s: invalid XMSS algor ID `%s`\n", prog, oid);
xmss_type = *(++argv);
if (!(xmss_type_val = xmss_type_from_name(xmss_type))) {
fprintf(stderr, "%s: invalid xmss_type `%s`\n", prog, xmss_type);
goto end;
}
} else if (!strcmp(*argv, "-out")) {
@@ -85,6 +85,8 @@ int xmsskeygen_main(int argc, char **argv)
fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno));
goto end;
}
} else if (!strcmp(*argv, "-verbose")) {
verbose = 1;
} else {
fprintf(stderr, "%s: illegal option '%s'\n", prog, *argv);
goto end;
@@ -97,46 +99,36 @@ bad:
argv++;
}
if (!oid) {
fprintf(stderr, "%s: `-oid` option required\n", prog);
if (!xmss_type) {
fprintf(stderr, "%s: `-xmss_type` option required\n", prog);
goto end;
}
if (!outfp) {
fprintf(stderr, "%s: `-out` option required\n", prog);
goto end;
}
if (xmss_key_generate(&key, oid_val) != 1) {
if (xmss_key_generate(&key, xmss_type_val) != 1) {
error_print();
return -1;
}
if (xmss_key_to_bytes(&key, NULL, &outlen) != 1) {
error_print();
goto end;
}
if (!(out = malloc(outlen))) {
error_print();
goto end;
}
if (xmss_key_to_bytes(&key, out, &outlen) != 1) {
error_print();
if (verbose) {
xmss_public_key_print(stderr, 0, 0, "xmss_public_key", &key);
}
if (xmss_public_key_to_bytes(&key, NULL, &puboutlen) != 1) {
if (xmss_private_key_to_bytes(&key, &pout, &outlen) != 1) {
error_print();
goto end;
}
if (!(pubout = malloc(puboutlen))) {
error_print();
goto end;
}
if (xmss_public_key_to_bytes(&key, pubout, &puboutlen) != 1) {
error_print();
goto end;
}
if (fwrite(out, 1, outlen, outfp) != outlen) {
error_print();
goto end;
}
if (xmss_public_key_to_bytes(&key, &ppubout, &puboutlen) != 1) {
error_print();
goto end;
}
if (fwrite(pubout, 1, puboutlen, puboutfp) != puboutlen) {
error_print();
goto end;
@@ -144,15 +136,8 @@ bad:
ret = 0;
end:
gmssl_secure_clear(&key, sizeof(key));
if (out) {
gmssl_secure_clear(out, outlen);
free(out);
}
if (pubout) {
gmssl_secure_clear(pubout, puboutlen);
free(pubout);
}
xmss_key_cleanup(&key);
gmssl_secure_clear(out, outlen);
if (outfile && outfp) fclose(outfp);
if (puboutfile && puboutfp) fclose(puboutfp);
return ret;

98
tools/xmsssign.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 The GmSSL Project. All Rights Reserved.
* 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.
@@ -13,17 +13,17 @@
#include <string.h>
#include <stdlib.h>
#include <gmssl/mem.h>
#include <gmssl/file.h>
#include <gmssl/error.h>
#include <gmssl/xmss.h>
static const char *usage = "-key file [-in file] [-out file]\n";
static const char *usage = "-key file [-in file] [-out file] [-verbose]\n";
static const char *help =
static const char *options =
"Options\n"
" -key file Input private key file\n"
" -in file Input data file (if not using stdin)\n"
" -out file Output signature file\n"
" -verbose Print public key and signature\n"
"\n";
int xmsssign_main(int argc, char **argv)
@@ -33,43 +33,42 @@ int xmsssign_main(int argc, char **argv)
char *keyfile = NULL;
char *infile = NULL;
char *outfile = NULL;
int verbose = 0;
FILE *keyfp = NULL;
FILE *infp = stdin;
FILE *outfp = stdout;
uint8_t *keybuf = NULL;
size_t keylen;
uint8_t keybuf[XMSS_PRIVATE_KEY_SIZE];
size_t keylen = XMSS_PRIVATE_KEY_SIZE;
const uint8_t *cp = keybuf;
uint8_t *p = keybuf;
XMSS_KEY key;
XMSS_SIGN_CTX sign_ctx;
uint8_t *sigbuf = NULL;
XMSS_SIGN_CTX ctx;
uint8_t sig[XMSS_SIGNATURE_MAX_SIZE];
size_t siglen;
memset(&key, 0, sizeof(key));
argc--;
argv++;
if (argc < 1) {
fprintf(stderr, "usage: %s %s\n", prog, usage);
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", help);
printf("%s\n", options);
ret = 0;
goto end;
} else if (!strcmp(*argv, "-key")) {
if (--argc < 1) goto bad;
keyfile = *(++argv);
/*
if (!(keyfp = fopen(keyfile, "rb"))) {
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);
@@ -84,6 +83,8 @@ int xmsssign_main(int argc, char **argv)
fprintf(stderr, "%s: open '%s' failure: %s\n", prog, outfile, strerror(errno));
goto end;
}
} else if (!strcmp(*argv, "-verbose")) {
verbose = 1;
} else {
fprintf(stderr, "%s: illegal option '%s'\n", prog, *argv);
goto end;
@@ -101,15 +102,38 @@ bad:
goto end;
}
if (fread(keybuf, 1, keylen, keyfp) != keylen) {
fprintf(stderr, "%s: read private key failure\n", prog);
goto end;
}
if (xmss_private_key_from_bytes(&key, &cp, &keylen) != 1) {
error_print();
goto end;
}
if (keylen) {
error_print();
return -1;
}
if (xmss_key_from_bytes(&key, keybuf, keylen) != 1) {
if (verbose) {
xmss_public_key_print(stderr, 0, 0, "lms_public_key", &key);
}
if (xmss_sign_init(&ctx, &key) != 1) {
error_print();
goto end;
}
if (xmss_sign_init(&sign_ctx, &key) != 1) {
// write updated key back to file
// TODO: write back `q` only
if (xmss_private_key_to_bytes(&key, &p, &keylen) != 1) {
error_print();
goto end;
return -1;
}
rewind(keyfp);
if (fwrite(keybuf, 1, keylen, keyfp) != keylen) {
error_print();
return -1;
}
while (1) {
@@ -118,46 +142,30 @@ bad:
if (len == 0) {
break;
}
if (xmss_sign_update(&sign_ctx, buf, len) != 1) {
if (xmss_sign_update(&ctx, buf, len) != 1) {
error_print();
goto end;
}
}
if (xmss_sign_finish(&sign_ctx, &key, NULL, &siglen) != 1) {
if (xmss_sign_finish(&ctx, sig, &siglen) != 1) {
error_print();
goto end;
}
if (!(sigbuf = malloc(siglen))) {
fprintf(stderr, "%s: malloc failure\n", prog);
goto end;
}
if (xmss_sign_finish(&sign_ctx, &key, sigbuf, &siglen) != 1) {
if (fwrite(sig, 1, siglen, outfp) != siglen) {
error_print();
goto end;
}
if (fwrite(sigbuf, 1, siglen, outfp) != siglen) {
error_print();
goto end;
if (verbose) {
xmss_signature_print(stderr, 0, 0, "lms_signature", sig, siglen);
}
ret = 0;
end:
gmssl_secure_clear(&key, sizeof(key));
gmssl_secure_clear(&sign_ctx, sizeof(sign_ctx));
if (sigbuf) {
gmssl_secure_clear(sigbuf, siglen);
free(sigbuf);
}
if (keybuf) {
gmssl_secure_clear(keybuf, keylen);
free(keybuf);
}
//if (keyfp) fclose(keyfp);
xmss_key_cleanup(&key);
gmssl_secure_clear(keybuf, sizeof(keybuf));
gmssl_secure_clear(&ctx, sizeof(ctx));
if (keyfp) fclose(keyfp);
if (infp && infp != stdin) fclose(infp);
if (outfp && outfp != stdout) fclose(outfp);
return ret;

6
tools/xmssverify.c
View File

@@ -108,13 +108,13 @@ bad:
fprintf(stderr, "%s: read public key failure\n", prog);
goto end;
}
if (xmss_public_key_from_bytes(&key, cp, pubkeylen) != 1) {
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);
xmss_public_key_print(stderr, 0, 0, "xmss_public_key", &key);
}
// read signature even if signature not compatible with the public key
@@ -141,7 +141,7 @@ bad:
goto end;
}
}
if ((vr = xmss_verify_finish(&ctx, &key, sig, siglen)) < 0) {
if ((vr = xmss_verify_finish(&ctx)) < 0) {
error_print();
goto end;
}