From 18a617fb86df745a25e4d58c99eda2dbaabd1bc7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niels=20M=C3=B6ller?= Date: Mon, 8 Sep 2025 20:38:32 +0200 Subject: [PATCH] Rename _slh_dsa_shake_128s_params -> _slh_dsa_128s_params, and similarly for 128f. --- ChangeLog | 7 +++++++ slh-dsa-internal.h | 7 ++++--- slh-dsa-shake-128f.c | 8 ++++---- slh-dsa-shake-128s.c | 8 ++++---- testsuite/slh-dsa-test.c | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0291fcef..b7a7f193 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-09-08 Niels Möller + + * slh-dsa-shake-128s.c (_slh_dsa_128s_params): Renamed, from... + (_slh_dsa_shake_128s_params): ... old name. + * slh-dsa-shake-128f.c (_slh_dsa_128f_params): Renamed, from... + (_slh_dsa_shake_128f_params): ... old name. + 2025-09-05 Niels Möller * slh-dsa.h (SLH_DSA_128_SEED_SIZE, SLH_DSA_128_KEY_SIZE) diff --git a/slh-dsa-internal.h b/slh-dsa-internal.h index 54e8499e..516e068e 100644 --- a/slh-dsa-internal.h +++ b/slh-dsa-internal.h @@ -54,8 +54,8 @@ #define _slh_dsa_sign _nettle_slh_dsa_sign #define _slh_dsa_verify _nettle_slh_dsa_verify -#define _slh_dsa_shake_128s_params _nettle_slh_dsa_shake_128s_params -#define _slh_dsa_shake_128f_params _nettle_slh_dsa_shake_128f_params +#define _slh_dsa_128s_params _nettle_slh_dsa_128s_params +#define _slh_dsa_128f_params _nettle_slh_dsa_128f_params /* Size of a single hash, including the seed and prf parameters */ #define _SLH_DSA_128_SIZE 16 @@ -117,7 +117,8 @@ struct slh_dsa_params struct slh_fors_params fors; }; -extern const struct slh_dsa_params _slh_dsa_shake_128s_params; +extern const struct slh_dsa_params _slh_dsa_128s_params; +extern const struct slh_dsa_params _slh_dsa_128f_params; void _slh_shake_init (struct sha3_ctx *ctx, const uint8_t *public_seed, diff --git a/slh-dsa-shake-128f.c b/slh-dsa-shake-128f.c index 995b551b..100c04a2 100644 --- a/slh-dsa-shake-128f.c +++ b/slh-dsa-shake-128f.c @@ -50,7 +50,7 @@ #define FORS_MSG_SIZE 25 const struct slh_dsa_params -_slh_dsa_shake_128f_params = +_slh_dsa_128f_params = { { SLH_DSA_D, XMSS_H, XMSS_SIGNATURE_SIZE (XMSS_H) }, { FORS_A, FORS_K, FORS_MSG_SIZE, FORS_SIGNATURE_SIZE (FORS_A, FORS_K) }, @@ -61,7 +61,7 @@ slh_dsa_shake_128f_root (const uint8_t *public_seed, const uint8_t *private_seed uint8_t *root) { uint8_t scratch[(XMSS_H + 1)*_SLH_DSA_128_SIZE]; - _xmss_gen (public_seed, private_seed, &_slh_dsa_shake_128f_params.xmss, scratch, root); + _xmss_gen (public_seed, private_seed, &_slh_dsa_128f_params.xmss, scratch, root); } void @@ -114,7 +114,7 @@ slh_dsa_shake_128f_sign (const uint8_t *pub, const uint8_t *priv, _slh_dsa_digest (signature, pub, length, msg, SLH_DSA_M, digest); parse_digest (digest + FORS_MSG_SIZE, &tree_idx, &leaf_idx); - _slh_dsa_sign (&_slh_dsa_shake_128f_params, pub, priv, digest, tree_idx, leaf_idx, + _slh_dsa_sign (&_slh_dsa_128f_params, pub, priv, digest, tree_idx, leaf_idx, signature + _SLH_DSA_128_SIZE); } @@ -129,6 +129,6 @@ slh_dsa_shake_128f_verify (const uint8_t *pub, _slh_dsa_digest (signature, pub, length, msg, SLH_DSA_M,digest); parse_digest (digest + FORS_MSG_SIZE, &tree_idx, &leaf_idx); - return _slh_dsa_verify (&_slh_dsa_shake_128f_params, pub, digest, tree_idx, leaf_idx, + return _slh_dsa_verify (&_slh_dsa_128f_params, pub, digest, tree_idx, leaf_idx, signature + _SLH_DSA_128_SIZE); } diff --git a/slh-dsa-shake-128s.c b/slh-dsa-shake-128s.c index a8fe9cf0..9fdea141 100644 --- a/slh-dsa-shake-128s.c +++ b/slh-dsa-shake-128s.c @@ -50,7 +50,7 @@ #define FORS_MSG_SIZE 21 const struct slh_dsa_params -_slh_dsa_shake_128s_params = +_slh_dsa_128s_params = { { SLH_DSA_D, XMSS_H, XMSS_SIGNATURE_SIZE (XMSS_H) }, { FORS_A, FORS_K, FORS_MSG_SIZE, FORS_SIGNATURE_SIZE (FORS_A, FORS_K) }, @@ -61,7 +61,7 @@ slh_dsa_shake_128s_root (const uint8_t *public_seed, const uint8_t *private_seed uint8_t *root) { uint8_t scratch[(XMSS_H + 1)*_SLH_DSA_128_SIZE]; - _xmss_gen (public_seed, private_seed, &_slh_dsa_shake_128s_params.xmss, scratch, root); + _xmss_gen (public_seed, private_seed, &_slh_dsa_128s_params.xmss, scratch, root); } void @@ -114,7 +114,7 @@ slh_dsa_shake_128s_sign (const uint8_t *pub, const uint8_t *priv, _slh_dsa_digest (signature, pub, length, msg, SLH_DSA_M, digest); parse_digest (digest + FORS_MSG_SIZE, &tree_idx, &leaf_idx); - _slh_dsa_sign (&_slh_dsa_shake_128s_params, pub, priv, digest, tree_idx, leaf_idx, + _slh_dsa_sign (&_slh_dsa_128s_params, pub, priv, digest, tree_idx, leaf_idx, signature + _SLH_DSA_128_SIZE); } @@ -129,6 +129,6 @@ slh_dsa_shake_128s_verify (const uint8_t *pub, _slh_dsa_digest (signature, pub, length, msg, SLH_DSA_M,digest); parse_digest (digest + FORS_MSG_SIZE, &tree_idx, &leaf_idx); - return _slh_dsa_verify (&_slh_dsa_shake_128s_params, pub, digest, tree_idx, leaf_idx, + return _slh_dsa_verify (&_slh_dsa_128s_params, pub, digest, tree_idx, leaf_idx, signature + _SLH_DSA_128_SIZE); } diff --git a/testsuite/slh-dsa-test.c b/testsuite/slh-dsa-test.c index 5ae9436c..b1a782e1 100644 --- a/testsuite/slh-dsa-test.c +++ b/testsuite/slh-dsa-test.c @@ -442,7 +442,7 @@ test_main (void) test_fors_gen (public_seed, secret_seed, 0, UINT64_C(0x29877722d7c079), 0x156, 0x4e1e, SHEX ("17f55905e41a6dc6e5bab2c9f0c1d5d3"), SHEX ("15325ef3d2914cbd401327244cdb633d")); - test_fors_sign (public_seed, secret_seed, &_slh_dsa_shake_128s_params.fors, + test_fors_sign (public_seed, secret_seed, &_slh_dsa_128s_params.fors, 0, UINT64_C(0x29877722d7c079), 0x156, SHEX ("2033c1a4df6fc230c699522a21bed913" "0dda231526"), -- 2.47.3