mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-06-25 00:11:36 +02:00
Merge pull request #8912 from SparkiDev/lms_sha256_192_w_fix
LMS SHA-256_192: fix parameters
This commit is contained in:
@ -281,79 +281,79 @@ static const wc_LmsParamsMap wc_lms_map[] = {
|
||||
#ifdef WOLFSSL_LMS_SHA256_192
|
||||
#if LMS_MAX_HEIGHT >= 15
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H15_W2, "LMS/HSS_SHA256/192 L1_H15_W2",
|
||||
LMS_PARAMS(1, 15, 2, 1, LMS_SHA256_M24_H15, LMOTS_SHA256_N24_W2,
|
||||
LMS_PARAMS(1, 15, 2, 2, LMS_SHA256_M24_H15, LMOTS_SHA256_N24_W2,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H15_W4, "LMS/HSS_SHA256/192 L1_H15_W4",
|
||||
LMS_PARAMS(1, 15, 4, 2, LMS_SHA256_M24_H15, LMOTS_SHA256_N24_W4,
|
||||
LMS_PARAMS(1, 15, 4, 3, LMS_SHA256_M24_H15, LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#endif
|
||||
#if LMS_MAX_LEVELS >= 2
|
||||
#if LMS_MAX_HEIGHT >= 10
|
||||
{ WC_LMS_PARM_SHA256_192_L2_H10_W2, "LMS/HSS SHA256/192 L2_H10_W2",
|
||||
LMS_PARAMS(2, 10, 2, 1, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W2,
|
||||
LMS_PARAMS(2, 10, 2, 2, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W2,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L2_H10_W4, "LMS/HSS SHA256/192 L2_H10_W4",
|
||||
LMS_PARAMS(2, 10, 4, 2, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W4,
|
||||
LMS_PARAMS(2, 10, 4, 3, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L2_H10_W8, "LMS/HSS SHA256/192 L2_H10_W8",
|
||||
LMS_PARAMS(2, 10, 8, 3, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W8,
|
||||
LMS_PARAMS(2, 10, 8, 4, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W8,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#endif
|
||||
#endif
|
||||
#if LMS_MAX_LEVELS >= 3
|
||||
{ WC_LMS_PARM_SHA256_192_L3_H5_W2 , "LMS/HSS_SHA256/192 L3_H5_W2" ,
|
||||
LMS_PARAMS(3, 5, 2, 1, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W2,
|
||||
LMS_PARAMS(3, 5, 2, 2, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W2,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L3_H5_W4 , "LMS/HSS_SHA256/192 L3_H5_W4" ,
|
||||
LMS_PARAMS(3, 5, 4, 2, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W4,
|
||||
LMS_PARAMS(3, 5, 4, 3, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L3_H5_W8 , "LMS/HSS_SHA256/192 L3_H5_W8" ,
|
||||
LMS_PARAMS(3, 5, 8, 3, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W8,
|
||||
LMS_PARAMS(3, 5, 8, 4, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W8,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#if LMS_MAX_HEIGHT >= 10
|
||||
{ WC_LMS_PARM_SHA256_192_L3_H10_W4, "LMS/HSS_SHA256/192 L3_H10_W4",
|
||||
LMS_PARAMS(3, 10, 4, 2, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W4,
|
||||
LMS_PARAMS(3, 10, 4, 3, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#endif
|
||||
#endif
|
||||
#if LMS_MAX_LEVELS >= 4
|
||||
{ WC_LMS_PARM_SHA256_192_L4_H5_W8 , "LMS/HSS_SHA256/192 L4_H5_W8" ,
|
||||
LMS_PARAMS(4, 5, 8, 3, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W8,
|
||||
LMS_PARAMS(4, 5, 8, 4, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W8,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#endif
|
||||
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H5_W1 , "LMS/HSS_SHA256/192_L1_H5_W1" ,
|
||||
LMS_PARAMS(1, 5, 1, 1, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W1,
|
||||
LMS_PARAMS(1, 5, 1, 2, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W1,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H5_W2 , "LMS/HSS_SHA256/192_L1_H5_W2" ,
|
||||
LMS_PARAMS(1, 5, 2, 1, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W2,
|
||||
LMS_PARAMS(1, 5, 2, 2, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W2,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H5_W4 , "LMS/HSS_SHA256/192_L1_H5_W4" ,
|
||||
LMS_PARAMS(1, 5, 4, 2, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W4,
|
||||
LMS_PARAMS(1, 5, 4, 3, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H5_W8 , "LMS/HSS_SHA256/192_L1_H5_W8" ,
|
||||
LMS_PARAMS(1, 5, 8, 3, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W8,
|
||||
LMS_PARAMS(1, 5, 8, 4, LMS_SHA256_M24_H5 , LMOTS_SHA256_N24_W8,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#if LMS_MAX_HEIGHT >= 10
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H10_W2 , "LMS/HSS_SHA256/192_L1_H10_W2",
|
||||
LMS_PARAMS(1, 10, 2, 1, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W2,
|
||||
LMS_PARAMS(1, 10, 2, 2, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W2,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H10_W4 , "LMS/HSS_SHA256/192_L1_H10_W4",
|
||||
LMS_PARAMS(1, 10, 4, 2, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W4,
|
||||
LMS_PARAMS(1, 10, 4, 3, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ WC_LMS_PARM_SHA256_192_L1_H10_W8 , "LMS/HSS_SHA256/192_L1_H10_W8",
|
||||
LMS_PARAMS(1, 10, 8, 3, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W8,
|
||||
LMS_PARAMS(1, 10, 8, 4, LMS_SHA256_M24_H10, LMOTS_SHA256_N24_W8,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#endif
|
||||
#if LMS_MAX_HEIGHT >= 20
|
||||
{ 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,
|
||||
LMS_PARAMS(1, 20, 2, 2, LMS_SHA256_M24_H20, LMOTS_SHA256_N24_W2,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ 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,
|
||||
LMS_PARAMS(1, 20, 4, 3, LMS_SHA256_M24_H20, LMOTS_SHA256_N24_W4,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
{ 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,
|
||||
LMS_PARAMS(1, 20, 8, 4, LMS_SHA256_M24_H20, LMOTS_SHA256_N24_W8,
|
||||
WC_SHA256_192_DIGEST_SIZE) },
|
||||
#endif
|
||||
#endif /* WOLFSSL_LMS_SHA256_192 */
|
||||
|
@ -47895,7 +47895,7 @@ static int lms_read_key_mem(byte * priv, word32 privSz, void *context)
|
||||
#ifndef WOLFSSL_NO_LMS_SHA256_256
|
||||
#define WC_TEST_LMS_SIG_LEN (8688)
|
||||
#else
|
||||
#define WC_TEST_LMS_SIG_LEN (4984)
|
||||
#define WC_TEST_LMS_SIG_LEN (4960)
|
||||
#endif
|
||||
|
||||
WOLFSSL_TEST_SUBROUTINE wc_test_ret_t lms_test(void)
|
||||
|
Reference in New Issue
Block a user