Rename slh-dsa constants that are not shake-specific.

diff --git a/ChangeLog b/ChangeLog
index 0bd112cc8631357173e131e42e1683b2c591fccb..0291fcef2bad57cbf40e55de23f99b05ba37bdfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-09-05  Niels Möller  <nisse@lysator.liu.se>
+
+       * slh-dsa.h (SLH_DSA_128_SEED_SIZE, SLH_DSA_128_KEY_SIZE)
+       (SLH_DSA_128S_SIGNATURE_SIZE, SLH_DSA_128F_SIGNATURE_SIZE):
+       Renamed and updated all uses, from...
+       (SLH_DSA_SHAKE_128_SEED_SIZE, SLH_DSA_SHAKE_128_KEY_SIZE)
+       (SLH_DSA_SHAKE_128S_SIGNATURE_SIZE)
+       (SLH_DSA_SHAKE_128F_SIGNATURE_SIZE): ... old names.
+
 2025-07-07  Niels Möller  <nisse@lysator.liu.se>
 
        * ecc-secp384r1.c (ecc_secp384r1_modp) [GMP_NUMB_BITS == 32]:

diff --git a/examples/hogweed-benchmark.c b/examples/hogweed-benchmark.c
index 9030223adb1d247c9e77329e94585d125206aa42..5b7930d4837cc385bde953741007e1b3343f6f5e 100644 (file)
--- a/examples/hogweed-benchmark.c
+++ b/examples/hogweed-benchmark.c
@@ -857,8 +857,8 @@ bench_curve_clear (void *p)
 
 struct slh_dsa_ctx
 {
-  uint8_t pub[SLH_DSA_SHAKE_128_KEY_SIZE];
-  uint8_t key[SLH_DSA_SHAKE_128_KEY_SIZE];
+  uint8_t pub[SLH_DSA_128_KEY_SIZE];
+  uint8_t key[SLH_DSA_128_KEY_SIZE];
   uint8_t msg[10];
   uint8_t *sig;
   void (*sign)(const uint8_t *pub, const uint8_t *priv,
@@ -876,11 +876,11 @@ bench_slh_dsa_init_s (unsigned size)
   assert (size == 128);
 
   ctx = xalloc (sizeof (*ctx));
-  memset (ctx->key, 1, SLH_DSA_SHAKE_128_KEY_SIZE);
-  memset (ctx->pub, 2, SLH_DSA_SHAKE_128_SEED_SIZE);
-  slh_dsa_shake_128s_root (ctx->pub, ctx->key, ctx->pub + SLH_DSA_SHAKE_128_SEED_SIZE);
+  memset (ctx->key, 1, SLH_DSA_128_KEY_SIZE);
+  memset (ctx->pub, 2, SLH_DSA_128_SEED_SIZE);
+  slh_dsa_shake_128s_root (ctx->pub, ctx->key, ctx->pub + SLH_DSA_128_SEED_SIZE);
   memset (ctx->msg, 3, sizeof (ctx->msg));
-  ctx->sig = xalloc (SLH_DSA_SHAKE_128S_SIGNATURE_SIZE);
+  ctx->sig = xalloc (SLH_DSA_128S_SIGNATURE_SIZE);
   slh_dsa_shake_128s_sign (ctx->pub, ctx->key, sizeof (ctx->msg), ctx->msg, ctx->sig);
   ctx->sign = slh_dsa_shake_128s_sign;
   ctx->verify = slh_dsa_shake_128s_verify;
@@ -894,11 +894,11 @@ bench_slh_dsa_init_f (unsigned size)
   assert (size == 128);
 
   ctx = xalloc (sizeof (*ctx));
-  memset (ctx->key, 1, SLH_DSA_SHAKE_128_KEY_SIZE);
-  memset (ctx->pub, 2, SLH_DSA_SHAKE_128_SEED_SIZE);
-  slh_dsa_shake_128f_root (ctx->pub, ctx->key, ctx->pub + SLH_DSA_SHAKE_128_SEED_SIZE);
+  memset (ctx->key, 1, SLH_DSA_128_KEY_SIZE);
+  memset (ctx->pub, 2, SLH_DSA_128_SEED_SIZE);
+  slh_dsa_shake_128f_root (ctx->pub, ctx->key, ctx->pub + SLH_DSA_128_SEED_SIZE);
   memset (ctx->msg, 3, sizeof (ctx->msg));
-  ctx->sig = xalloc (SLH_DSA_SHAKE_128F_SIGNATURE_SIZE);
+  ctx->sig = xalloc (SLH_DSA_128F_SIGNATURE_SIZE);
   slh_dsa_shake_128f_sign (ctx->pub, ctx->key, sizeof (ctx->msg), ctx->msg, ctx->sig);
   ctx->sign = slh_dsa_shake_128f_sign;
   ctx->verify = slh_dsa_shake_128f_verify;

diff --git a/slh-dsa-shake-128f.c b/slh-dsa-shake-128f.c
index cc76d2b9934d9439741c05b959ad80399723af7d..995b551b78de3f86e03c4353063c7b8c6fae387f 100644 (file)
--- a/slh-dsa-shake-128f.c
+++ b/slh-dsa-shake-128f.c
@@ -68,9 +68,9 @@ void
 slh_dsa_shake_128f_generate_keypair (uint8_t *pub, uint8_t *priv,
                                     void *random_ctx, nettle_random_func *random)
 {
-  random (random_ctx, SLH_DSA_SHAKE_128_SEED_SIZE, pub);
-  random (random_ctx, 2*SLH_DSA_SHAKE_128_SEED_SIZE, priv);
-  slh_dsa_shake_128f_root (pub, priv, pub + SLH_DSA_SHAKE_128_SEED_SIZE);
+  random (random_ctx, SLH_DSA_128_SEED_SIZE, pub);
+  random (random_ctx, 2*SLH_DSA_128_SEED_SIZE, priv);
+  slh_dsa_shake_128f_root (pub, priv, pub + SLH_DSA_128_SEED_SIZE);
 }
 
 static void

diff --git a/slh-dsa-shake-128s.c b/slh-dsa-shake-128s.c
index 510946ca35a515e7d1590bed7e8e97b4f4ee8228..a8fe9cf0531e6367e43e0a8069d5ab28cbb2db3d 100644 (file)
--- a/slh-dsa-shake-128s.c
+++ b/slh-dsa-shake-128s.c
@@ -68,9 +68,9 @@ void
 slh_dsa_shake_128s_generate_keypair (uint8_t *pub, uint8_t *priv,
                                     void *random_ctx, nettle_random_func *random)
 {
-  random (random_ctx, SLH_DSA_SHAKE_128_SEED_SIZE, pub);
-  random (random_ctx, 2*SLH_DSA_SHAKE_128_SEED_SIZE, priv);
-  slh_dsa_shake_128s_root (pub, priv, pub + SLH_DSA_SHAKE_128_SEED_SIZE);
+  random (random_ctx, SLH_DSA_128_SEED_SIZE, pub);
+  random (random_ctx, 2*SLH_DSA_128_SEED_SIZE, priv);
+  slh_dsa_shake_128s_root (pub, priv, pub + SLH_DSA_128_SEED_SIZE);
 }
 
 static void

diff --git a/slh-dsa.h b/slh-dsa.h
index e61bb06da2eede47b4c3225babcc7760ae5ec090..43d4fbd00054f2da3e62c96ceade6e7a51b24ca3 100644 (file)
--- a/slh-dsa.h
+++ b/slh-dsa.h
@@ -59,10 +59,10 @@ extern "C" {
      root
 */
 
-#define SLH_DSA_SHAKE_128_SEED_SIZE 16
-#define SLH_DSA_SHAKE_128_KEY_SIZE 32
-#define SLH_DSA_SHAKE_128S_SIGNATURE_SIZE 7856
-#define SLH_DSA_SHAKE_128F_SIGNATURE_SIZE 17088
+#define SLH_DSA_128_SEED_SIZE 16
+#define SLH_DSA_128_KEY_SIZE 32
+#define SLH_DSA_128S_SIGNATURE_SIZE 7856
+#define SLH_DSA_128F_SIGNATURE_SIZE 17088
 
 /* Computes public key root, from the two seeds. */
 void

diff --git a/testsuite/slh-dsa-test.c b/testsuite/slh-dsa-test.c
index 081af29282304d68aaccadf329e9593a6f1c8ec1..5ae9436ce7921d27a08e2aa3a8cf07285e8b4aca 100644 (file)
--- a/testsuite/slh-dsa-test.c
+++ b/testsuite/slh-dsa-test.c
@@ -148,7 +148,7 @@ static void
 xmss_leaf (const struct slh_merkle_ctx_secret *ctx, unsigned idx, uint8_t *leaf)
 {
   _wots_gen (ctx->pub.tree_ctx, ctx->secret_seed, idx, leaf);
-  mark_bytes_defined (SLH_DSA_SHAKE_128_SEED_SIZE, leaf);
+  mark_bytes_defined (SLH_DSA_128_SEED_SIZE, leaf);
 }
 
 static void
@@ -334,8 +334,8 @@ struct slh_dsa_alg
 static const struct slh_dsa_alg
 slh_dsa_shake_128s = {
   "slh_dsa_shake_128s",
-  SLH_DSA_SHAKE_128_KEY_SIZE,
-  SLH_DSA_SHAKE_128S_SIGNATURE_SIZE,
+  SLH_DSA_128_KEY_SIZE,
+  SLH_DSA_128S_SIGNATURE_SIZE,
   slh_dsa_shake_128s_sign,
   slh_dsa_shake_128s_verify,
 };
@@ -343,8 +343,8 @@ slh_dsa_shake_128s = {
 static const struct slh_dsa_alg
 slh_dsa_shake_128f = {
   "slh_dsa_shake_128f",
-  SLH_DSA_SHAKE_128_KEY_SIZE,
-  SLH_DSA_SHAKE_128F_SIGNATURE_SIZE,
+  SLH_DSA_128_KEY_SIZE,
+  SLH_DSA_128F_SIGNATURE_SIZE,
   slh_dsa_shake_128f_sign,
   slh_dsa_shake_128f_verify,
 };
@@ -389,7 +389,7 @@ test_main (void)
   const struct tstring *secret_seed =
     SHEX ("7c9935a0b07694aa0c6d10e4db6b1add");
 
-  mark_bytes_undefined (2*SLH_DSA_SHAKE_128_SEED_SIZE, secret_seed->data);
+  mark_bytes_undefined (2*SLH_DSA_128_SEED_SIZE, secret_seed->data);
 
   test_wots_gen (public_seed, secret_seed, 6, 0, 0,
                 SHEX ("38c9077d76d1e32933fb58a53e769ed7"));
@@ -612,7 +612,7 @@ test_main (void)
                SHEX ("D81C4D8D734FCBFB EADE3D3F8A039FAA"
                      "2A2C9957E835AD55 B22E75BF57BB556A"
                      "C8"),
-               read_hex_file ("slh-dsa-shake-128s.ref", SLH_DSA_SHAKE_128S_SIGNATURE_SIZE));
+               read_hex_file ("slh-dsa-shake-128s.ref", SLH_DSA_128S_SIGNATURE_SIZE));
 
   /* Test vector from
      https://github.com/smuellerDD/leancrypto/blob/master/slh-dsa/tests/sphincs_tester_vectors_shake_128f.h */
@@ -624,7 +624,7 @@ test_main (void)
                SHEX ("D81C4D8D734FCBFB EADE3D3F8A039FAA"
                      "2A2C9957E835AD55 B22E75BF57BB556A"
                      "C8"),
-               read_hex_file ("slh-dsa-shake-128f.ref", SLH_DSA_SHAKE_128F_SIGNATURE_SIZE));
+               read_hex_file ("slh-dsa-shake-128f.ref", SLH_DSA_128F_SIGNATURE_SIZE));
 
   /* From
      https://raw.githubusercontent.com/usnistgov/ACVP-Server/refs/heads/master/gen-val/json-files/SLH-DSA-sigGen-FIPS205/internalProjection.json: */
@@ -632,11 +632,11 @@ test_main (void)
                SHEX ("C9A7900E931AFBA2B52A5BC55A2DC4D12DDC9BF8E0B2ED0BDE83E674F1ECE7AA"),
                SHEX ("0E87FF20256E0E499A53B52DF91467C01F0431C07250AFE93DE814117B5D66D3"),
                read_hex_file ("slh-dsa-shake-128f-tc64.msg", 2280),
-               read_hex_file ("slh-dsa-shake-128f-tc64.sig", SLH_DSA_SHAKE_128F_SIGNATURE_SIZE));
+               read_hex_file ("slh-dsa-shake-128f-tc64.sig", SLH_DSA_128F_SIGNATURE_SIZE));
 
   test_slh_dsa (&slh_dsa_shake_128s, /* tcId 215 */
                SHEX ("DD286FF370CB50BC1B23894AA3F7025A534A788E697B94942AB845EFB753A30B"),
                SHEX ("4738AC60C561FFBE15AB96EFFA1A09291A79332E1CA3C38B2FEF40ACA7CFE285"),
                read_hex_file ("slh-dsa-shake-128s-tc215.msg", 5377),
-               read_hex_file ("slh-dsa-shake-128s-tc215.sig", SLH_DSA_SHAKE_128S_SIGNATURE_SIZE));
+               read_hex_file ("slh-dsa-shake-128s-tc215.sig", SLH_DSA_128S_SIGNATURE_SIZE));
 }