[PATCH] examples/fips_validation: fix coverity issues
Fix NULL dereference, out-of-bound, bad bit shift issues
reported by coverity scan.
Coverity issue: 384440, 384435, 384433, 384429
Fixes: 36128a67c27 ("examples/fips_validation: add asymmetric validation")
Cc: sta...@dpdk.org
Signed-off-by: Gowrishankar Muthukrishnan
---
examples/fips_validation/fips_validation_rsa.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/examples/fips_validation/fips_validation_rsa.c
b/examples/fips_validation/fips_validation_rsa.c
index f675b51051..55f81860a0 100644
--- a/examples/fips_validation/fips_validation_rsa.c
+++ b/examples/fips_validation/fips_validation_rsa.c
@@ -328,6 +328,9 @@ parse_test_rsa_json_interim_writeback(struct fips_val *val)
if (prepare_vec_rsa() < 0)
return -1;
+ if (!vec.rsa.e.val)
+ return -1;
+
writeback_hex_str("", info.one_line_text, &vec.rsa.n);
obj = json_string(info.one_line_text);
json_object_set_new(json_info.json_write_group, "n", obj);
@@ -474,7 +477,7 @@ fips_test_randomize_message(struct fips_val *msg, struct
fips_val *rand)
uint16_t rv_len;
if (!msg->val || !rand->val || rand->len > RV_BUF_LEN
- || msg->len > FIPS_TEST_JSON_BUF_LEN)
+ || msg->len > (FIPS_TEST_JSON_BUF_LEN - 1))
return -EINVAL;
memset(rv, 0, sizeof(rv));
@@ -503,7 +506,7 @@ fips_test_randomize_message(struct fips_val *msg, struct
fips_val *rand)
m[i + j] ^= rv[j];
m[i + j] = ((uint8_t *)&rv_bitlen)[0];
- m[i + j + 1] = (((uint8_t *)&rv_bitlen)[1] >> 8) & 0xFF;
+ m[i + j + 1] = ((uint8_t *)&rv_bitlen)[1];
rte_free(msg->val);
msg->len = (rv_bitlen + m_bitlen + 16) / 8;
--
2.25.1
[PATCH] crypto/cnxk: fix coverity issues
Fix out-of-bound issues reported by coverity scan.
Coverity issue: 403164, 403165, 403166, 403167, 403169, 403170, 403171,
403172, 403173, 403174, 403176, 403178, 403179, 403180
Fixes: 5686b573e4b ("crypto/cnxk: support SM2")
Fixes: badc0c6f6d6 ("cryptodev: set private and public keys in EC session")
Cc: sta...@dpdk.org
Signed-off-by: Gowrishankar Muthukrishnan
---
drivers/common/cnxk/roc_ae.h | 16 +---
drivers/crypto/cnxk/cnxk_ae.h | 24 +++-
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/drivers/common/cnxk/roc_ae.h b/drivers/common/cnxk/roc_ae.h
index a9a08d9fb9..7886b9d107 100644
--- a/drivers/common/cnxk/roc_ae.h
+++ b/drivers/common/cnxk/roc_ae.h
@@ -53,29 +53,31 @@ typedef enum {
ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE = 0x11
} roc_ae_error_code;
+#define ROC_AE_EC_DATA_MAX 66
+
/* Prime and order fields of built-in elliptic curves */
struct roc_ae_ec_group {
struct {
/* P521 maximum length */
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} prime;
struct {
/* P521 maximum length */
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} order;
struct {
/* P521 maximum length */
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} consta;
struct {
/* P521 maximum length */
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} constb;
};
@@ -86,18 +88,18 @@ struct roc_ae_ec_ctx {
/* Private key */
struct {
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} pkey;
/* Public key */
struct {
struct {
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} x;
struct {
- uint8_t data[66];
+ uint8_t data[ROC_AE_EC_DATA_MAX];
unsigned int length;
} y;
} q;
diff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h
index ea11e093bf..a843d6b5ef 100644
--- a/drivers/crypto/cnxk/cnxk_ae.h
+++ b/drivers/crypto/cnxk/cnxk_ae.h
@@ -205,16 +205,22 @@ cnxk_ae_fill_ec_params(struct cnxk_ae_sess *sess,
return 0;
ec->pkey.length = xform->ec.pkey.length;
- if (xform->ec.pkey.length)
- rte_memcpy(ec->pkey.data, xform->ec.pkey.data,
xform->ec.pkey.length);
+ if (ec->pkey.length > ROC_AE_EC_DATA_MAX)
+ ec->pkey.length = ROC_AE_EC_DATA_MAX;
+ if (ec->pkey.length)
+ rte_memcpy(ec->pkey.data, xform->ec.pkey.data, ec->pkey.length);
ec->q.x.length = xform->ec.q.x.length;
- if (xform->ec.q.x.length)
- rte_memcpy(ec->q.x.data, xform->ec.q.x.data,
xform->ec.q.x.length);
+ if (ec->q.x.length > ROC_AE_EC_DATA_MAX)
+ ec->q.x.length = ROC_AE_EC_DATA_MAX;
+ if (ec->q.x.length)
+ rte_memcpy(ec->q.x.data, xform->ec.q.x.data, ec->q.x.length);
ec->q.y.length = xform->ec.q.y.length;
+ if (ec->q.y.length > ROC_AE_EC_DATA_MAX)
+ ec->q.y.length = ROC_AE_EC_DATA_MAX;
if (xform->ec.q.y.length)
- rte_memcpy(ec->q.y.data, xform->ec.q.y.data,
xform->ec.q.y.length);
+ rte_memcpy(ec->q.y.data, xform->ec.q.y.data, ec->q.y.length);
return 0;
}
@@ -735,7 +741,11 @@ cnxk_ae_sm2_sign_prep(struct rte_crypto_sm2_op_param *sm2,
uint8_t *dptr;
prime_len = ec_grp->prime.length;
+ if (prime_len > ROC_AE_EC_DATA_MAX)
+ prime_len = ROC_AE_EC_DATA_MAX;
order_len = ec_grp->order.length;
+ if (order_len > ROC_AE_EC_DATA_MAX)
+ order_len = ROC_AE_EC_DATA_MAX;
/* Truncate input length to curve prime length */
if (message_len > prime_len)
@@ -822,7 +832,11 @@ cnxk_ae_sm2_verify_prep(struct rte_crypto_sm2_op_param
*sm2,
uint8_t *dptr;
prime_len = ec_grp->prime.length;
+ if (prime_len > ROC_AE_EC_DATA_MAX)
+ prime_len = ROC_AE_EC_DATA_MAX;
order_len = ec_grp->order.length;
+ if (order_len > ROC_AE_EC_DATA_MAX)
+ order_len = ROC_AE_EC_DATA_MAX;
/* Truncate input length to curve prime length */
if (message_len > prime_len)
--
2.25.1
[PATCH] crypto/cnxk: fix ECDH pubkey verify
Fix dequeue operation for ECDH pubkey verify.
Fixes: baae0994fa96 ("crypto/cnxk: support ECDH")
Fixes: 5c9025583167 ("crypto/cnxk: fix CN9K ECDH public key verification")
Cc: sta...@dpdk.org
Signed-off-by: Gowrishankar Muthukrishnan
---
drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 23 ++-
drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 21 +
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
index 720b756001..07bd13b16d 100644
--- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
@@ -1186,15 +1186,20 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp,
struct rte_crypto_op *cop
return;
} else if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC &&
- cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION &&
- cop->asym->ecdh.ke_type ==
RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) {
- if (likely(compcode == CPT_COMP_GOOD)) {
- if (uc_compcode == ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) {
- cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
- return;
- } else if (uc_compcode == ROC_AE_ERR_ECC_PAI) {
- cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
- return;
+ cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
+ struct cnxk_ae_sess *sess;
+
+ sess = (struct cnxk_ae_sess *)cop->asym->session;
+ if (sess->xfrm_type == RTE_CRYPTO_ASYM_XFORM_ECDH &&
+ cop->asym->ecdh.ke_type ==
RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) {
+ if (likely(compcode == CPT_COMP_GOOD)) {
+ if (uc_compcode ==
ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) {
+ cop->status =
RTE_CRYPTO_OP_STATUS_ERROR;
+ return;
+ } else if (uc_compcode == ROC_AE_ERR_ECC_PAI) {
+ cop->status =
RTE_CRYPTO_OP_STATUS_SUCCESS;
+ return;
+ }
}
}
}
diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c
b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c
index 96a75a7797..f443cb9563 100644
--- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c
@@ -523,14 +523,19 @@ cn9k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp,
struct rte_crypto_op *cop,
if (res->uc_compcode == ROC_SE_ERR_GC_ICV_MISCOMPARE)
cop->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
else if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC &&
-cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION &&
-cop->asym->ecdh.ke_type ==
RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) {
- if (res->uc_compcode ==
ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) {
- cop->status =
RTE_CRYPTO_OP_STATUS_ERROR;
- return;
- } else if (res->uc_compcode ==
ROC_AE_ERR_ECC_PAI) {
- cop->status =
RTE_CRYPTO_OP_STATUS_SUCCESS;
- return;
+cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
+ struct cnxk_ae_sess *sess;
+
+ sess = (struct cnxk_ae_sess
*)cop->asym->session;
+ if (sess->xfrm_type ==
RTE_CRYPTO_ASYM_XFORM_ECDH &&
+ cop->asym->ecdh.ke_type ==
RTE_CRYPTO_ASYM_KE_PUB_KEY_VERIFY) {
+ if (res->uc_compcode ==
ROC_AE_ERR_ECC_POINT_NOT_ON_CURVE) {
+ cop->status =
RTE_CRYPTO_OP_STATUS_ERROR;
+ return;
+ } else if (res->uc_compcode ==
ROC_AE_ERR_ECC_PAI) {
+ cop->status =
RTE_CRYPTO_OP_STATUS_SUCCESS;
+ return;
+ }
}
} else
cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
--
2.25.1
Re: [PATCH] event: fix warning from useless snprintf
24/04/2024 21:10, Stephen Hemminger: > On Wed, 24 Apr 2024 17:12:39 + > "Van Haaren, Harry" wrote: > > From: Stephen Hemminger > > > "Van Haaren, Harry" wrote: > > > > > From: Stephen Hemminger > > > > > > > > > > With Gcc-14, this warning is generated: > > > > > ../drivers/event/sw/sw_evdev.c:263:3: warning: 'snprintf' will always > > > > > be truncated; > > > > > specified size is 12, but format string expands to at least 13 > > > > > [-Wformat-truncation] > > > > > 263 | snprintf(buf, sizeof(buf), "sw%d_iq_%d_rob", > > > > > dev_id, i); > > > > > | ^ > > > > > > > > > > Yet the whole printf to the buf is unnecessary. The type string > > > > > argument > > > > > has never been implemented, and should just be NULL. Removing the > > > > > unnecessary snprintf, then means IQ_ROB_NAMESIZE can be removed. > > > > > > > > I understand that today the "type" value isn't implemented, but across > > > > the DPDK codebase it > > > > seems like others are filling in "type" to be some debug-useful > > > > name/string. If it was added > > > > in future it'd be nice to have the ROB/IQ memory identified by name, > > > > like the rest of DPDK components. > > > > > > No, don't bother. This is a case of > > > https://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it > > > > I agree that YAGNI perhaps applied when designing the APIs, but the "type" > > parameter is there now... > > Should we add a guidance of "when reworking code, always pass NULL as the > > type parameter to rte_malloc functions" somewhere in the programmers guide, > > to align community with this "pass NULL for type" initiative? > > > > > > > > Acked-by: Harry van Haaren > > > > Did look into Mi-Malloc https://github.com/microsoft/mimalloc > it is fast and more complete and good work with huge pages. > The way to handle tagging allocations having the library automatically handle > it > based on the place allocation is called from. Having user do it is not that > helpful. But today we have rte_malloc. And the type is used in tracing. I think having a meaningful name from the caller is not a bad idea.
[PATCH v1 0/6] app/crypto-perf: add asymmetric crypto tests
This patch series adds below asymmetric tests in crypto-perf tool: * MODEX group tests (RFC 3526) * SM2 tests * ECDSA P256R1 tests Akhil Goyal (1): app/crypto-perf: support SM2 Gowrishankar Muthukrishnan (5): app/crypto-perf: add modex groups test app/crypto-perf: remove redundant local varriable app/crypto-perf: fix result location for asymmetric test app/crypto-perf: add function to check asymmetric operation app/crypto-perf: support ECDSA app/test-crypto-perf/cperf_ops.c | 135 +++- app/test-crypto-perf/cperf_options.h | 8 + app/test-crypto-perf/cperf_options_parsing.c | 61 +- app/test-crypto-perf/cperf_test_common.c | 19 +- app/test-crypto-perf/cperf_test_common.h | 2 + app/test-crypto-perf/cperf_test_latency.c| 21 +- app/test-crypto-perf/cperf_test_throughput.c | 2 +- app/test-crypto-perf/cperf_test_vectors.c| 773 ++- app/test-crypto-perf/cperf_test_vectors.h| 41 +- app/test-crypto-perf/cperf_test_verify.c | 2 +- app/test-crypto-perf/main.c | 87 ++- doc/guides/tools/cryptoperf.rst | 7 + 12 files changed, 1131 insertions(+), 27 deletions(-) -- 2.25.1
[PATCH v1 1/6] app/crypto-perf: add modex groups test
Add perf tests for modex groups 5, 14, 15, 16, 17 and 18
based on RFC 3526.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test-crypto-perf/cperf_test_vectors.c | 570 +-
app/test-crypto-perf/cperf_test_vectors.h | 4 +-
2 files changed, 571 insertions(+), 3 deletions(-)
diff --git a/app/test-crypto-perf/cperf_test_vectors.c
b/app/test-crypto-perf/cperf_test_vectors.c
index 3c35eea460..de43d303a5 100644
--- a/app/test-crypto-perf/cperf_test_vectors.c
+++ b/app/test-crypto-perf/cperf_test_vectors.c
@@ -8,7 +8,7 @@
#include "cperf_test_vectors.h"
struct
-cperf_modex_test_data modex_perf_data[4] = {
+cperf_modex_test_data modex_perf_data[10] = {
{
.base = {
.data = {
@@ -233,6 +233,574 @@ cperf_modex_test_data modex_perf_data[4] = {
.result = {
.len = 448
}
+ },
+ {
+ .base = {
+ .data = {
+ 0x02,
+ },
+ .len = 1
+ },
+ .exponent = {
+ .data = {
+0x6C, 0x80, 0xFF, 0x29, 0xF9, 0x27, 0x2E, 0x6D,
+0xE1, 0xB7, 0x3F, 0x13, 0x77, 0xD2, 0x3E, 0x49,
+0xCE, 0xAE, 0xBD, 0x73, 0x7A, 0x0F, 0xE7, 0xA4,
+0x20, 0x49, 0x72, 0x87, 0x4E, 0x1B
+ },
+ .len = 30
+ },
+ .modulus = {
+ .data = {
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34,
+ 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
+ 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74,
+ 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22,
+ 0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
+ 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B,
+ 0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37,
+ 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
+ 0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6,
+ 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED, 0x6B,
+ 0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
+ 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5,
+ 0xAE, 0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6,
+ 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
+ 0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05,
+ 0x98, 0xDA, 0x48, 0x36, 0x1C, 0x55, 0xD3, 0x9A,
+ 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F,
+ 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3, 0xAD, 0x96,
+ 0x1C, 0x62, 0xF3, 0x56, 0x20, 0x85, 0x52, 0xBB,
+ 0x9E, 0xD5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6D,
+ 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04,
+ 0xF1, 0x74, 0x6C, 0x08, 0xCA, 0x23, 0x73, 0x27,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+ },
+ .len = 192
+ },
+ .result = {
+ .len = 192
+ }
+ },
+ {
+ .base = {
+ .data = {
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ },
+ .len = 64
+ },
+ .exponent = {
+ .data = {
+ 0x8E, 0x4E, 0x41, 0xA2, 0xE0, 0x59, 0xA8, 0x29,
+ 0x71, 0xF6, 0x21, 0xC9, 0xD5, 0x0E, 0x36, 0x0F,
+ 0x59, 0xD6, 0x74, 0x4C, 0x3A, 0xC7, 0x13, 0x5E,
+ 0x7D, 0x2D, 0x43, 0x63, 0x5A, 0x3D, 0xCA, 0x5F,
+ 0xF7, 0xB2, 0x3D, 0x9C, 0x3F, 0xA1, 0x5D, 0x71
+ },
+
[PATCH v1 2/6] app/crypto-perf: remove redundant local varriable
Remove redundant local variable used for asym session.
Fixes: a29bb248988 ("cryptodev: hide asymmetric session structure")
Fixes: 2973dbf93b4 ("security: hide session structure")
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test-crypto-perf/cperf_ops.c | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index 4ca001b721..a802281a71 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -21,7 +21,6 @@ cperf_set_ops_asym(struct rte_crypto_op **ops,
uint64_t *tsc_start __rte_unused)
{
uint16_t i;
- void *asym_sess = (void *)sess;
for (i = 0; i < nb_ops; i++) {
struct rte_crypto_asym_op *asym_op = ops[i]->asym;
@@ -31,7 +30,7 @@ cperf_set_ops_asym(struct rte_crypto_op **ops,
asym_op->modex.base.length = options->modex_data->base.len;
asym_op->modex.result.data = options->modex_data->result.data;
asym_op->modex.result.length = options->modex_data->result.len;
- rte_crypto_op_attach_asym_session(ops[i], asym_sess);
+ rte_crypto_op_attach_asym_session(ops[i], sess);
}
}
@@ -62,7 +61,6 @@ cperf_set_ops_security(struct rte_crypto_op **ops,
for (i = 0; i < nb_ops; i++) {
struct rte_crypto_sym_op *sym_op = ops[i]->sym;
- void *sec_sess = (void *)sess;
uint32_t buf_sz;
uint32_t *per_pkt_hfn = rte_crypto_op_ctod_offset(ops[i],
@@ -70,7 +68,7 @@ cperf_set_ops_security(struct rte_crypto_op **ops,
*per_pkt_hfn = options->pdcp_ses_hfn_en ? 0 : PDCP_DEFAULT_HFN;
ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
- rte_security_attach_session(ops[i], sec_sess);
+ rte_security_attach_session(ops[i], sess);
sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
src_buf_offset);
@@ -127,7 +125,6 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops,
uint16_t iv_offset __rte_unused, uint32_t *imix_idx,
uint64_t *tsc_start)
{
- void *sec_sess = sess;
const uint32_t test_buffer_size = options->test_buffer_size;
uint64_t tsc_start_temp, tsc_end_temp;
uint16_t i = 0;
@@ -140,7 +137,7 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops,
uint32_t offset = test_buffer_size;
ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
- rte_security_attach_session(ops[i], sec_sess);
+ rte_security_attach_session(ops[i], sess);
sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
src_buf_offset);
sym_op->m_src->pkt_len = test_buffer_size;
--
2.25.1
[PATCH v1 3/6] app/crypto-perf: fix result location for asymmetric test
For asymmetric op, private test data should be stored after
rte_crypto_asym_op struct.
Fixes: a538d1d2d01e ("test/crypto-perf: extend asymmetric crypto throughput
test")
Cc: sta...@dpdk.org
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test-crypto-perf/cperf_test_common.c | 6 --
app/test-crypto-perf/cperf_test_latency.c | 14 +++---
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/app/test-crypto-perf/cperf_test_common.c
b/app/test-crypto-perf/cperf_test_common.c
index 94d39fb177..6b8ab65731 100644
--- a/app/test-crypto-perf/cperf_test_common.c
+++ b/app/test-crypto-perf/cperf_test_common.c
@@ -149,11 +149,11 @@ cperf_alloc_common_memory(const struct cperf_options
*options,
int ret;
/* Calculate the object size */
- uint16_t crypto_op_size = sizeof(struct rte_crypto_op) +
- sizeof(struct rte_crypto_sym_op);
+ uint16_t crypto_op_size = sizeof(struct rte_crypto_op);
uint16_t crypto_op_private_size;
if (options->op_type == CPERF_ASYM_MODEX) {
+ crypto_op_size += sizeof(struct rte_crypto_asym_op);
snprintf(pool_name, RTE_MEMPOOL_NAMESIZE, "perf_asym_op_pool%u",
rte_socket_id());
*pool = rte_crypto_op_pool_create(
@@ -170,6 +170,8 @@ cperf_alloc_common_memory(const struct cperf_options
*options,
return 0;
}
+ crypto_op_size += sizeof(struct rte_crypto_sym_op);
+
/*
* If doing AES-CCM, IV field needs to be 16 bytes long,
* and AAD field needs to be long enough to have 18 bytes,
diff --git a/app/test-crypto-perf/cperf_test_latency.c
b/app/test-crypto-perf/cperf_test_latency.c
index b8ad6bf4d4..376847e761 100644
--- a/app/test-crypto-perf/cperf_test_latency.c
+++ b/app/test-crypto-perf/cperf_test_latency.c
@@ -122,7 +122,11 @@ store_timestamp(struct rte_crypto_op *op, uint64_t
timestamp)
{
struct priv_op_data *priv_data;
- priv_data = (struct priv_op_data *) (op->sym + 1);
+ if (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC)
+ priv_data = (struct priv_op_data *) (op->sym + 1);
+ else
+ priv_data = (struct priv_op_data *) (op->asym + 1);
+
priv_data->result->status = op->status;
priv_data->result->tsc_end = timestamp;
}
@@ -251,9 +255,13 @@ cperf_latency_test_runner(void *arg)
ctx->res[tsc_idx].tsc_start = tsc_start;
/*
* Private data structure starts after the end
of the
-* rte_crypto_sym_op structure.
+* rte_crypto_sym_op (or rte_crypto_asym_op)
structure.
*/
- priv_data = (struct priv_op_data *)
(ops[i]->sym + 1);
+ if (ops[i]->type ==
RTE_CRYPTO_OP_TYPE_SYMMETRIC)
+ priv_data = (struct priv_op_data *)
(ops[i]->sym + 1);
+ else
+ priv_data = (struct priv_op_data *)
(ops[i]->asym + 1);
+
priv_data->result = (void *)&ctx->res[tsc_idx];
tsc_idx++;
}
--
2.25.1
[PATCH v1 4/6] app/crypto-perf: add function to check asymmetric operation
Replace checking input option for every asymmetric test case by
a function.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test-crypto-perf/cperf_test_common.c | 12 +++-
app/test-crypto-perf/cperf_test_common.h | 2 ++
app/test-crypto-perf/cperf_test_latency.c| 7 ---
app/test-crypto-perf/cperf_test_throughput.c | 2 +-
app/test-crypto-perf/cperf_test_verify.c | 2 +-
app/test-crypto-perf/main.c | 8
6 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/app/test-crypto-perf/cperf_test_common.c
b/app/test-crypto-perf/cperf_test_common.c
index 6b8ab65731..14ca9e964a 100644
--- a/app/test-crypto-perf/cperf_test_common.c
+++ b/app/test-crypto-perf/cperf_test_common.c
@@ -152,7 +152,7 @@ cperf_alloc_common_memory(const struct cperf_options
*options,
uint16_t crypto_op_size = sizeof(struct rte_crypto_op);
uint16_t crypto_op_private_size;
- if (options->op_type == CPERF_ASYM_MODEX) {
+ if (cperf_is_asym_test(options)) {
crypto_op_size += sizeof(struct rte_crypto_asym_op);
snprintf(pool_name, RTE_MEMPOOL_NAMESIZE, "perf_asym_op_pool%u",
rte_socket_id());
@@ -301,3 +301,13 @@ cperf_mbuf_set(struct rte_mbuf *mbuf,
mbuf = mbuf->next;
}
}
+
+bool
+cperf_is_asym_test(const struct cperf_options *options)
+{
+ if (options->op_type == CPERF_ASYM_MODEX ||
+ options->op_type == CPERF_ASYM_SM2)
+ return true;
+
+ return false;
+}
diff --git a/app/test-crypto-perf/cperf_test_common.h
b/app/test-crypto-perf/cperf_test_common.h
index a603a607d5..2d1f69aaa2 100644
--- a/app/test-crypto-perf/cperf_test_common.h
+++ b/app/test-crypto-perf/cperf_test_common.h
@@ -26,4 +26,6 @@ cperf_mbuf_set(struct rte_mbuf *mbuf,
const struct cperf_options *options,
const struct cperf_test_vector *test_vector);
+bool
+cperf_is_asym_test(const struct cperf_options *options);
#endif /* _CPERF_TEST_COMMON_H_ */
diff --git a/app/test-crypto-perf/cperf_test_latency.c
b/app/test-crypto-perf/cperf_test_latency.c
index 376847e761..201815b469 100644
--- a/app/test-crypto-perf/cperf_test_latency.c
+++ b/app/test-crypto-perf/cperf_test_latency.c
@@ -47,7 +47,7 @@ cperf_latency_test_free(struct cperf_latency_ctx *ctx)
return;
if (ctx->sess != NULL) {
- if (ctx->options->op_type == CPERF_ASYM_MODEX)
+ if (cperf_is_asym_test(ctx->options))
rte_cryptodev_asym_session_free(ctx->dev_id, ctx->sess);
#ifdef RTE_LIB_SECURITY
else if (ctx->options->op_type == CPERF_PDCP ||
@@ -217,8 +217,9 @@ cperf_latency_test_runner(void *arg)
&imix_idx, &tsc_start);
/* Populate the mbuf with the test vector */
- for (i = 0; i < burst_size; i++)
- cperf_mbuf_set(ops[i]->sym->m_src,
+ if (!cperf_is_asym_test(ctx->options))
+ for (i = 0; i < burst_size; i++)
+ cperf_mbuf_set(ops[i]->sym->m_src,
ctx->options,
ctx->test_vector);
diff --git a/app/test-crypto-perf/cperf_test_throughput.c
b/app/test-crypto-perf/cperf_test_throughput.c
index c0891e7c99..7112b95529 100644
--- a/app/test-crypto-perf/cperf_test_throughput.c
+++ b/app/test-crypto-perf/cperf_test_throughput.c
@@ -37,7 +37,7 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
if (!ctx)
return;
if (ctx->sess) {
- if (ctx->options->op_type == CPERF_ASYM_MODEX)
+ if (cperf_is_asym_test(ctx->options))
rte_cryptodev_asym_session_free(ctx->dev_id,
(void *)ctx->sess);
#ifdef RTE_LIB_SECURITY
diff --git a/app/test-crypto-perf/cperf_test_verify.c
b/app/test-crypto-perf/cperf_test_verify.c
index 222c7a1cd8..91429841ca 100644
--- a/app/test-crypto-perf/cperf_test_verify.c
+++ b/app/test-crypto-perf/cperf_test_verify.c
@@ -42,7 +42,7 @@ cperf_verify_test_free(struct cperf_verify_ctx *ctx)
return;
if (ctx->sess != NULL) {
- if (ctx->options->op_type == CPERF_ASYM_MODEX)
+ if (cperf_is_asym_test(ctx->options))
rte_cryptodev_asym_session_free(ctx->dev_id, ctx->sess);
#ifdef RTE_LIB_SECURITY
else if (ctx->options->op_type == CPERF_PDCP ||
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 40c0b4b54f..780f22f399 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -18,6 +18,7 @@
#include "cperf.h"
#include "cperf_options.h"
#include "cperf_test_vector_parsing.h"
+#include "cperf_test_common.h"
#include "cperf_t
[PATCH v1 5/6] app/crypto-perf: support SM2
From: Akhil Goyal
Added support for SM2 asymmetric crypto performance.
A new command line option is added to specify
asymmetric operation type `--asym-op Type`.
Type can be sign/verify/encrypt/decrypt.
Example command:
./dpdk-test-crypto-perf --vdev crypto_openssl -c 0x30 -- \
--devtype crypto_openssl --ptest throughput --optype sm2 \
--total-ops 1 --asym-op sign
Signed-off-by: Akhil Goyal
---
app/test-crypto-perf/cperf_ops.c | 69 ++-
app/test-crypto-perf/cperf_options.h | 6 +
app/test-crypto-perf/cperf_options_parsing.c | 55 -
app/test-crypto-perf/cperf_test_vectors.c| 120 +++
app/test-crypto-perf/cperf_test_vectors.h| 25
app/test-crypto-perf/main.c | 61 ++
doc/guides/tools/cryptoperf.rst | 6 +
7 files changed, 339 insertions(+), 3 deletions(-)
diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index a802281a71..f0860a46c0 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -10,7 +10,7 @@
#include "cperf_test_vectors.h"
static void
-cperf_set_ops_asym(struct rte_crypto_op **ops,
+cperf_set_ops_asym_modex(struct rte_crypto_op **ops,
uint32_t src_buf_offset __rte_unused,
uint32_t dst_buf_offset __rte_unused, uint16_t nb_ops,
void *sess,
@@ -34,6 +34,47 @@ cperf_set_ops_asym(struct rte_crypto_op **ops,
}
}
+static void
+cperf_set_ops_asym_sm2(struct rte_crypto_op **ops,
+ uint32_t src_buf_offset __rte_unused,
+ uint32_t dst_buf_offset __rte_unused, uint16_t nb_ops,
+ void *sess,
+ const struct cperf_options *options,
+ const struct cperf_test_vector *test_vector __rte_unused,
+ uint16_t iv_offset __rte_unused,
+ uint32_t *imix_idx __rte_unused,
+ uint64_t *tsc_start __rte_unused)
+{
+ uint16_t i;
+
+ for (i = 0; i < nb_ops; i++) {
+ struct rte_crypto_asym_op *asym_op = ops[i]->asym;
+
+ ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+ rte_crypto_op_attach_asym_session(ops[i], sess);
+
+ /* Populate op with operational details */
+ asym_op->sm2.hash = options->asym_hash_alg;
+
+ asym_op->sm2.op_type = options->asym_op_type;
+ asym_op->sm2.message.data = options->sm2_data->message.data;
+ asym_op->sm2.message.length = options->sm2_data->message.length;
+ asym_op->sm2.cipher.data = options->sm2_data->cipher.data;
+ asym_op->sm2.cipher.length = options->sm2_data->cipher.length;
+ asym_op->sm2.id.data = options->sm2_data->id.data;
+ asym_op->sm2.id.length = options->sm2_data->id.length;
+
+ asym_op->sm2.k.data = options->sm2_data->k.data;
+ asym_op->sm2.k.length = options->sm2_data->k.length;
+
+ asym_op->sm2.r.data = options->sm2_data->sign_r.data;
+ asym_op->sm2.r.length = options->sm2_data->sign_r.length;
+ asym_op->sm2.s.data = options->sm2_data->sign_s.data;
+ asym_op->sm2.s.length = options->sm2_data->sign_s.length;
+ }
+}
+
+
#ifdef RTE_LIB_SECURITY
static void
test_ipsec_vec_populate(struct rte_mbuf *m, const struct cperf_options
*options,
@@ -932,6 +973,27 @@ cperf_create_session(struct rte_mempool *sess_mp,
}
return asym_sess;
}
+
+ if (options->op_type == CPERF_ASYM_SM2) {
+ xform.next = NULL;
+ xform.xform_type = RTE_CRYPTO_ASYM_XFORM_SM2;
+ xform.ec.curve_id = options->sm2_data->curve;
+ xform.ec.pkey.data = options->sm2_data->pkey.data;
+ xform.ec.pkey.length = options->sm2_data->pkey.length;
+ xform.ec.q.x.data = options->sm2_data->pubkey_qx.data;
+ xform.ec.q.x.length = options->sm2_data->pubkey_qx.length;
+ xform.ec.q.y.data = options->sm2_data->pubkey_qy.data;
+ xform.ec.q.y.length = options->sm2_data->pubkey_qy.length;
+
+ ret = rte_cryptodev_asym_session_create(dev_id, &xform,
+ sess_mp, &asym_sess);
+ if (ret < 0) {
+ RTE_LOG(ERR, USER1, "SM2 Asym session create failed\n");
+ return NULL;
+ }
+
+ return asym_sess;
+ }
#ifdef RTE_LIB_SECURITY
/*
* security only
@@ -1230,7 +1292,10 @@ cperf_get_op_functions(const struct cperf_options
*options,
op_fns->populate_ops = cperf_set_ops_cipher;
break;
case CPERF_ASYM_MODEX:
- op_fns->populate_ops = cperf_set_ops_asym;
+ op_fns->populate_ops = cperf_set_ops_asym_modex;
+ b
[PATCH v1 6/6] app/crypto-perf: support ECDSA
Added support for ECDSA SECP256R1 curve SIGN and VERIFY operations.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test-crypto-perf/cperf_ops.c | 57 ++
app/test-crypto-perf/cperf_options.h | 2 +
app/test-crypto-perf/cperf_options_parsing.c | 10 ++-
app/test-crypto-perf/cperf_test_common.c | 1 +
app/test-crypto-perf/cperf_test_vectors.c| 83
app/test-crypto-perf/cperf_test_vectors.h| 12 +++
app/test-crypto-perf/main.c | 18 +
doc/guides/tools/cryptoperf.rst | 1 +
8 files changed, 182 insertions(+), 2 deletions(-)
diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index f0860a46c0..62b165124f 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -34,6 +34,39 @@ cperf_set_ops_asym_modex(struct rte_crypto_op **ops,
}
}
+static void
+cperf_set_ops_asym_ecdsa(struct rte_crypto_op **ops,
+ uint32_t src_buf_offset __rte_unused,
+ uint32_t dst_buf_offset __rte_unused, uint16_t nb_ops,
+ void *sess,
+ const struct cperf_options *options,
+ const struct cperf_test_vector *test_vector __rte_unused,
+ uint16_t iv_offset __rte_unused,
+ uint32_t *imix_idx __rte_unused,
+ uint64_t *tsc_start __rte_unused)
+{
+ uint16_t i;
+
+ for (i = 0; i < nb_ops; i++) {
+ struct rte_crypto_asym_op *asym_op = ops[i]->asym;
+
+ ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+ rte_crypto_op_attach_asym_session(ops[i], sess);
+
+ asym_op->ecdsa.op_type = options->asym_op_type;
+ asym_op->ecdsa.message.data =
options->secp256r1_data->message.data;
+ asym_op->ecdsa.message.length =
options->secp256r1_data->message.length;
+
+ asym_op->ecdsa.k.data = options->secp256r1_data->k.data;
+ asym_op->ecdsa.k.length = options->secp256r1_data->k.length;
+
+ asym_op->ecdsa.r.data = options->secp256r1_data->sign_r.data;
+ asym_op->ecdsa.r.length =
options->secp256r1_data->sign_r.length;
+ asym_op->ecdsa.s.data = options->secp256r1_data->sign_s.data;
+ asym_op->ecdsa.s.length =
options->secp256r1_data->sign_s.length;
+ }
+}
+
static void
cperf_set_ops_asym_sm2(struct rte_crypto_op **ops,
uint32_t src_buf_offset __rte_unused,
@@ -974,6 +1007,27 @@ cperf_create_session(struct rte_mempool *sess_mp,
return asym_sess;
}
+ if (options->op_type == CPERF_ASYM_SECP256R1) {
+ xform.next = NULL;
+ xform.xform_type = RTE_CRYPTO_ASYM_XFORM_ECDSA;
+ xform.ec.curve_id = options->secp256r1_data->curve;
+ xform.ec.pkey.data = options->secp256r1_data->pkey.data;
+ xform.ec.pkey.length = options->secp256r1_data->pkey.length;
+ xform.ec.q.x.data = options->secp256r1_data->pubkey_qx.data;
+ xform.ec.q.x.length = options->secp256r1_data->pubkey_qx.length;
+ xform.ec.q.y.data = options->secp256r1_data->pubkey_qy.data;
+ xform.ec.q.y.length = options->secp256r1_data->pubkey_qy.length;
+
+ ret = rte_cryptodev_asym_session_create(dev_id, &xform,
+ sess_mp, &asym_sess);
+ if (ret < 0) {
+ RTE_LOG(ERR, USER1, "ECDSA Asym session create
failed\n");
+ return NULL;
+ }
+
+ return asym_sess;
+ }
+
if (options->op_type == CPERF_ASYM_SM2) {
xform.next = NULL;
xform.xform_type = RTE_CRYPTO_ASYM_XFORM_SM2;
@@ -1294,6 +1348,9 @@ cperf_get_op_functions(const struct cperf_options
*options,
case CPERF_ASYM_MODEX:
op_fns->populate_ops = cperf_set_ops_asym_modex;
break;
+ case CPERF_ASYM_SECP256R1:
+ op_fns->populate_ops = cperf_set_ops_asym_ecdsa;
+ break;
case CPERF_ASYM_SM2:
op_fns->populate_ops = cperf_set_ops_asym_sm2;
break;
diff --git a/app/test-crypto-perf/cperf_options.h
b/app/test-crypto-perf/cperf_options.h
index d730ae18d0..9364c030c0 100644
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -87,6 +87,7 @@ enum cperf_op_type {
CPERF_DOCSIS,
CPERF_IPSEC,
CPERF_ASYM_MODEX,
+ CPERF_ASYM_SECP256R1,
CPERF_ASYM_SM2,
CPERF_TLS,
};
@@ -165,6 +166,7 @@ struct cperf_options {
uint8_t imix_distribution_count;
struct cperf_modex_test_data *modex_data;
uint16_t modex_len;
+ struct cperf_ecdsa_test_data *secp256r1_data;
struct cperf_sm2_test_data *sm2_data;
enum rte_crypto_asym_op_type asym_op
[PATCH v2 0/3] malloc related cleanups
The type parameter for malloc is only used for tracing. Fix documentation and don't pass through heap routines. Stephen Hemminger (3): rte_malloc: document that type is for tracing eal: remove type argument from internal routines event/sw: avoid snprintf truncation v2 - keep usage for tracing - combine event malloc type patch drivers/event/sw/iq_chunk.h | 2 -- drivers/event/sw/sw_evdev.c | 2 +- lib/eal/common/eal_common_memzone.c | 6 ++--- lib/eal/common/malloc_heap.c| 39 - lib/eal/common/malloc_heap.h| 7 +++--- lib/eal/common/rte_malloc.c | 2 +- lib/eal/include/rte_malloc.h| 24 +- 7 files changed, 35 insertions(+), 47 deletions(-) -- 2.43.0
[PATCH v2 1/3] rte_malloc: document that type is for tracing
The string type is only used for tracing and not used as
documented by dump_stats.
Signed-off-by: Stephen Hemminger
---
lib/eal/include/rte_malloc.h | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/eal/include/rte_malloc.h b/lib/eal/include/rte_malloc.h
index 54a8ac211e..67a459c6a3 100644
--- a/lib/eal/include/rte_malloc.h
+++ b/lib/eal/include/rte_malloc.h
@@ -37,8 +37,8 @@ struct rte_malloc_socket_stats {
* NUMA socket as the core that calls this function.
*
* @param type
- * A string identifying the type of allocated objects (useful for debug
- * purposes, such as identifying the cause of a memory leak). Can be NULL.
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
* @param size
* Size (in bytes) to be allocated.
* @param align
@@ -64,8 +64,8 @@ rte_malloc(const char *type, size_t size, unsigned align)
* same NUMA socket as the core that calls this function.
*
* @param type
- * A string identifying the type of allocated objects (useful for debug
- * purposes, such as identifying the cause of a memory leak). Can be NULL.
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
* @param size
* Size (in bytes) to be allocated.
* @param align
@@ -89,8 +89,8 @@ rte_zmalloc(const char *type, size_t size, unsigned align)
* same NUMA socket as the core that calls this function.
*
* @param type
- * A string identifying the type of allocated objects (useful for debug
- * purposes, such as identifying the cause of a memory leak). Can be NULL.
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
* @param num
* Number of elements to be allocated.
* @param size
@@ -165,8 +165,8 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int
align, int socket)
* is not cleared.
*
* @param type
- * A string identifying the type of allocated objects (useful for debug
- * purposes, such as identifying the cause of a memory leak). Can be NULL.
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
* @param size
* Size (in bytes) to be allocated.
* @param align
@@ -194,8 +194,8 @@ rte_malloc_socket(const char *type, size_t size, unsigned
align, int socket)
* initialised with zeros.
*
* @param type
- * A string identifying the type of allocated objects (useful for debug
- * purposes, such as identifying the cause of a memory leak). Can be NULL.
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
* @param size
* Size (in bytes) to be allocated.
* @param align
@@ -221,8 +221,8 @@ rte_zmalloc_socket(const char *type, size_t size, unsigned
align, int socket)
* initialised with zeros.
*
* @param type
- * A string identifying the type of allocated objects (useful for debug
- * purposes, such as identifying the cause of a memory leak). Can be NULL.
+ * A string identifying the type of allocated objects (useful for tracing).
+ * Can be NULL.
* @param num
* Number of elements to be allocated.
* @param size
--
2.43.0
[PATCH v2 2/3] eal: remove type argument from internal routines
The type argument is carried through malloc heap routines but
never used there. It is only used a rte_malloc for tracing.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_memzone.c | 6 ++---
lib/eal/common/malloc_heap.c| 39 -
lib/eal/common/malloc_heap.h| 7 +++---
lib/eal/common/rte_malloc.c | 2 +-
4 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/lib/eal/common/eal_common_memzone.c
b/lib/eal/common/eal_common_memzone.c
index 32e6b78f87..2d9b6aa3e3 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -191,14 +191,12 @@ memzone_reserve_aligned_thread_unsafe(const char *name,
size_t len,
if (len == 0 && bound == 0) {
/* no size constraints were placed, so use malloc elem len */
requested_len = 0;
- mz_addr = malloc_heap_alloc_biggest(NULL, socket_id, flags,
- align, contig);
+ mz_addr = malloc_heap_alloc_biggest(socket_id, flags, align,
contig);
} else {
if (len == 0)
requested_len = bound;
/* allocate memory on heap */
- mz_addr = malloc_heap_alloc(NULL, requested_len, socket_id,
- flags, align, bound, contig);
+ mz_addr = malloc_heap_alloc(requested_len, socket_id, flags,
align, bound, contig);
}
if (mz_addr == NULL) {
rte_errno = ENOMEM;
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 5ff27548ff..058aaf4209 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -229,8 +229,8 @@ find_biggest_element(struct malloc_heap *heap, size_t *size,
* the new element after releasing the lock.
*/
static void *
-heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t
size,
- unsigned int flags, size_t align, size_t bound, bool contig)
+heap_alloc(struct malloc_heap *heap, size_t size, unsigned int flags,
+ size_t align, size_t bound, bool contig)
{
struct malloc_elem *elem;
size_t user_size = size;
@@ -255,8 +255,7 @@ heap_alloc(struct malloc_heap *heap, const char *type
__rte_unused, size_t size,
}
static void *
-heap_alloc_biggest(struct malloc_heap *heap, const char *type __rte_unused,
- unsigned int flags, size_t align, bool contig)
+heap_alloc_biggest(struct malloc_heap *heap, unsigned int flags, size_t align,
bool contig)
{
struct malloc_elem *elem;
size_t size;
@@ -640,8 +639,7 @@ alloc_more_mem_on_socket(struct malloc_heap *heap, size_t
size, int socket,
/* this will try lower page sizes first */
static void *
-malloc_heap_alloc_on_heap_id(const char *type, size_t size,
- unsigned int heap_id, unsigned int flags, size_t align,
+malloc_heap_alloc_on_heap_id(size_t size, unsigned int heap_id, unsigned int
flags, size_t align,
size_t bound, bool contig)
{
struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
@@ -658,7 +656,7 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size,
/* for legacy mode, try once and with all flags */
if (internal_conf->legacy_mem) {
- ret = heap_alloc(heap, type, size, flags, align, bound, contig);
+ ret = heap_alloc(heap, size, flags, align, bound, contig);
goto alloc_unlock;
}
@@ -679,7 +677,7 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size,
if (socket_id < 0)
size_flags |= RTE_MEMZONE_SIZE_HINT_ONLY;
- ret = heap_alloc(heap, type, size, size_flags, align, bound, contig);
+ ret = heap_alloc(heap, size, size_flags, align, bound, contig);
if (ret != NULL)
goto alloc_unlock;
@@ -689,7 +687,7 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size,
if (!alloc_more_mem_on_socket(heap, size, socket_id, flags, align,
bound, contig)) {
- ret = heap_alloc(heap, type, size, flags, align, bound, contig);
+ ret = heap_alloc(heap, size, flags, align, bound, contig);
/* this should have succeeded */
if (ret == NULL)
@@ -730,8 +728,8 @@ malloc_get_numa_socket(void)
}
void *
-malloc_heap_alloc(const char *type, size_t size, int socket_arg,
- unsigned int flags, size_t align, size_t bound, bool contig)
+malloc_heap_alloc(size_t size, int socket_arg, unsigned int flags,
+ size_t align, size_t bound, bool contig)
{
int socket, heap_id, i;
void *ret;
@@ -754,8 +752,7 @@ malloc_heap_alloc(const char *type, size_t size, int
socket_arg,
if (heap_id < 0)
return NULL;
- ret = malloc_heap_alloc_on_heap_id(type, size, heap_id, flags, align,
- bound, conti
[PATCH v2 3/3] event/sw: avoid snprintf truncation
The string used for rte_malloc_socket gets truncated.
With Gcc-14, this warning is generated:
../drivers/event/sw/sw_evdev.c:263:3: warning: 'snprintf' will always be
truncated;
specified size is 12, but format string expands to at least 13
[-Wformat-truncation]
263 | snprintf(buf, sizeof(buf), "sw%d_iq_%d_rob", dev_id, i);
| ^
Replace IQ_ROB_NAMESIZE (12) with a bigger buffer and remove
it since no longer used.
Signed-off-by: Stephen Hemminger
---
drivers/event/sw/iq_chunk.h | 2 --
drivers/event/sw/sw_evdev.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/event/sw/iq_chunk.h b/drivers/event/sw/iq_chunk.h
index 7a7a8782e6..e638142dbc 100644
--- a/drivers/event/sw/iq_chunk.h
+++ b/drivers/event/sw/iq_chunk.h
@@ -9,8 +9,6 @@
#include
#include
-#define IQ_ROB_NAMESIZE 12
-
struct __rte_cache_aligned sw_queue_chunk {
struct rte_event events[SW_EVS_PER_Q_CHUNK];
struct sw_queue_chunk *next;
diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index 1c01b069fe..44698d8aff 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -230,7 +230,7 @@ qid_init(struct sw_evdev *sw, unsigned int idx, int type,
unsigned int i;
int dev_id = sw->data->dev_id;
int socket_id = sw->data->socket_id;
- char buf[IQ_ROB_NAMESIZE];
+ char buf[64];
struct sw_qid *qid = &sw->qids[idx];
/* Initialize the FID structures to no pinning (-1), and zero packets */
--
2.43.0
Re: [PATCH] event: fix warning from useless snprintf
On Sat, 15 Jun 2024 13:43:16 +0200 Thomas Monjalon wrote: > 24/04/2024 21:10, Stephen Hemminger: > > On Wed, 24 Apr 2024 17:12:39 + > > "Van Haaren, Harry" wrote: > > > From: Stephen Hemminger > > > > "Van Haaren, Harry" wrote: > > > > > > From: Stephen Hemminger > > > > > > > > > > > > With Gcc-14, this warning is generated: > > > > > > ../drivers/event/sw/sw_evdev.c:263:3: warning: 'snprintf' will > > > > > > always be truncated; > > > > > > specified size is 12, but format string expands to at least 13 > > > > > > [-Wformat-truncation] > > > > > > 263 | snprintf(buf, sizeof(buf), > > > > > > "sw%d_iq_%d_rob", dev_id, i); > > > > > > | ^ > > > > > > > > > > > > Yet the whole printf to the buf is unnecessary. The type string > > > > > > argument > > > > > > has never been implemented, and should just be NULL. Removing the > > > > > > unnecessary snprintf, then means IQ_ROB_NAMESIZE can be removed. > > > > > > > > > > I understand that today the "type" value isn't implemented, but > > > > > across the DPDK codebase it > > > > > seems like others are filling in "type" to be some debug-useful > > > > > name/string. If it was added > > > > > in future it'd be nice to have the ROB/IQ memory identified by name, > > > > > like the rest of DPDK components. > > > > > > > > No, don't bother. This is a case of > > > > https://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it > > > > > > I agree that YAGNI perhaps applied when designing the APIs, but the > > > "type" parameter is there now... > > > Should we add a guidance of "when reworking code, always pass NULL as the > > > type parameter to rte_malloc functions" somewhere in the programmers > > > guide, to align community with this "pass NULL for type" initiative? > > > > > > > > > > > > Acked-by: Harry van Haaren > > > > > > > Did look into Mi-Malloc https://github.com/microsoft/mimalloc > > it is fast and more complete and good work with huge pages. > > The way to handle tagging allocations having the library automatically > > handle it > > based on the place allocation is called from. Having user do it is not that > > helpful. > > But today we have rte_malloc. > And the type is used in tracing. > I think having a meaningful name from the caller is not a bad idea. > > Ok still useful for tracing, but documentation is incorrect (dump stats doesn't use it), and the type field doesn't need to be passed as argument to heap code.
RE: [PATCH v2 0/3] malloc related cleanups
> From: Stephen Hemminger [mailto:step...@networkplumber.org] > Sent: Saturday, 15 June 2024 18.00 > > The type parameter for malloc is only used for tracing. > Fix documentation and don't pass through heap routines. > > Stephen Hemminger (3): > rte_malloc: document that type is for tracing > eal: remove type argument from internal routines > event/sw: avoid snprintf truncation > > v2 - keep usage for tracing >- combine event malloc type patch For the series, Acked-by: Morten Brørup
[PATCH v1 0/4] test/crypto: enhance modex tests
This patch series enhances modex tests to: * use common test function in existing test vectors * add test for zero padded operands Gowrishankar Muthukrishnan (4): test/crypto: validate modex result from first nonzero value test/crypto: remove unused variable in modex test data test/crypto: use common test function for mod tests test/crypto: add modex tests for zero padded operands app/test/test_cryptodev_asym.c | 279 app/test/test_cryptodev_asym_util.h| 18 -- app/test/test_cryptodev_mod_test_vectors.h | 287 ++--- 3 files changed, 241 insertions(+), 343 deletions(-) -- 2.25.1
[PATCH v1 1/4] test/crypto: validate modex result from first nonzero value
At present, there is no specification of whether modex op output
can carry leading zeroes without changing the value. OpenSSL strips
leading zeroes, but other hardware need not be. Hence, when output
is compared against expected result, validation could start from
first non-zero.
Fixes: 1ffefe00f1 ("test/crypto: add modexp and modinv functions")
Cc: sta...@dpdk.org
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test/test_cryptodev_asym.c | 25 +++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 17daf734e8..c26be9b2bf 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -3200,6 +3200,27 @@ static int send_one(void)
return TEST_SUCCESS;
}
+static int
+modular_cmpeq(const uint8_t *a, const uint8_t *b, size_t len)
+{
+ const uint8_t *new_a = a, *new_b = b;
+ size_t i, j;
+
+ /* Strip leading NUL bytes */
+ for (i = 0; i < len; i++)
+ if (a[i] != 0)
+ new_a = &a[i];
+
+ for (j = 0; j < len; j++)
+ if (b[j] != 0)
+ new_b = &b[i];
+
+ if (i != j || memcmp(new_a, new_b, len - i))
+ return 1;
+
+ return 0;
+}
+
static int
modular_exponentiation(const void *test_data)
{
@@ -3234,9 +3255,9 @@ modular_exponentiation(const void *test_data)
TEST_ASSERT_SUCCESS(send_one(),
"Failed to process crypto op");
- TEST_ASSERT_BUFFERS_ARE_EQUAL(vector->reminder.data,
+ TEST_ASSERT_SUCCESS(modular_cmpeq(vector->reminder.data,
self->result_op->asym->modex.result.data,
- self->result_op->asym->modex.result.length,
+ self->result_op->asym->modex.result.length),
"operation verification failed\n");
return TEST_SUCCESS;
--
2.25.1
[PATCH v1 2/4] test/crypto: remove unused variable in modex test data
Remove unused result_len from modex test data.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test/test_cryptodev_mod_test_vectors.h | 10 --
1 file changed, 10 deletions(-)
diff --git a/app/test/test_cryptodev_mod_test_vectors.h
b/app/test/test_cryptodev_mod_test_vectors.h
index c773c37018..a4e06c0291 100644
--- a/app/test/test_cryptodev_mod_test_vectors.h
+++ b/app/test/test_cryptodev_mod_test_vectors.h
@@ -27,7 +27,6 @@ struct modex_test_data {
uint8_t data[DATA_SIZE];
uint16_t len;
} reminder;
- uint16_t result_len;
};
struct modinv_test_data {
enum rte_crypto_asym_xform_type xform_type;
@@ -44,7 +43,6 @@ struct modinv_test_data {
uint8_t data[DATA_SIZE];
uint16_t len;
} inverse;
- uint16_t result_len;
};
/* ModExp #1 */
@@ -109,7 +107,6 @@ modex_test_data modex_test_case_m128_b20_e3 = {
},
.len = 128
},
- .result_len = 128
};
/* ModInv #1 */
@@ -167,7 +164,6 @@ modinv_test_data modinv_test_case = {
},
.len = 128
},
- .result_len = 128
};
/* modular operation test data */
@@ -347,7 +343,6 @@ modex_test_data modex_group_test_cases[] = {
},
.len = 192
},
- .result_len = 192
},
{
.description = "Modular Exponentiation tests for Group 14",
@@ -442,7 +437,6 @@ modex_test_data modex_group_test_cases[] = {
},
.len = 256
},
- .result_len = 256
},
{
.description = "Modular Exponentiation tests for Group 15",
@@ -571,7 +565,6 @@ modex_test_data modex_group_test_cases[] = {
},
.len = 384
},
- .result_len = 384
},
{
.description = "Modular Exponentiation tests for Group 16",
@@ -733,7 +726,6 @@ modex_test_data modex_group_test_cases[] = {
},
.len = 512
},
- .result_len = 512
},
{
.description = "Modular Exponentiation tests for Group 17",
@@ -960,7 +952,6 @@ modex_test_data modex_group_test_cases[] = {
},
.len = 768
},
- .result_len = 768
},
{
.description = "Modular Exponentiation tests for Group 18",
@@ -1252,7 +1243,6 @@ modex_test_data modex_group_test_cases[] = {
},
.len = 1024
},
- .result_len = 1024
},
};
--
2.25.1
[PATCH v1 3/4] test/crypto: use common test function for mod tests
Use common test function for modex and modinv tests.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test/test_cryptodev_asym.c | 238 ++---
app/test/test_cryptodev_asym_util.h| 18 --
app/test/test_cryptodev_mod_test_vectors.h | 206 ++
3 files changed, 131 insertions(+), 331 deletions(-)
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index c26be9b2bf..41e150ed17 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -988,229 +988,6 @@ test_dh_gen_kp(struct rte_crypto_asym_xform *xfrm)
return status;
}
-static int
-test_mod_inv(void)
-{
- struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
- struct rte_mempool *op_mpool = ts_params->op_mpool;
- struct rte_mempool *sess_mpool = ts_params->session_mpool;
- uint8_t dev_id = ts_params->valid_devs[0];
- struct rte_crypto_asym_op *asym_op = NULL;
- struct rte_crypto_op *op = NULL, *result_op = NULL;
- void *sess = NULL;
- int status = TEST_SUCCESS;
- struct rte_cryptodev_asym_capability_idx cap_idx;
- const struct rte_cryptodev_asymmetric_xform_capability *capability;
- uint8_t input[TEST_DATA_SIZE] = {0};
- int ret = 0;
- uint8_t result[sizeof(mod_p)] = { 0 };
-
- if (rte_cryptodev_asym_get_xform_enum(
- &modinv_xform.xform_type, "modinv") < 0) {
- RTE_LOG(ERR, USER1,
-"Invalid ASYM algorithm specified\n");
- return -1;
- }
-
- cap_idx.type = modinv_xform.xform_type;
- capability = rte_cryptodev_asym_capability_get(dev_id,
- &cap_idx);
-
- if (capability == NULL) {
- RTE_LOG(INFO, USER1,
- "Device doesn't support MOD INV. Test Skipped\n");
- return TEST_SKIPPED;
- }
-
- if (rte_cryptodev_asym_xform_capability_check_modlen(
- capability,
- modinv_xform.modinv.modulus.length)) {
- RTE_LOG(ERR, USER1,
-"Invalid MODULUS length specified\n");
- return TEST_SKIPPED;
- }
-
- ret = rte_cryptodev_asym_session_create(dev_id, &modinv_xform,
sess_mpool, &sess);
- if (ret < 0) {
- RTE_LOG(ERR, USER1, "line %u "
- "FAILED: %s", __LINE__,
- "Session creation failed");
- status = (ret == -ENOTSUP) ? TEST_SKIPPED : TEST_FAILED;
- goto error_exit;
- }
-
- /* generate crypto op data structure */
- op = rte_crypto_op_alloc(op_mpool, RTE_CRYPTO_OP_TYPE_ASYMMETRIC);
- if (!op) {
- RTE_LOG(ERR, USER1,
- "line %u FAILED: %s",
- __LINE__, "Failed to allocate asymmetric crypto "
- "operation struct");
- status = TEST_FAILED;
- goto error_exit;
- }
-
- asym_op = op->asym;
- memcpy(input, base, sizeof(base));
- asym_op->modinv.base.data = input;
- asym_op->modinv.base.length = sizeof(base);
- asym_op->modinv.result.data = result;
- asym_op->modinv.result.length = sizeof(result);
-
- /* attach asymmetric crypto session to crypto operations */
- rte_crypto_op_attach_asym_session(op, sess);
-
- RTE_LOG(DEBUG, USER1, "Process ASYM operation");
-
- /* Process crypto operation */
- if (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {
- RTE_LOG(ERR, USER1,
- "line %u FAILED: %s",
- __LINE__, "Error sending packet for operation");
- status = TEST_FAILED;
- goto error_exit;
- }
-
- while (rte_cryptodev_dequeue_burst(dev_id, 0, &result_op, 1) == 0)
- rte_pause();
-
- if (result_op == NULL) {
- RTE_LOG(ERR, USER1,
- "line %u FAILED: %s",
- __LINE__, "Failed to process asym crypto op");
- status = TEST_FAILED;
- goto error_exit;
- }
-
- ret = verify_modinv(mod_inv, result_op);
- if (ret) {
- RTE_LOG(ERR, USER1,
-"operation verification failed\n");
- status = TEST_FAILED;
- }
-
-error_exit:
- if (sess)
- rte_cryptodev_asym_session_free(dev_id, sess);
-
- rte_crypto_op_free(op);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return status;
-}
-
-static int
-test_mod_exp(void)
-{
- struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
- struct rte_mempool *op_mpool = ts_params->op_mpool;
- struct rte_mempool *sess_mpool = ts_params->session_mpool;
- uint8_t dev_id = ts_params->v
[PATCH v1 4/4] test/crypto: add modex tests for zero padded operands
Add modex tests for zero padded operands, as in ASN encoding.
Signed-off-by: Gowrishankar Muthukrishnan
---
app/test/test_cryptodev_asym.c | 16 +
app/test/test_cryptodev_mod_test_vectors.h | 71 ++
2 files changed, 87 insertions(+)
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 41e150ed17..0c05a34e10 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -3293,6 +3293,14 @@ static struct unit_test_suite
cryptodev_openssl_asym_testsuite = {
"Modex test",
ut_setup_asym, ut_teardown_asym,
modular_exponentiation, &modex_test_cases[0]),
+ TEST_CASE_NAMED_WITH_DATA(
+ "Modex test for zero padding",
+ ut_setup_asym, ut_teardown_asym,
+ modular_exponentiation, &modex_test_cases[1]),
+ TEST_CASE_NAMED_WITH_DATA(
+ "Modex test for zero padding (2)",
+ ut_setup_asym, ut_teardown_asym,
+ modular_exponentiation, &modex_test_cases[2]),
TEST_CASE_NAMED_WITH_DATA(
"Modex Group 5 test",
ut_setup_asym, ut_teardown_asym,
@@ -3371,6 +3379,14 @@ static struct unit_test_suite
cryptodev_octeontx_asym_testsuite = {
"Modex test",
ut_setup_asym, ut_teardown_asym,
modular_exponentiation, &modex_test_cases[0]),
+ TEST_CASE_NAMED_WITH_DATA(
+ "Modex test for zero padding",
+ ut_setup_asym, ut_teardown_asym,
+ modular_exponentiation, &modex_test_cases[1]),
+ TEST_CASE_NAMED_WITH_DATA(
+ "Modex test for zero padding (2)",
+ ut_setup_asym, ut_teardown_asym,
+ modular_exponentiation, &modex_test_cases[2]),
TEST_CASE_NAMED_WITH_DATA(
"Modex Group 5 test",
ut_setup_asym, ut_teardown_asym,
diff --git a/app/test/test_cryptodev_mod_test_vectors.h
b/app/test/test_cryptodev_mod_test_vectors.h
index b2250dc95a..8075f6eac7 100644
--- a/app/test/test_cryptodev_mod_test_vectors.h
+++ b/app/test/test_cryptodev_mod_test_vectors.h
@@ -292,6 +292,77 @@ modex_test_data modex_test_cases[] = {
},
.len = 129
}
+},
+{
+ .description = "Modular Exponentiation tests for 0 MSBs",
+ .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
+ .base = {
+ .data = {
+ 0x00, 0x00, 0x45, 0xCA, 0x2C, 0x5C, 0x3A, 0x90,
+ 0x00, 0xC4, 0xD7, 0x47, 0xA8, 0x2B, 0x12, 0x07,
+ 0xBD, 0x1F, 0xD7, 0x81
+ },
+ .len = 20
+ },
+ .exponent = {
+ .data = {
+ 0x00, 0x00, 0x00, 0x75, 0x74, 0x19, 0x19, 0x69,
+ 0xBF, 0x15, 0x2A, 0xAC
+ },
+ .len = 12
+ },
+ .reminder = {
+ .data = {
+ 0x5c, 0x94, 0x8f, 0x00, 0x79, 0xe3, 0xe1, 0x0b,
+ 0x3f, 0x3e, 0x36, 0x75, 0xed, 0x1d, 0x84, 0xc6,
+ 0x36, 0x9e
+ },
+ .len = 18
+ },
+ .modulus = {
+ .data = {
+ 0x00, 0x00, 0x99, 0x28, 0x09, 0x8A, 0xE9, 0x89,
+ 0xBB, 0x81, 0x3B, 0x07, 0x0E, 0x31, 0x00, 0x7F,
+ 0x79, 0x97, 0xED, 0x35
+ },
+ .len = 20
+ }
+},
+{
+ .description = "Modular Exponentiation tests for 0 MSBs (2)",
+ .xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
+ .base = {
+ .data = {
+ 0x01, 0x31, 0x72, 0xFB, 0x81, 0x9D, 0x81, 0x7A,
+ 0x91, 0xDC, 0xE6, 0x6C, 0x2D, 0x55, 0xD9, 0x25,
+ 0x7A, 0xB2, 0xFF, 0xFF
+ },
+ .len = 20
+ },
+ .exponent = {
+ .data = {
+ 0x00, 0x00, 0x00, 0x02, 0x36, 0x38, 0x31, 0x47,
+ 0x3C, 0x07, 0x36, 0x21
+ },
+ .len = 12
+ },
+ .reminder = {
+ .data = {
+ 0x02, 0x99, 0x2F, 0xE3, 0x00, 0x9F, 0xF0, 0x9E,
+ 0x65, 0x3C, 0x0B, 0x4A, 0xD3, 0x1B, 0x7C, 0x7F,
+ 0x1C
+ },
+ .len = 17
+ },
+ .modulus = {
+ .data = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+ 0xCE, 0xF0, 0x7C, 0x13, 0x26, 0x90, 0xAF, 0x49,
+ 0x06, 0x4D, 0xA4, 0x5C, 0xB2, 0x43, 0x13, 0x25
