Merge pull request #8390 from SparkiDev/lms_sha256_192_l1_h20

LMS: Fix SHA-256-192 level 1, height 20
wolfSSL · Jan 29, 2025 · 25c8869 · 25c8869
2 parents 871c05e + 08a46f5
commit 25c8869
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
@@ -10146,6 +10146,9 @@ static void bench_lms_sign_verify(enum wc_LmsParm parm, byte* pub)
     case WC_LMS_PARM_SHA256_192_L1_H10_W8:
     case WC_LMS_PARM_SHA256_192_L1_H15_W2:
     case WC_LMS_PARM_SHA256_192_L1_H15_W4:
+    case WC_LMS_PARM_SHA256_192_L1_H20_W2:
+    case WC_LMS_PARM_SHA256_192_L1_H20_W4:
+    case WC_LMS_PARM_SHA256_192_L1_H20_W8:
     case WC_LMS_PARM_SHA256_192_L2_H10_W2:
     case WC_LMS_PARM_SHA256_192_L2_H10_W4:
     case WC_LMS_PARM_SHA256_192_L2_H10_W8:

diff --git a/wolfcrypt/src/wc_lms.c b/wolfcrypt/src/wc_lms.c
@@ -351,20 +351,18 @@ static const wc_LmsParamsMap wc_lms_map[] = {
       LMS_PARAMS(1, 10, 8, 3, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W8,
                  WC_SHA256_192_DIGEST_SIZE) },
 #endif
-#endif /* WOLFSSL_LMS_SHA256_192 */
 #if LMS_MAX_HEIGHT >= 20
-#ifndef WOLFSSL_NO_LMS_SHA256_256
-    { WC_LMS_PARM_L1_H20_W2 , "LMS/HSS_SHA256/192_L1_H20_W2",
-      LMS_PARAMS(1, 20, 2, 1, LMS_SHA256_M32_H20, LMOTS_SHA256_N32_W2,
+    { WC_LMS_PARM_SHA256_192_L1_H20_W2 , "LMS/HSS_SHA256/192_L1_H20_W2",
+      LMS_PARAMS(1, 20, 2, 1, LMS_SHA256_M24_H20, LMOTS_SHA256_N24_W2,
                  WC_SHA256_192_DIGEST_SIZE) },
-    { WC_LMS_PARM_L1_H20_W4 , "LMS/HSS_SHA256/192_L1_H20_W4",
-      LMS_PARAMS(1, 20, 4, 2, LMS_SHA256_M32_H20, LMOTS_SHA256_N32_W4,
+    { WC_LMS_PARM_SHA256_192_L1_H20_W4 , "LMS/HSS_SHA256/192_L1_H20_W4",
+      LMS_PARAMS(1, 20, 4, 2, LMS_SHA256_M24_H20, LMOTS_SHA256_N24_W4,
                  WC_SHA256_192_DIGEST_SIZE) },
-    { WC_LMS_PARM_L1_H20_W8 , "LMS/HSS_SHA256/192_L1_H20_W8",
-      LMS_PARAMS(1, 20, 8, 3, LMS_SHA256_M32_H20, LMOTS_SHA256_N32_W8,
+    { WC_LMS_PARM_SHA256_192_L1_H20_W8 , "LMS/HSS_SHA256/192_L1_H20_W8",
+      LMS_PARAMS(1, 20, 8, 3, LMS_SHA256_M24_H20, LMOTS_SHA256_N24_W8,
                  WC_SHA256_192_DIGEST_SIZE) },
 #endif
-#endif
+#endif /* WOLFSSL_LMS_SHA256_192 */
 };
 /* Number of parameter sets supported. */
 #define WC_LMS_MAP_LEN      ((int)(sizeof(wc_lms_map) / sizeof(*wc_lms_map)))

diff --git a/wolfssl/wolfcrypt/lms.h b/wolfssl/wolfcrypt/lms.h
@@ -127,6 +127,9 @@ enum wc_LmsParm {
     WC_LMS_PARM_SHA256_192_L1_H10_W8 = 42,
     WC_LMS_PARM_SHA256_192_L1_H15_W2 = 43,
     WC_LMS_PARM_SHA256_192_L1_H15_W4 = 44,
+    WC_LMS_PARM_SHA256_192_L1_H20_W2 = 53,
+    WC_LMS_PARM_SHA256_192_L1_H20_W4 = 54,
+    WC_LMS_PARM_SHA256_192_L1_H20_W8 = 55,
     WC_LMS_PARM_SHA256_192_L2_H10_W2 = 45,
     WC_LMS_PARM_SHA256_192_L2_H10_W4 = 46,
     WC_LMS_PARM_SHA256_192_L2_H10_W8 = 47,