abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-09-22 13:23:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Default Enable LMS/XMSS CL on macOS

Browse Source
This commit is contained in:
Zhi Guan
2026-06-24 11:04:49 +08:00
parent 03c8276501
commit b1c1eddea8
5 changed files with 21 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/xmssmtkeygen.c
View File

@@ -15,9 +15,6 @@
#include <gmssl/mem.h>
#include <gmssl/error.h>
#include <gmssl/xmss.h>
#ifdef ENABLE_XMSS_CL
#include <gmssl/xmss_cl.h>
#endif
static const char *usage = "-xmssmt_type type -out file [-pubout file] [-verbose]\n";
@@ -55,15 +52,8 @@ int xmssmtkeygen_main(int argc, char **argv)
uint8_t *pout;
uint8_t *ppubout = pubout;
size_t outlen = 0, puboutlen = 0;
#ifdef ENABLE_XMSS_CL
XMSS_CL_CTX cl_ctx;
int cl_inited = 0;
#endif
memset(&key, 0, sizeof(key));
#ifdef ENABLE_XMSS_CL
memset(&cl_ctx, 0, sizeof(cl_ctx));
#endif
argc--;
argv++;
@@ -123,22 +113,10 @@ bad:
goto end;
}
#ifdef ENABLE_XMSS_CL
if (xmss_cl_init(&cl_ctx) != 1) {
error_print();
goto end;
}
cl_inited = 1;
if (xmssmt_cl_key_generate(&cl_ctx, &key, xmssmt_type_val) != 1) {
error_print();
goto end;
}
#else
if (xmssmt_key_generate(&key, xmssmt_type_val) != 1) {
error_print();
return -1;
}
#endif
if (verbose) {
xmssmt_public_key_print(stderr, 0, 0, "xmssmt_public_key", &key);
}
@@ -173,9 +151,6 @@ bad:
ret = 0;
end:
#ifdef ENABLE_XMSS_CL
if (cl_inited) xmss_cl_cleanup(&cl_ctx);
#endif
xmssmt_key_cleanup(&key);
if (out) {
gmssl_secure_clear(out, outlen);

28
tools/xmssmtsign.c
View File

@@ -15,9 +15,6 @@
#include <gmssl/mem.h>
#include <gmssl/error.h>
#include <gmssl/xmss.h>
#ifdef ENABLE_XMSS_CL
#include <gmssl/xmss_cl.h>
#endif
static const char *usage = "-key file [-in file] [-out file] [-verbose]\n";
@@ -72,15 +69,8 @@ int xmssmtsign_main(int argc, char **argv)
XMSSMT_SIGN_CTX ctx;
uint8_t sig[XMSSMT_SIGNATURE_MAX_SIZE];
size_t siglen;
#ifdef ENABLE_XMSS_CL
XMSS_CL_CTX cl_ctx;
int cl_inited = 0;
#endif
memset(&key, 0, sizeof(key));
#ifdef ENABLE_XMSS_CL
memset(&cl_ctx, 0, sizeof(cl_ctx));
#endif
argc--;
argv++;
@@ -136,14 +126,6 @@ bad:
goto end;
}
#ifdef ENABLE_XMSS_CL
if (xmss_cl_init(&cl_ctx) != 1) {
error_print();
goto end;
}
cl_inited = 1;
#endif
if (xmssmt_private_key_from_file(&key, keyfp) != 1) {
fprintf(stderr, "%s: read private key failure\n", prog);
goto end;
@@ -158,17 +140,10 @@ bad:
goto end;
}
#ifdef ENABLE_XMSS_CL
if (xmssmt_cl_sign_init(&cl_ctx, &ctx, &key) != 1) {
error_print();
goto end;
}
#else
if (xmssmt_sign_init(&ctx, &key) != 1) {
error_print();
goto end;
}
#endif
while (1) {
uint8_t buf[1024];
@@ -196,9 +171,6 @@ bad:
ret = 0;
end:
#ifdef ENABLE_XMSS_CL
if (cl_inited) xmss_cl_cleanup(&cl_ctx);
#endif
xmssmt_key_cleanup(&key);
gmssl_secure_clear(&ctx, sizeof(ctx));
if (keyfp) fclose(keyfp);

49
tools/xmsssign.c
View File

@@ -16,9 +16,6 @@
#include <gmssl/error.h>
#include <gmssl/endian.h>
#include <gmssl/xmss.h>
#ifdef ENABLE_XMSS_CL
#include <gmssl/xmss_cl.h>
#endif
static const char *usage = "-key file [-in file] [-out file] [-verbose]\n";
@@ -71,17 +68,8 @@ int xmsssign_main(int argc, char **argv)
XMSS_SIGN_CTX ctx;
uint8_t sig[XMSS_SIGNATURE_MAX_SIZE];
size_t siglen;
#ifdef ENABLE_XMSS_CL
XMSS_CL_CTX cl_ctx;
uint8_t *keybuf = NULL;
size_t keylen = 0;
int cl_inited = 0;
#endif
memset(&key, 0, sizeof(key));
#ifdef ENABLE_XMSS_CL
memset(&cl_ctx, 0, sizeof(cl_ctx));
#endif
argc--;
argv++;
@@ -137,40 +125,10 @@ bad:
goto end;
}
#ifdef ENABLE_XMSS_CL
if (xmss_cl_init(&cl_ctx) != 1) {
error_print();
goto end;
}
cl_inited = 1;
if (fseek(keyfp, 0, SEEK_END) != 0
|| (keylen = (size_t)ftell(keyfp)) == (size_t)-1
|| fseek(keyfp, 0, SEEK_SET) != 0) {
error_print();
goto end;
}
if (!(keybuf = malloc(keylen))) {
error_print();
goto end;
}
if (fread(keybuf, 1, keylen, keyfp) != keylen) {
fprintf(stderr, "%s: read private key failure\n", prog);
goto end;
}
{
const uint8_t *cp = keybuf;
size_t len = keylen;
if (xmss_cl_private_key_from_bytes(&cl_ctx, &key, &cp, &len) != 1 || len) {
fprintf(stderr, "%s: read private key failure\n", prog);
goto end;
}
}
#else
if (xmss_private_key_from_file(&key, keyfp) != 1) {
fprintf(stderr, "%s: read private key failure\n", prog);
goto end;
}
#endif
if (verbose) {
xmss_public_key_print(stderr, 0, 0, "lms_public_key", &key);
@@ -212,13 +170,6 @@ bad:
ret = 0;
end:
#ifdef ENABLE_XMSS_CL
if (cl_inited) xmss_cl_cleanup(&cl_ctx);
if (keybuf) {
gmssl_secure_clear(keybuf, keylen);
free(keybuf);
}
#endif
xmss_key_cleanup(&key);
gmssl_secure_clear(&ctx, sizeof(ctx));
if (keyfp) fclose(keyfp);