Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132110/?format=api
{ "id": 132110, "url": "http://patchwork.dpdk.org/api/patches/132110/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230928095300.1353-2-gmuthukrishn@marvell.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230928095300.1353-2-gmuthukrishn@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230928095300.1353-2-gmuthukrishn@marvell.com", "date": "2023-09-28T09:52:55", "name": "[RFC,1/6] cryptodev: move RSA padding information into xform", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d354f7b45c6c2761fe36d09779215586a36096d1", "submitter": { "id": 2301, "url": "http://patchwork.dpdk.org/api/people/2301/?format=api", "name": "Gowrishankar Muthukrishnan", "email": "gmuthukrishn@marvell.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230928095300.1353-2-gmuthukrishn@marvell.com/mbox/", "series": [ { "id": 29674, "url": "http://patchwork.dpdk.org/api/series/29674/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29674", "date": "2023-09-28T09:52:54", "name": "vhost: add asymmetric crypto support", "version": 1, "mbox": "http://patchwork.dpdk.org/series/29674/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132110/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132110/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9405E4265E;\n\tThu, 28 Sep 2023 11:53:26 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 846CD40A75;\n\tThu, 28 Sep 2023 11:53:24 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id 231BD40A73\n for <dev@dpdk.org>; Thu, 28 Sep 2023 11:53:23 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 38S6994p012864; Thu, 28 Sep 2023 02:53:22 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3tcrrs2yrx-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Thu, 28 Sep 2023 02:53:22 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Thu, 28 Sep 2023 02:53:20 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Thu, 28 Sep 2023 02:53:19 -0700", "from BG-LT91401.marvell.com (BG-LT91401.marvell.com [10.28.168.34])\n by maili.marvell.com (Postfix) with ESMTP id 74DAA5C68F9;\n Thu, 28 Sep 2023 02:53:17 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=7v953CJ+n0uAOTCTZ9AnIURiAs8kPG6T4sKSmD1fGKs=;\n b=BEFThRlJ0P39kS2GJbTFH93xuF4XkKE/yrJ1X1J20jlnOzYlII5IVsefwBDJ+KeO78mG\n d5zJcZYVjtvozZJdxVZp1LuTiKf+2pwSh+uaEsDaFHHbf8PAF27BSiEY2ea34RYSlCIA\n CRA6A6HmvsgKwcX8cOcdbyvMBCXAq5PlFCbFx9M/4SfGtSnLNbjQRpu5B5/s90sRLt8y\n XKDjQYES8h0cYldB6r2zAs64RuJPrNzKgew0F3x66HqgZ2yxNQrezsiqaaFyEgeDc5z6\n 1d3d1n+hyybAXZStk1LAQJ9LWFdxeLJgHwCVbpo59J7kIt4wyPEUK/HctPBynIZZrwO2 Vw==", "From": "Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<anoobj@marvell.com>, Akhil Goyal <gakhil@marvell.com>, Fan Zhang\n <fanzhang.oss@gmail.com>, Kai Ji <kai.ji@intel.com>, Arkadiusz Kusztal\n <arkadiuszx.kusztal@intel.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Chenbo Xia <chenbo.xia@intel.com>, Jay Zhou <jianjay.zhou@huawei.com>,\n Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>", "Subject": "[RFC 1/6] cryptodev: move RSA padding information into xform", "Date": "Thu, 28 Sep 2023 15:22:55 +0530", "Message-ID": "<20230928095300.1353-2-gmuthukrishn@marvell.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20230928095300.1353-1-gmuthukrishn@marvell.com>", "References": "<20230928095300.1353-1-gmuthukrishn@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "uPsghOeO7EB0ExizT5RfN3fCe2QZE1Fd", "X-Proofpoint-GUID": "uPsghOeO7EB0ExizT5RfN3fCe2QZE1Fd", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2023-09-28_07,2023-09-27_01,2023-05-22_02", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "RSA padding information could be a xform entity rather than part of\ncrypto op, as it seems associated with hashing algorithm used for\nthe entire crypto session, where this algorithm is used in message\ndigest itself. Even in virtIO standard spec, this info is associated\nin the asymmetric session creation. Hence, moving this info from\ncrypto op into xform structure.\n\nSigned-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>\n---\n app/test/test_cryptodev_asym.c | 4 --\n app/test/test_cryptodev_rsa_test_vectors.h | 2 +\n drivers/common/cpt/cpt_ucode_asym.h | 4 +-\n drivers/crypto/cnxk/cnxk_ae.h | 13 +++--\n drivers/crypto/octeontx/otx_cryptodev_ops.c | 4 +-\n drivers/crypto/openssl/openssl_pmd_private.h | 1 +\n drivers/crypto/openssl/rte_openssl_pmd.c | 4 +-\n drivers/crypto/openssl/rte_openssl_pmd_ops.c | 1 +\n drivers/crypto/qat/qat_asym.c | 17 ++++---\n examples/fips_validation/main.c | 52 +++++++++++---------\n lib/cryptodev/rte_crypto_asym.h | 6 +--\n 11 files changed, 58 insertions(+), 50 deletions(-)", "diff": "diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c\nindex 9820b80f7e..7a4b262ba9 100644\n--- a/app/test/test_cryptodev_asym.c\n+++ b/app/test/test_cryptodev_asym.c\n@@ -79,7 +79,6 @@ queue_ops_rsa_sign_verify(void *sess)\n \tasym_op->rsa.message.length = rsaplaintext.len;\n \tasym_op->rsa.sign.length = RTE_DIM(rsa_n);\n \tasym_op->rsa.sign.data = output_buf;\n-\tasym_op->rsa.padding.type = RTE_CRYPTO_RSA_PADDING_PKCS1_5;\n \n \tdebug_hexdump(stdout, \"message\", asym_op->rsa.message.data,\n \t\t asym_op->rsa.message.length);\n@@ -111,7 +110,6 @@ queue_ops_rsa_sign_verify(void *sess)\n \n \t/* Verify sign */\n \tasym_op->rsa.op_type = RTE_CRYPTO_ASYM_OP_VERIFY;\n-\tasym_op->rsa.padding.type = RTE_CRYPTO_RSA_PADDING_PKCS1_5;\n \n \t/* Process crypto operation */\n \tif (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {\n@@ -170,7 +168,6 @@ queue_ops_rsa_enc_dec(void *sess)\n \tasym_op->rsa.cipher.data = cipher_buf;\n \tasym_op->rsa.cipher.length = RTE_DIM(rsa_n);\n \tasym_op->rsa.message.length = rsaplaintext.len;\n-\tasym_op->rsa.padding.type = RTE_CRYPTO_RSA_PADDING_PKCS1_5;\n \n \tdebug_hexdump(stdout, \"message\", asym_op->rsa.message.data,\n \t\t asym_op->rsa.message.length);\n@@ -202,7 +199,6 @@ queue_ops_rsa_enc_dec(void *sess)\n \tasym_op = result_op->asym;\n \tasym_op->rsa.message.length = RTE_DIM(rsa_n);\n \tasym_op->rsa.op_type = RTE_CRYPTO_ASYM_OP_DECRYPT;\n-\tasym_op->rsa.padding.type = RTE_CRYPTO_RSA_PADDING_PKCS1_5;\n \n \t/* Process crypto operation */\n \tif (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {\ndiff --git a/app/test/test_cryptodev_rsa_test_vectors.h b/app/test/test_cryptodev_rsa_test_vectors.h\nindex b4982014a2..0b8ed4caaa 100644\n--- a/app/test/test_cryptodev_rsa_test_vectors.h\n+++ b/app/test/test_cryptodev_rsa_test_vectors.h\n@@ -345,6 +345,7 @@ struct rte_crypto_asym_xform rsa_xform = {\n \t.next = NULL,\n \t.xform_type = RTE_CRYPTO_ASYM_XFORM_RSA,\n \t.rsa = {\n+\t\t.padding.type = RTE_CRYPTO_RSA_PADDING_PKCS1_5,\n \t\t.n = {\n \t\t\t.data = rsa_n,\n \t\t\t.length = sizeof(rsa_n)\n@@ -366,6 +367,7 @@ struct rte_crypto_asym_xform rsa_xform_crt = {\n \t.next = NULL,\n \t.xform_type = RTE_CRYPTO_ASYM_XFORM_RSA,\n \t.rsa = {\n+\t\t.padding.type = RTE_CRYPTO_RSA_PADDING_PKCS1_5,\n \t\t.n = {\n \t\t\t.data = rsa_n,\n \t\t\t.length = sizeof(rsa_n)\ndiff --git a/drivers/common/cpt/cpt_ucode_asym.h b/drivers/common/cpt/cpt_ucode_asym.h\nindex 1105a0c125..42ab0edeea 100644\n--- a/drivers/common/cpt/cpt_ucode_asym.h\n+++ b/drivers/common/cpt/cpt_ucode_asym.h\n@@ -327,7 +327,7 @@ cpt_rsa_prep(struct asym_op_params *rsa_params,\n \t/* Result buffer */\n \trlen = mod_len;\n \n-\tif (rsa_op.padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t/* Use mod_exp operation for no_padding type */\n \t\tvq_cmd_w0.s.opcode.minor = CPT_MINOR_OP_MODEX;\n \t\tvq_cmd_w0.s.param2 = exp_len;\n@@ -412,7 +412,7 @@ cpt_rsa_crt_prep(struct asym_op_params *rsa_params,\n \t/* Result buffer */\n \trlen = mod_len;\n \n-\tif (rsa_op.padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t/*Use mod_exp operation for no_padding type */\n \t\tvq_cmd_w0.s.opcode.minor = CPT_MINOR_OP_MODEX_CRT;\n \t} else {\ndiff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h\nindex 7ad259b7f4..063b6681cf 100644\n--- a/drivers/crypto/cnxk/cnxk_ae.h\n+++ b/drivers/crypto/cnxk/cnxk_ae.h\n@@ -168,6 +168,9 @@ cnxk_ae_fill_rsa_params(struct cnxk_ae_sess *sess,\n \trsa->n.length = mod_len;\n \trsa->e.length = exp_len;\n \n+\t/* Set padding info */\n+\trsa->padding.type = xform->rsa.padding.type;\n+\n \treturn 0;\n }\n \n@@ -328,7 +331,7 @@ cnxk_ae_rsa_prep(struct rte_crypto_op *op, struct roc_ae_buf_ptr *meta_buf,\n \tdptr += in_size;\n \tdlen = total_key_len + in_size;\n \n-\tif (rsa_op.padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t/* Use mod_exp operation for no_padding type */\n \t\tw4.s.opcode_minor = ROC_AE_MINOR_OP_MODEX;\n \t\tw4.s.param2 = exp_len;\n@@ -383,7 +386,7 @@ cnxk_ae_rsa_exp_prep(struct rte_crypto_op *op, struct roc_ae_buf_ptr *meta_buf,\n \tdptr += in_size;\n \tdlen = mod_len + privkey_len + in_size;\n \n-\tif (rsa_op.padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t/* Use mod_exp operation for no_padding type */\n \t\tw4.s.opcode_minor = ROC_AE_MINOR_OP_MODEX;\n \t\tw4.s.param2 = privkey_len;\n@@ -441,7 +444,7 @@ cnxk_ae_rsa_crt_prep(struct rte_crypto_op *op, struct roc_ae_buf_ptr *meta_buf,\n \tdptr += in_size;\n \tdlen = total_key_len + in_size;\n \n-\tif (rsa_op.padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t/*Use mod_exp operation for no_padding type */\n \t\tw4.s.opcode_minor = ROC_AE_MINOR_OP_MODEX_CRT;\n \t} else {\n@@ -837,7 +840,7 @@ cnxk_ae_dequeue_rsa_op(struct rte_crypto_op *cop, uint8_t *rptr,\n \t\tmemcpy(rsa->cipher.data, rptr, rsa->cipher.length);\n \t\tbreak;\n \tcase RTE_CRYPTO_ASYM_OP_DECRYPT:\n-\t\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\t\tif (rsa_ctx->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t\trsa->message.length = rsa_ctx->n.length;\n \t\t\tmemcpy(rsa->message.data, rptr, rsa->message.length);\n \t\t} else {\n@@ -857,7 +860,7 @@ cnxk_ae_dequeue_rsa_op(struct rte_crypto_op *cop, uint8_t *rptr,\n \t\tmemcpy(rsa->sign.data, rptr, rsa->sign.length);\n \t\tbreak;\n \tcase RTE_CRYPTO_ASYM_OP_VERIFY:\n-\t\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n+\t\tif (rsa_ctx->padding.type == RTE_CRYPTO_RSA_PADDING_NONE) {\n \t\t\trsa->sign.length = rsa_ctx->n.length;\n \t\t\tmemcpy(rsa->sign.data, rptr, rsa->sign.length);\n \t\t} else {\ndiff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c\nindex 947e1be385..d315dc3237 100644\n--- a/drivers/crypto/octeontx/otx_cryptodev_ops.c\n+++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c\n@@ -708,7 +708,7 @@ otx_cpt_asym_rsa_op(struct rte_crypto_op *cop, struct cpt_request_info *req,\n \t\tmemcpy(rsa->cipher.data, req->rptr, rsa->cipher.length);\n \t\tbreak;\n \tcase RTE_CRYPTO_ASYM_OP_DECRYPT:\n-\t\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE)\n+\t\tif (rsa_ctx->padding.type == RTE_CRYPTO_RSA_PADDING_NONE)\n \t\t\trsa->message.length = rsa_ctx->n.length;\n \t\telse {\n \t\t\t/* Get length of decrypted output */\n@@ -725,7 +725,7 @@ otx_cpt_asym_rsa_op(struct rte_crypto_op *cop, struct cpt_request_info *req,\n \t\tmemcpy(rsa->sign.data, req->rptr, rsa->sign.length);\n \t\tbreak;\n \tcase RTE_CRYPTO_ASYM_OP_VERIFY:\n-\t\tif (rsa->padding.type == RTE_CRYPTO_RSA_PADDING_NONE)\n+\t\tif (rsa_ctx->padding.type == RTE_CRYPTO_RSA_PADDING_NONE)\n \t\t\trsa->sign.length = rsa_ctx->n.length;\n \t\telse {\n \t\t\t/* Get length of decrypted output */\ndiff --git a/drivers/crypto/openssl/openssl_pmd_private.h b/drivers/crypto/openssl/openssl_pmd_private.h\nindex 1edb669dfd..f2db734e8a 100644\n--- a/drivers/crypto/openssl/openssl_pmd_private.h\n+++ b/drivers/crypto/openssl/openssl_pmd_private.h\n@@ -174,6 +174,7 @@ struct openssl_asym_session {\n \tunion {\n \t\tstruct rsa {\n \t\t\tRSA *rsa;\n+\t\t\tuint32_t pad;\n #if (OPENSSL_VERSION_NUMBER >= 0x30000000L)\n \t\t\tEVP_PKEY_CTX * ctx;\n #endif\ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c\nindex 5e8624cebe..474615a74c 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd.c\n@@ -2517,7 +2517,7 @@ process_openssl_rsa_op_evp(struct rte_crypto_op *cop,\n \t\tstruct openssl_asym_session *sess)\n {\n \tstruct rte_crypto_asym_op *op = cop->asym;\n-\tuint32_t pad = (op->rsa.padding.type);\n+\tuint32_t pad = sess->u.r.pad;\n \tuint8_t *tmp;\n \tsize_t outlen = 0;\n \tint ret = -1;\n@@ -2954,7 +2954,7 @@ process_openssl_rsa_op(struct rte_crypto_op *cop,\n \tint ret = 0;\n \tstruct rte_crypto_asym_op *op = cop->asym;\n \tRSA *rsa = sess->u.r.rsa;\n-\tuint32_t pad = (op->rsa.padding.type);\n+\tuint32_t pad = sess->u.r.pad;\n \tuint8_t *tmp;\n \n \tcop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;\ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c\nindex 85a4fa3e55..7711169ebd 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c\n@@ -845,6 +845,7 @@ static int openssl_set_asym_session_parameters(\n \t\tif (!n || !e)\n \t\t\tgoto err_rsa;\n \n+\t\tasym_session->u.r.pad = xform->rsa.padding.type;\n #if (OPENSSL_VERSION_NUMBER >= 0x30000000L)\n \t\tOSSL_PARAM_BLD * param_bld = OSSL_PARAM_BLD_new();\n \t\tif (!param_bld) {\ndiff --git a/drivers/crypto/qat/qat_asym.c b/drivers/crypto/qat/qat_asym.c\nindex 7abd513423..7f1b353210 100644\n--- a/drivers/crypto/qat/qat_asym.c\n+++ b/drivers/crypto/qat/qat_asym.c\n@@ -355,7 +355,7 @@ rsa_set_pub_input(struct icp_qat_fw_pke_request *qat_req,\n \talg_bytesize = qat_function.bytesize;\n \n \tif (asym_op->rsa.op_type == RTE_CRYPTO_ASYM_OP_ENCRYPT) {\n-\t\tswitch (asym_op->rsa.padding.type) {\n+\t\tswitch (xform->rsa.padding.type) {\n \t\tcase RTE_CRYPTO_RSA_PADDING_NONE:\n \t\t\tSET_PKE_LN(asym_op->rsa.message, alg_bytesize, 0);\n \t\t\tbreak;\n@@ -367,7 +367,7 @@ rsa_set_pub_input(struct icp_qat_fw_pke_request *qat_req,\n \t\t}\n \t\tHEXDUMP(\"RSA Message\", cookie->input_array[0], alg_bytesize);\n \t} else {\n-\t\tswitch (asym_op->rsa.padding.type) {\n+\t\tswitch (xform->rsa.padding.type) {\n \t\tcase RTE_CRYPTO_RSA_PADDING_NONE:\n \t\t\tSET_PKE_LN(asym_op->rsa.sign, alg_bytesize, 0);\n \t\t\tbreak;\n@@ -453,7 +453,7 @@ rsa_set_priv_input(struct icp_qat_fw_pke_request *qat_req,\n \n \tif (asym_op->rsa.op_type ==\n \t\t\tRTE_CRYPTO_ASYM_OP_DECRYPT) {\n-\t\tswitch (asym_op->rsa.padding.type) {\n+\t\tswitch (xform->rsa.padding.type) {\n \t\tcase RTE_CRYPTO_RSA_PADDING_NONE:\n \t\t\tSET_PKE_LN(asym_op->rsa.cipher,\talg_bytesize, 0);\n \t\t\tHEXDUMP(\"RSA ciphertext\", cookie->input_array[0],\n@@ -467,7 +467,7 @@ rsa_set_priv_input(struct icp_qat_fw_pke_request *qat_req,\n \n \t} else if (asym_op->rsa.op_type ==\n \t\t\tRTE_CRYPTO_ASYM_OP_SIGN) {\n-\t\tswitch (asym_op->rsa.padding.type) {\n+\t\tswitch (xform->rsa.padding.type) {\n \t\tcase RTE_CRYPTO_RSA_PADDING_NONE:\n \t\t\tSET_PKE_LN(asym_op->rsa.message, alg_bytesize, 0);\n \t\t\tHEXDUMP(\"RSA text to be signed\", cookie->input_array[0],\n@@ -507,7 +507,8 @@ rsa_set_input(struct icp_qat_fw_pke_request *qat_req,\n \n static uint8_t\n rsa_collect(struct rte_crypto_asym_op *asym_op,\n-\t\tconst struct qat_asym_op_cookie *cookie)\n+\t\tconst struct qat_asym_op_cookie *cookie,\n+\t\tconst struct rte_crypto_asym_xform *xform)\n {\n \tuint32_t alg_bytesize = cookie->alg_bytesize;\n \n@@ -523,7 +524,7 @@ rsa_collect(struct rte_crypto_asym_op *asym_op,\n \t\t\tHEXDUMP(\"RSA Encrypted data\", cookie->output_array[0],\n \t\t\t\talg_bytesize);\n \t\t} else {\n-\t\t\tswitch (asym_op->rsa.padding.type) {\n+\t\t\tswitch (xform->rsa.padding.type) {\n \t\t\tcase RTE_CRYPTO_RSA_PADDING_NONE:\n \t\t\t\trte_memcpy(asym_op->rsa.cipher.data,\n \t\t\t\t\t\tcookie->output_array[0],\n@@ -540,7 +541,7 @@ rsa_collect(struct rte_crypto_asym_op *asym_op,\n \t\t}\n \t} else {\n \t\tif (asym_op->rsa.op_type == RTE_CRYPTO_ASYM_OP_DECRYPT) {\n-\t\t\tswitch (asym_op->rsa.padding.type) {\n+\t\t\tswitch (xform->rsa.padding.type) {\n \t\t\tcase RTE_CRYPTO_RSA_PADDING_NONE:\n \t\t\t\trte_memcpy(asym_op->rsa.message.data,\n \t\t\t\t\tcookie->output_array[0],\n@@ -1015,7 +1016,7 @@ qat_asym_collect_response(struct rte_crypto_op *op,\n \tcase RTE_CRYPTO_ASYM_XFORM_MODINV:\n \t\treturn modinv_collect(asym_op, cookie, xform);\n \tcase RTE_CRYPTO_ASYM_XFORM_RSA:\n-\t\treturn rsa_collect(asym_op, cookie);\n+\t\treturn rsa_collect(asym_op, cookie, xform);\n \tcase RTE_CRYPTO_ASYM_XFORM_ECDSA:\n \t\treturn ecdsa_collect(asym_op, cookie);\n \tcase RTE_CRYPTO_ASYM_XFORM_ECPM:\ndiff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c\nindex fed5596f36..04bdceab06 100644\n--- a/examples/fips_validation/main.c\n+++ b/examples/fips_validation/main.c\n@@ -926,31 +926,7 @@ prepare_rsa_op(void)\n \t__rte_crypto_op_reset(env.op, RTE_CRYPTO_OP_TYPE_ASYMMETRIC);\n \n \tasym = env.op->asym;\n-\tasym->rsa.padding.type = info.interim_info.rsa_data.padding;\n-\tasym->rsa.padding.hash = info.interim_info.rsa_data.auth;\n-\n \tif (env.digest) {\n-\t\tif (asym->rsa.padding.type == RTE_CRYPTO_RSA_PADDING_PKCS1_5) {\n-\t\t\tint b_len = 0;\n-\t\t\tuint8_t b[32];\n-\n-\t\t\tb_len = get_hash_oid(asym->rsa.padding.hash, b);\n-\t\t\tif (b_len < 0) {\n-\t\t\t\tRTE_LOG(ERR, USER1, \"Failed to get digest info for hash %d\\n\",\n-\t\t\t\t\tasym->rsa.padding.hash);\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n-\n-\t\t\tif (b_len) {\n-\t\t\t\tmsg.len = env.digest_len + b_len;\n-\t\t\t\tmsg.val = rte_zmalloc(NULL, msg.len, 0);\n-\t\t\t\trte_memcpy(msg.val, b, b_len);\n-\t\t\t\trte_memcpy(msg.val + b_len, env.digest, env.digest_len);\n-\t\t\t\trte_free(env.digest);\n-\t\t\t\tenv.digest = msg.val;\n-\t\t\t\tenv.digest_len = msg.len;\n-\t\t\t}\n-\t\t}\n \t\tmsg.val = env.digest;\n \t\tmsg.len = env.digest_len;\n \t} else {\n@@ -1542,6 +1518,34 @@ prepare_rsa_xform(struct rte_crypto_asym_xform *xform)\n \txform->rsa.e.length = vec.rsa.e.len;\n \txform->rsa.n.data = vec.rsa.n.val;\n \txform->rsa.n.length = vec.rsa.n.len;\n+\n+\txform->rsa.padding.type = info.interim_info.rsa_data.padding;\n+\txform->rsa.padding.hash = info.interim_info.rsa_data.auth;\n+\tif (env.digest) {\n+\t\tif (xform->rsa.padding.type == RTE_CRYPTO_RSA_PADDING_PKCS1_5) {\n+\t\t\tstruct fips_val msg;\n+\t\t\tint b_len = 0;\n+\t\t\tuint8_t b[32];\n+\n+\t\t\tb_len = get_hash_oid(xform->rsa.padding.hash, b);\n+\t\t\tif (b_len < 0) {\n+\t\t\t\tRTE_LOG(ERR, USER1, \"Failed to get digest info for hash %d\\n\",\n+\t\t\t\t\txform->rsa.padding.hash);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tif (b_len) {\n+\t\t\t\tmsg.len = env.digest_len + b_len;\n+\t\t\t\tmsg.val = rte_zmalloc(NULL, msg.len, 0);\n+\t\t\t\trte_memcpy(msg.val, b, b_len);\n+\t\t\t\trte_memcpy(msg.val + b_len, env.digest, env.digest_len);\n+\t\t\t\trte_free(env.digest);\n+\t\t\t\tenv.digest = msg.val;\n+\t\t\t\tenv.digest_len = msg.len;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n \treturn 0;\n }\n \ndiff --git a/lib/cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h\nindex cbcfe1dc26..f0996816b9 100644\n--- a/lib/cryptodev/rte_crypto_asym.h\n+++ b/lib/cryptodev/rte_crypto_asym.h\n@@ -316,6 +316,9 @@ struct rte_crypto_rsa_xform {\n \t\tstruct rte_crypto_rsa_priv_key_qt qt;\n \t\t/**< qt - Private key in quintuple format */\n \t};\n+\n+\tstruct rte_crypto_rsa_padding padding;\n+\t/**< RSA padding information */\n };\n \n /**\n@@ -455,9 +458,6 @@ struct rte_crypto_rsa_op_param {\n \t * This could be validated and overwritten by the PMD\n \t * with the signature length.\n \t */\n-\n-\tstruct rte_crypto_rsa_padding padding;\n-\t/**< RSA padding information */\n };\n \n /**\n", "prefixes": [ "RFC", "1/6" ] }