Extend Support of Sign-Iteration
(1, 5 and 10 iterations) for ML-DSA to include
ML-DSA65 and ML-DSA87 in test-crypto-perf.

Signed-off-by: Pratik Senapati <[email protected]>
---
 app/test-crypto-perf/cperf_options_parsing.c |   3 +-
 app/test-crypto-perf/cperf_test_vectors.c    | 170 ++++++++++++++++++-
 app/test-crypto-perf/main.c                  |  28 ++-
 doc/guides/tools/cryptoperf.rst              |   5 +-
 4 files changed, 185 insertions(+), 21 deletions(-)

diff --git a/app/test-crypto-perf/cperf_options_parsing.c 
b/app/test-crypto-perf/cperf_options_parsing.c
index 732d5fe4cb..9e2a71d8a7 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -1821,8 +1821,7 @@ cperf_options_dump(struct cperf_options *opts)
                case CPERF_ASYM_MLDSA65:
                case CPERF_ASYM_MLDSA87:
                        printf("# mldsa algorithm: %s\n", 
cperf_op_type_strs[opts->op_type]);
-                       if (opts->op_type == CPERF_ASYM_MLDSA44 &&
-                               opts->asym_op_type == RTE_CRYPTO_ASYM_OP_SIGN)
+                       if (opts->asym_op_type == RTE_CRYPTO_ASYM_OP_SIGN)
                                printf("# mldsa sign iterations: %u\n", 
opts->mldsa_sign_iter);
                        break;
                case CPERF_ASYM_MLKEM512:
diff --git a/app/test-crypto-perf/cperf_test_vectors.c 
b/app/test-crypto-perf/cperf_test_vectors.c
index 1ef6677440..e6055b2d50 100644
--- a/app/test-crypto-perf/cperf_test_vectors.c
+++ b/app/test-crypto-perf/cperf_test_vectors.c
@@ -8684,7 +8684,7 @@ uint8_t mldsa_65_pubkey_noseed[] = {
 };
 
 uint8_t mldsa_65_message[] = {
-       0x60, 0xD4, 0x8C, 0xF2, 0x61, 0x6D, 0xB0, 0xB6,
+       0x1C, 0x00, 0x00, 0x00, 0x61, 0x6D, 0xB0, 0xB6,
        0x0F, 0x54, 0x96, 0x5F, 0xDB, 0x21, 0x40, 0xB5,
        0x33, 0xA3, 0x85, 0xFE, 0xA3, 0xCC, 0x76, 0x5C,
        0x8C, 0xB0, 0xC0, 0x71, 0xE5, 0x6D, 0xFB, 0xDD,
@@ -10645,6 +10645,48 @@ uint8_t mldsa_87_sign_dtrm[] = {
        0x28, 0x30, 0x3C,
 };
 
+uint8_t mldsa_65_message_1_iter[] = {
+       0x13, 0xCD, 0x8C, 0x83, 0x61, 0x6D, 0xB0, 0xB6,
+       0x0F, 0x54, 0x96, 0x5F, 0xDB, 0x21, 0x40, 0xB5,
+       0x33, 0xA3, 0x85, 0xFE, 0xA3, 0xCC, 0x76, 0x5C,
+       0x8C, 0xB0, 0xC0, 0x71, 0xE5, 0x6D, 0xFB, 0xDD,
+};
+
+uint8_t mldsa_65_message_5_iter[] = {
+       0xE3, 0xB3, 0xF1, 0x9F, 0x61, 0x6D, 0xB0, 0xB6,
+       0x0F, 0x54, 0x96, 0x5F, 0xDB, 0x21, 0x40, 0xB5,
+       0x33, 0xA3, 0x85, 0xFE, 0xA3, 0xCC, 0x76, 0x5C,
+       0x8C, 0xB0, 0xC0, 0x71, 0xE5, 0x6D, 0xFB, 0xDD,
+};
+
+uint8_t mldsa_65_message_10_iter[] = {
+       0x83, 0x81, 0xBB, 0xD8, 0x61, 0x6D, 0xB0, 0xB6,
+       0x0F, 0x54, 0x96, 0x5F, 0xDB, 0x21, 0x40, 0xB5,
+       0x33, 0xA3, 0x85, 0xFE, 0xA3, 0xCC, 0x76, 0x5C,
+       0x8C, 0xB0, 0xC0, 0x71, 0xE5, 0x6D, 0xFB, 0xDD,
+};
+
+uint8_t mldsa_87_message_1_iter[] = {
+       0x80, 0x1B, 0x53, 0xC5, 0xF4, 0xB3, 0xD4, 0x7F,
+       0xD2, 0x7E, 0x02, 0xA5, 0x93, 0x80, 0x26, 0x90,
+       0xB6, 0xE9, 0xC3, 0xBC, 0xB0, 0xB9, 0x03, 0xC1,
+       0x36, 0xB4, 0x5B, 0xEF, 0xA5, 0x80, 0x50, 0xDD,
+};
+
+uint8_t mldsa_87_message_5_iter[] = {
+       0x50, 0x02, 0xB8, 0xE1, 0xF4, 0xB3, 0xD4, 0x7F,
+       0xD2, 0x7E, 0x02, 0xA5, 0x93, 0x80, 0x26, 0x90,
+       0xB6, 0xE9, 0xC3, 0xBC, 0xB0, 0xB9, 0x03, 0xC1,
+       0x36, 0xB4, 0x5B, 0xEF, 0xA5, 0x80, 0x50, 0xDD,
+};
+
+uint8_t mldsa_87_message_10_iter[] = {
+       0xD2, 0xAD, 0x0A, 0xE5, 0xF4, 0xB3, 0xD4, 0x7F,
+       0xD2, 0x7E, 0x02, 0xA5, 0x93, 0x80, 0x26, 0x90,
+       0xB6, 0xE9, 0xC3, 0xBC, 0xB0, 0xB9, 0x03, 0xC1,
+       0x36, 0xB4, 0x5B, 0xEF, 0xA5, 0x80, 0x50, 0xDD,
+};
+
 struct
 cperf_rsa_test_data rsa_qt_perf_data[4] = {
        {
@@ -11222,6 +11264,48 @@ struct cperf_mldsa_test_data 
mldsa_sign_perf_data_1_iter[] = {
                },
                .sign_deterministic = true,
        },
+       {
+               .name = "mldsa_65_sign_1_iteration (deterministic)",
+               .type = RTE_CRYPTO_ML_DSA_65,
+               .privkey = {
+                       .data = mldsa_65_privkey_noseed,
+                       .length = sizeof(mldsa_65_privkey_noseed),
+               },
+               .pubkey = {
+                       .data = mldsa_65_pubkey_noseed,
+                       .length = sizeof(mldsa_65_pubkey_noseed),
+               },
+               .message = {
+                       .data = mldsa_65_message_1_iter,
+                       .length = sizeof(mldsa_65_message_1_iter),
+               },
+               .sign = {
+                       .data = mldsa_65_sign_dtrm,
+                       .length = sizeof(mldsa_65_sign_dtrm),
+               },
+               .sign_deterministic = true,
+       },
+       {
+               .name = "mldsa_87_sign_1_iteration (deterministic)",
+               .type = RTE_CRYPTO_ML_DSA_87,
+               .privkey = {
+                       .data = mldsa_87_privkey_noseed,
+                       .length = sizeof(mldsa_87_privkey_noseed),
+               },
+               .pubkey = {
+                       .data = mldsa_87_pubkey_noseed,
+                       .length = sizeof(mldsa_87_pubkey_noseed),
+               },
+               .message = {
+                       .data = mldsa_87_message_1_iter,
+                       .length = sizeof(mldsa_87_message_1_iter),
+               },
+               .sign = {
+                       .data = mldsa_87_sign_dtrm,
+                       .length = sizeof(mldsa_87_sign_dtrm),
+               },
+               .sign_deterministic = true,
+       },
 };
 
 struct cperf_mldsa_test_data mldsa_sign_perf_data_5_iter[] = {
@@ -11246,6 +11330,48 @@ struct cperf_mldsa_test_data 
mldsa_sign_perf_data_5_iter[] = {
                },
                .sign_deterministic = true,
        },
+       {
+               .name = "mldsa_65_sign_5_iterations (deterministic)",
+               .type = RTE_CRYPTO_ML_DSA_65,
+               .privkey = {
+                       .data = mldsa_65_privkey_noseed,
+                       .length = sizeof(mldsa_65_privkey_noseed),
+               },
+               .pubkey = {
+                       .data = mldsa_65_pubkey_noseed,
+                       .length = sizeof(mldsa_65_pubkey_noseed),
+               },
+               .message = {
+                       .data = mldsa_65_message_5_iter,
+                       .length = sizeof(mldsa_65_message_5_iter),
+               },
+               .sign = {
+                       .data = mldsa_65_sign_dtrm,
+                       .length = sizeof(mldsa_65_sign_dtrm),
+               },
+               .sign_deterministic = true,
+       },
+       {
+               .name = "mldsa_87_sign_5_iterations (deterministic)",
+               .type = RTE_CRYPTO_ML_DSA_87,
+               .privkey = {
+                       .data = mldsa_87_privkey_noseed,
+                       .length = sizeof(mldsa_87_privkey_noseed),
+               },
+               .pubkey = {
+                       .data = mldsa_87_pubkey_noseed,
+                       .length = sizeof(mldsa_87_pubkey_noseed),
+               },
+               .message = {
+                       .data = mldsa_87_message_5_iter,
+                       .length = sizeof(mldsa_87_message_5_iter),
+               },
+               .sign = {
+                       .data = mldsa_87_sign_dtrm,
+                       .length = sizeof(mldsa_87_sign_dtrm),
+               },
+               .sign_deterministic = true,
+       },
 };
 
 struct cperf_mldsa_test_data mldsa_sign_perf_data_10_iter[] = {
@@ -11270,6 +11396,48 @@ struct cperf_mldsa_test_data 
mldsa_sign_perf_data_10_iter[] = {
                },
                .sign_deterministic = true,
        },
+       {
+               .name = "mldsa_65_sign_10_iterations (deterministic)",
+               .type = RTE_CRYPTO_ML_DSA_65,
+               .privkey = {
+                       .data = mldsa_65_privkey_noseed,
+                       .length = sizeof(mldsa_65_privkey_noseed),
+               },
+               .pubkey = {
+                       .data = mldsa_65_pubkey_noseed,
+                       .length = sizeof(mldsa_65_pubkey_noseed),
+               },
+               .message = {
+                       .data = mldsa_65_message_10_iter,
+                       .length = sizeof(mldsa_65_message_10_iter),
+               },
+               .sign = {
+                       .data = mldsa_65_sign_dtrm,
+                       .length = sizeof(mldsa_65_sign_dtrm),
+               },
+               .sign_deterministic = true,
+       },
+       {
+               .name = "mldsa_87_sign_10_iterations (deterministic)",
+               .type = RTE_CRYPTO_ML_DSA_87,
+               .privkey = {
+                       .data = mldsa_87_privkey_noseed,
+                       .length = sizeof(mldsa_87_privkey_noseed),
+               },
+               .pubkey = {
+                       .data = mldsa_87_pubkey_noseed,
+                       .length = sizeof(mldsa_87_pubkey_noseed),
+               },
+               .message = {
+                       .data = mldsa_87_message_10_iter,
+                       .length = sizeof(mldsa_87_message_10_iter),
+               },
+               .sign = {
+                       .data = mldsa_87_sign_dtrm,
+                       .length = sizeof(mldsa_87_sign_dtrm),
+               },
+               .sign_deterministic = true,
+       },
 };
 
 struct cperf_test_vector*
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 85e145165f..dc781bb9cc 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -544,23 +544,19 @@ cperf_verify_devices_capabilities(struct cperf_options 
*opts,
                                mldsa_idx = 2;
 
                        if (opts->asym_op_type == RTE_CRYPTO_ASYM_OP_SIGN) {
-                               if (opts->op_type == CPERF_ASYM_MLDSA44) {
-                                       switch (opts->mldsa_sign_iter) {
-                                       case 1:
-                                               opts->mldsa_data = 
&mldsa_sign_perf_data_1_iter[0];
-                                               break;
-                                       case 5:
-                                               opts->mldsa_data = 
&mldsa_sign_perf_data_5_iter[0];
-                                               break;
-                                       case 10:
-                                               opts->mldsa_data = 
&mldsa_sign_perf_data_10_iter[0];
-                                               break;
-                                       default:
-                                               opts->mldsa_data = 
&mldsa_sign_perf_data[0];
-                                               break;
-                                       }
-                               } else {
+                               switch (opts->mldsa_sign_iter) {
+                               case 1:
+                                       opts->mldsa_data = 
&mldsa_sign_perf_data_1_iter[mldsa_idx];
+                                       break;
+                               case 5:
+                                       opts->mldsa_data = 
&mldsa_sign_perf_data_5_iter[mldsa_idx];
+                                       break;
+                               case 10:
+                                       opts->mldsa_data = 
&mldsa_sign_perf_data_10_iter[mldsa_idx];
+                                       break;
+                               default:
                                        opts->mldsa_data = 
&mldsa_sign_perf_data[mldsa_idx];
+                                       break;
                                }
                        } else if (opts->asym_op_type == 
RTE_CRYPTO_ASYM_OP_VERIFY) {
                                opts->mldsa_data = 
&mldsa_verify_perf_data[mldsa_idx];
diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst
index f88d810385..bf93263b70 100644
--- a/doc/guides/tools/cryptoperf.rst
+++ b/doc/guides/tools/cryptoperf.rst
@@ -367,10 +367,11 @@ The following are the application command-line options:
 
 * ``--mldsa-sign-iter <1/5/10>``
 
-        Set ML-DSA sign iteration count for mldsa_44 sign operation.
+        Set ML-DSA sign iteration count for mldsa sign operation.
         Default is ``1``.
         Only applicable when:
-        ``--optype mldsa_44`` and ``--asym-op sign``.
+        ``--optype mldsa_44``, ``--optype mldsa_65``, ``--optype mldsa_87``
+        and ``--asym-op sign``.
 
 * ``--rsa-priv-keytype <exp/qt>``
 
-- 
2.43.0

Reply via email to