Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 131994,
    "url": "http://patchwork.dpdk.org/api/patches/131994/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230927113734.1244-3-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": "<20230927113734.1244-3-gmuthukrishn@marvell.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20230927113734.1244-3-gmuthukrishn@marvell.com",
    "date": "2023-09-27T11:37:29",
    "name": "[v2,2/7] cryptodev: set private and public keys in EC session",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "277bbc2ece18c2c723bcc364cb986ae4363087a3",
    "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/20230927113734.1244-3-gmuthukrishn@marvell.com/mbox/",
    "series": [
        {
            "id": 29653,
            "url": "http://patchwork.dpdk.org/api/series/29653/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29653",
            "date": "2023-09-27T11:37:27",
            "name": "cryptodev: support digest message in SM2",
            "version": 2,
            "mbox": "http://patchwork.dpdk.org/series/29653/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/131994/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/131994/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 475C442651;\n\tWed, 27 Sep 2023 13:38:00 +0200 (CEST)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A017B4068E;\n\tWed, 27 Sep 2023 13:37:54 +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 722B740685\n for <dev@dpdk.org>; Wed, 27 Sep 2023 13:37:53 +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 38R1PYLu029393; Wed, 27 Sep 2023 04:37:52 -0700",
            "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3t9yhm68dr-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 27 Sep 2023 04:37:52 -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 Wed, 27 Sep 2023 04:37:50 -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; Wed, 27 Sep 2023 04:37:49 -0700",
            "from BG-LT91401.marvell.com (BG-LT91401.marvell.com [10.28.168.34])\n by maili.marvell.com (Postfix) with ESMTP id 4D2BA3F709D;\n Wed, 27 Sep 2023 04:37:47 -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=KZ0kYkIFxk4A2x/UNqqwHFW8b9WfnN9kfHe/sOgvIs0=;\n b=HqKi2Wo1CsjfEJo09Xv/KyzCjD9eV8dMVt0uAhLNZpoWpGulAvySeDSSJNNReDULB6n6\n /5hccYvi6iTramIYB4xR02VjNVcuQVTLQM6FUnBIdjyRayMrUNIGZmOx50p4uITYEgqR\n zDiNMGP8cfOYEcHs28eoyza+MxyXT/VQdknKoXb0SjiJ4eD1McuIdZvSHijgsDtvI1oD\n A44af1V622yP5se6zUANp095BPtgdLY8HGpwbEUAkLxwpG4w5KN0nwPEmE3iq8gQbhle\n YFfI85+t/7Mkj5SFW1NRgm/o636lL30XTIMizKMiLNlfsTBqgiGbCZD0sS5QZ5dnIVR+ 2w==",
        "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>, Gowrishankar Muthukrishnan\n <gmuthukrishn@marvell.com>",
        "Subject": "[PATCH v2 2/7] cryptodev: set private and public keys in EC session",
        "Date": "Wed, 27 Sep 2023 17:07:29 +0530",
        "Message-ID": "<20230927113734.1244-3-gmuthukrishn@marvell.com>",
        "X-Mailer": "git-send-email 2.21.0",
        "In-Reply-To": "<20230927113734.1244-1-gmuthukrishn@marvell.com>",
        "References": "<cover.1691658879.git.gmuthukrishn@marvell.com>\n <20230927113734.1244-1-gmuthukrishn@marvell.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Content-Type": "text/plain",
        "X-Proofpoint-GUID": "f9cv3HMI8oVafsceEwtLCe5Tc8C9DozG",
        "X-Proofpoint-ORIG-GUID": "f9cv3HMI8oVafsceEwtLCe5Tc8C9DozG",
        "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-27_06,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": "Set EC private and public keys into xform so that, it can be\nmaintained per session.\n\nSigned-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>\n---\n app/test/test_cryptodev_asym.c               | 121 ++++++----\n drivers/common/cnxk/roc_ae.h                 |  18 ++\n drivers/common/cpt/cpt_mcode_defines.h       |  18 ++\n drivers/common/cpt/cpt_ucode_asym.h          |  22 +-\n drivers/crypto/cnxk/cnxk_ae.h                | 235 ++++++++++++++++++-\n drivers/crypto/openssl/rte_openssl_pmd.c     |  53 +----\n drivers/crypto/openssl/rte_openssl_pmd_ops.c |  38 ++-\n drivers/crypto/qat/qat_asym.c                |   6 +-\n examples/fips_validation/main.c              |  14 +-\n lib/cryptodev/rte_crypto_asym.h              |  28 +--\n 10 files changed, 409 insertions(+), 144 deletions(-)",
    "diff": "diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c\nindex 9820b80f7e..0e7a9b5460 100644\n--- a/app/test/test_cryptodev_asym.c\n+++ b/app/test/test_cryptodev_asym.c\n@@ -1503,6 +1503,12 @@ test_ecdsa_sign_verify(enum curve curve_id)\n \txform.next = NULL;\n \txform.xform_type = RTE_CRYPTO_ASYM_XFORM_ECDSA;\n \txform.ec.curve_id = input_params.curve;\n+\txform.ec.pkey.data = input_params.pkey.data;\n+\txform.ec.pkey.length = input_params.pkey.length;\n+\txform.ec.q.x.data = input_params.pubkey_qx.data;\n+\txform.ec.q.x.length = input_params.pubkey_qx.length;\n+\txform.ec.q.y.data = input_params.pubkey_qy.data;\n+\txform.ec.q.y.length = input_params.pubkey_qy.length;\n \n \tret = rte_cryptodev_asym_session_create(dev_id, &xform, sess_mpool, &sess);\n \tif (ret < 0) {\n@@ -1524,8 +1530,6 @@ test_ecdsa_sign_verify(enum curve curve_id)\n \top->asym->ecdsa.message.length = input_params.digest.length;\n \top->asym->ecdsa.k.data = input_params.scalar.data;\n \top->asym->ecdsa.k.length = input_params.scalar.length;\n-\top->asym->ecdsa.pkey.data = input_params.pkey.data;\n-\top->asym->ecdsa.pkey.length = input_params.pkey.length;\n \n \t/* Init out buf */\n \top->asym->ecdsa.r.data = output_buf_r;\n@@ -1582,10 +1586,6 @@ test_ecdsa_sign_verify(enum curve curve_id)\n \n \t/* Populate op with operational details */\n \top->asym->ecdsa.op_type = RTE_CRYPTO_ASYM_OP_VERIFY;\n-\top->asym->ecdsa.q.x.data = input_params.pubkey_qx.data;\n-\top->asym->ecdsa.q.x.length = input_params.pubkey_qx.length;\n-\top->asym->ecdsa.q.y.data = input_params.pubkey_qy.data;\n-\top->asym->ecdsa.q.y.length = input_params.pubkey_qx.length;\n \top->asym->ecdsa.r.data = asym_op->ecdsa.r.data;\n \top->asym->ecdsa.r.length = asym_op->ecdsa.r.length;\n \top->asym->ecdsa.s.data = asym_op->ecdsa.s.data;\n@@ -1653,10 +1653,10 @@ test_ecpm(enum curve curve_id)\n \tstruct crypto_testsuite_ecpm_params input_params;\n \tvoid *sess = NULL;\n \tuint8_t dev_id = ts_params->valid_devs[0];\n+\tstruct rte_crypto_asym_xform xform = {0};\n \tstruct rte_crypto_op *result_op = NULL;\n \tuint8_t output_buf_x[TEST_DATA_SIZE];\n \tuint8_t output_buf_y[TEST_DATA_SIZE];\n-\tstruct rte_crypto_asym_xform xform;\n \tstruct rte_crypto_asym_op *asym_op;\n \tstruct rte_cryptodev_info dev_info;\n \tstruct rte_crypto_op *op = NULL;\n@@ -1838,7 +1838,13 @@ _test_sm2_sign(bool rnd_secret)\n \t/* Setup asym xform */\n \txform.next = NULL;\n \txform.xform_type = RTE_CRYPTO_ASYM_XFORM_SM2;\n-\txform.sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\txform.ec.curve_id = input_params.curve;\n+\txform.ec.pkey.data = input_params.pkey.data;\n+\txform.ec.pkey.length = input_params.pkey.length;\n+\txform.ec.q.x.data = input_params.pubkey_qx.data;\n+\txform.ec.q.x.length = input_params.pubkey_qx.length;\n+\txform.ec.q.y.data = input_params.pubkey_qy.data;\n+\txform.ec.q.y.length = input_params.pubkey_qy.length;\n \n \tret = rte_cryptodev_asym_session_create(dev_id, &xform, sess_mpool, &sess);\n \tif (ret < 0) {\n@@ -1856,16 +1862,23 @@ _test_sm2_sign(bool rnd_secret)\n \n \t/* Populate op with operational details */\n \tasym_op->sm2.op_type = RTE_CRYPTO_ASYM_OP_SIGN;\n-\tasym_op->sm2.message.data = input_params.message.data;\n-\tasym_op->sm2.message.length = input_params.message.length;\n-\tasym_op->sm2.pkey.data = input_params.pkey.data;\n-\tasym_op->sm2.pkey.length = input_params.pkey.length;\n-\tasym_op->sm2.q.x.data = input_params.pubkey_qx.data;\n-\tasym_op->sm2.q.x.length = input_params.pubkey_qx.length;\n-\tasym_op->sm2.q.y.data = input_params.pubkey_qy.data;\n-\tasym_op->sm2.q.y.length = input_params.pubkey_qy.length;\n-\tasym_op->sm2.id.data = input_params.id.data;\n-\tasym_op->sm2.id.length = input_params.id.length;\n+\tif (rte_cryptodev_asym_xform_capability_check_hash(capa, RTE_CRYPTO_AUTH_SM3))\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\telse\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_NULL;\n+\n+\tif (asym_op->sm2.hash == RTE_CRYPTO_AUTH_SM3) {\n+\t\tasym_op->sm2.message.data = input_params.message.data;\n+\t\tasym_op->sm2.message.length = input_params.message.length;\n+\t\tasym_op->sm2.id.data = input_params.id.data;\n+\t\tasym_op->sm2.id.length = input_params.id.length;\n+\t} else {\n+\t\tasym_op->sm2.message.data = input_params.digest.data;\n+\t\tasym_op->sm2.message.length = input_params.digest.length;\n+\t\tasym_op->sm2.id.data = NULL;\n+\t\tasym_op->sm2.id.length = 0;\n+\t}\n+\n \tif (rnd_secret) {\n \t\tasym_op->sm2.k.data = NULL;\n \t\tasym_op->sm2.k.length = 0;\n@@ -2019,7 +2032,13 @@ test_sm2_verify(void)\n \t/* Setup asym xform */\n \txform.next = NULL;\n \txform.xform_type = RTE_CRYPTO_ASYM_XFORM_SM2;\n-\txform.sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\txform.ec.curve_id = input_params.curve;\n+\txform.ec.pkey.data = input_params.pkey.data;\n+\txform.ec.pkey.length = input_params.pkey.length;\n+\txform.ec.q.x.data = input_params.pubkey_qx.data;\n+\txform.ec.q.x.length = input_params.pubkey_qx.length;\n+\txform.ec.q.y.data = input_params.pubkey_qy.data;\n+\txform.ec.q.y.length = input_params.pubkey_qy.length;\n \n \tret = rte_cryptodev_asym_session_create(dev_id, &xform, sess_mpool, &sess);\n \tif (ret < 0) {\n@@ -2037,14 +2056,23 @@ test_sm2_verify(void)\n \n \t/* Populate op with operational details */\n \tasym_op->sm2.op_type = RTE_CRYPTO_ASYM_OP_VERIFY;\n-\tasym_op->sm2.message.data = input_params.message.data;\n-\tasym_op->sm2.message.length = input_params.message.length;\n-\tasym_op->sm2.pkey.data = input_params.pkey.data;\n-\tasym_op->sm2.pkey.length = input_params.pkey.length;\n-\tasym_op->sm2.q.x.data = input_params.pubkey_qx.data;\n-\tasym_op->sm2.q.x.length = input_params.pubkey_qx.length;\n-\tasym_op->sm2.q.y.data = input_params.pubkey_qy.data;\n-\tasym_op->sm2.q.y.length = input_params.pubkey_qy.length;\n+\tif (rte_cryptodev_asym_xform_capability_check_hash(capa, RTE_CRYPTO_AUTH_SM3))\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\telse\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_NULL;\n+\n+\tif (asym_op->sm2.hash == RTE_CRYPTO_AUTH_SM3) {\n+\t\tasym_op->sm2.message.data = input_params.message.data;\n+\t\tasym_op->sm2.message.length = input_params.message.length;\n+\t\tasym_op->sm2.id.data = input_params.id.data;\n+\t\tasym_op->sm2.id.length = input_params.id.length;\n+\t} else {\n+\t\tasym_op->sm2.message.data = input_params.digest.data;\n+\t\tasym_op->sm2.message.length = input_params.digest.length;\n+\t\tasym_op->sm2.id.data = NULL;\n+\t\tasym_op->sm2.id.length = 0;\n+\t}\n+\n \tasym_op->sm2.r.data = input_params.sign_r.data;\n \tasym_op->sm2.r.length = input_params.sign_r.length;\n \tasym_op->sm2.s.data = input_params.sign_s.data;\n@@ -2120,7 +2148,13 @@ _test_sm2_enc(bool rnd_secret)\n \t/* Setup asym xform */\n \txform.next = NULL;\n \txform.xform_type = RTE_CRYPTO_ASYM_XFORM_SM2;\n-\txform.sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\txform.ec.curve_id = input_params.curve;\n+\txform.ec.pkey.data = input_params.pkey.data;\n+\txform.ec.pkey.length = input_params.pkey.length;\n+\txform.ec.q.x.data = input_params.pubkey_qx.data;\n+\txform.ec.q.x.length = input_params.pubkey_qx.length;\n+\txform.ec.q.y.data = input_params.pubkey_qy.data;\n+\txform.ec.q.y.length = input_params.pubkey_qy.length;\n \n \tret = rte_cryptodev_asym_session_create(dev_id, &xform, sess_mpool, &sess);\n \tif (ret < 0) {\n@@ -2138,14 +2172,14 @@ _test_sm2_enc(bool rnd_secret)\n \n \t/* Populate op with operational details */\n \tasym_op->sm2.op_type = RTE_CRYPTO_ASYM_OP_ENCRYPT;\n+\tif (rte_cryptodev_asym_xform_capability_check_hash(capa, RTE_CRYPTO_AUTH_SM3))\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\telse\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_NULL;\n+\n \tasym_op->sm2.message.data = input_params.message.data;\n \tasym_op->sm2.message.length = input_params.message.length;\n-\tasym_op->sm2.pkey.data = input_params.pkey.data;\n-\tasym_op->sm2.pkey.length = input_params.pkey.length;\n-\tasym_op->sm2.q.x.data = input_params.pubkey_qx.data;\n-\tasym_op->sm2.q.x.length = input_params.pubkey_qx.length;\n-\tasym_op->sm2.q.y.data = input_params.pubkey_qy.data;\n-\tasym_op->sm2.q.y.length = input_params.pubkey_qy.length;\n+\n \tif (rnd_secret) {\n \t\tasym_op->sm2.k.data = NULL;\n \t\tasym_op->sm2.k.length = 0;\n@@ -2299,7 +2333,13 @@ test_sm2_dec(void)\n \t/* Setup asym xform */\n \txform.next = NULL;\n \txform.xform_type = RTE_CRYPTO_ASYM_XFORM_SM2;\n-\txform.sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\txform.ec.curve_id = input_params.curve;\n+\txform.ec.pkey.data = input_params.pkey.data;\n+\txform.ec.pkey.length = input_params.pkey.length;\n+\txform.ec.q.x.data = input_params.pubkey_qx.data;\n+\txform.ec.q.x.length = input_params.pubkey_qx.length;\n+\txform.ec.q.y.data = input_params.pubkey_qy.data;\n+\txform.ec.q.y.length = input_params.pubkey_qy.length;\n \n \tret = rte_cryptodev_asym_session_create(dev_id, &xform, sess_mpool, &sess);\n \tif (ret < 0) {\n@@ -2317,14 +2357,13 @@ test_sm2_dec(void)\n \n \t/* Populate op with operational details */\n \tasym_op->sm2.op_type = RTE_CRYPTO_ASYM_OP_DECRYPT;\n+\tif (rte_cryptodev_asym_xform_capability_check_hash(capa, RTE_CRYPTO_AUTH_SM3))\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_SM3;\n+\telse\n+\t\tasym_op->sm2.hash = RTE_CRYPTO_AUTH_NULL;\n+\n \tasym_op->sm2.cipher.data = input_params.cipher.data;\n \tasym_op->sm2.cipher.length = input_params.cipher.length;\n-\tasym_op->sm2.pkey.data = input_params.pkey.data;\n-\tasym_op->sm2.pkey.length = input_params.pkey.length;\n-\tasym_op->sm2.q.x.data = input_params.pubkey_qx.data;\n-\tasym_op->sm2.q.x.length = input_params.pubkey_qx.length;\n-\tasym_op->sm2.q.y.data = input_params.pubkey_qy.data;\n-\tasym_op->sm2.q.y.length = input_params.pubkey_qy.length;\n \n \t/* Init out buf */\n \tasym_op->sm2.message.data = output_buf_m;\ndiff --git a/drivers/common/cnxk/roc_ae.h b/drivers/common/cnxk/roc_ae.h\nindex c972878eff..d8ad0129b1 100644\n--- a/drivers/common/cnxk/roc_ae.h\n+++ b/drivers/common/cnxk/roc_ae.h\n@@ -67,6 +67,24 @@ struct roc_ae_ec_group {\n struct roc_ae_ec_ctx {\n \t/* Prime length defined by microcode for EC operations */\n \tuint8_t curveid;\n+\n+\t/* Private key */\n+\tstruct {\n+\t\tuint8_t data[66];\n+\t\tunsigned int length;\n+\t} pkey;\n+\n+\t/* Public key */\n+\tstruct {\n+\t\tstruct {\n+\t\t\tuint8_t data[66];\n+\t\t\tunsigned int length;\n+\t\t} x;\n+\t\tstruct {\n+\t\t\tuint8_t data[66];\n+\t\t\tunsigned int length;\n+\t\t} y;\n+\t} q;\n };\n \n /* Buffer pointer */\ndiff --git a/drivers/common/cpt/cpt_mcode_defines.h b/drivers/common/cpt/cpt_mcode_defines.h\nindex e6dcb7674c..b337dbc68d 100644\n--- a/drivers/common/cpt/cpt_mcode_defines.h\n+++ b/drivers/common/cpt/cpt_mcode_defines.h\n@@ -364,6 +364,24 @@ struct cpt_ec_group {\n struct cpt_asym_ec_ctx {\n \t/* Prime length defined by microcode for EC operations */\n \tuint8_t curveid;\n+\n+\t/* Private key */\n+\tstruct {\n+\t\tuint8_t data[66];\n+\t\tunsigned int length;\n+\t} pkey;\n+\n+\t/* Public key */\n+\tstruct {\n+\t\tstruct {\n+\t\t\tuint8_t data[66];\n+\t\t\tunsigned int length;\n+\t\t} x;\n+\t\tstruct {\n+\t\t\tuint8_t data[66];\n+\t\t\tunsigned int length;\n+\t\t} y;\n+\t} q;\n };\n \n struct cpt_asym_sess_misc {\ndiff --git a/drivers/common/cpt/cpt_ucode_asym.h b/drivers/common/cpt/cpt_ucode_asym.h\nindex 1105a0c125..e1034bbeb4 100644\n--- a/drivers/common/cpt/cpt_ucode_asym.h\n+++ b/drivers/common/cpt/cpt_ucode_asym.h\n@@ -633,12 +633,13 @@ static __rte_always_inline void\n cpt_ecdsa_sign_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \t\t    struct asym_op_params *ecdsa_params,\n \t\t    uint64_t fpm_table_iova,\n-\t\t    uint8_t curveid)\n+\t\t    struct cpt_asym_sess_misc *sess)\n {\n \tstruct cpt_request_info *req = ecdsa_params->req;\n \tuint16_t message_len = ecdsa->message.length;\n \tphys_addr_t mphys = ecdsa_params->meta_buf;\n-\tuint16_t pkey_len = ecdsa->pkey.length;\n+\tuint16_t pkey_len = sess->ec_ctx.pkey.length;\n+\tuint8_t curveid = sess->ec_ctx.curveid;\n \tuint16_t p_align, k_align, m_align;\n \tuint16_t k_len = ecdsa->k.length;\n \tuint16_t order_len, prime_len;\n@@ -688,7 +689,7 @@ cpt_ecdsa_sign_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \tmemcpy(dptr + o_offset, ec_grp[curveid].order.data, order_len);\n \tdptr += p_align;\n \n-\tmemcpy(dptr + pk_offset, ecdsa->pkey.data, pkey_len);\n+\tmemcpy(dptr + pk_offset, sess->ec_ctx.pkey.data, pkey_len);\n \tdptr += p_align;\n \n \tmemcpy(dptr, ecdsa->message.data, message_len);\n@@ -735,14 +736,15 @@ static __rte_always_inline void\n cpt_ecdsa_verify_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \t\t      struct asym_op_params *ecdsa_params,\n \t\t      uint64_t fpm_table_iova,\n-\t\t      uint8_t curveid)\n+\t\t      struct cpt_asym_sess_misc *sess)\n {\n \tstruct cpt_request_info *req = ecdsa_params->req;\n \tuint32_t message_len = ecdsa->message.length;\n \tphys_addr_t mphys = ecdsa_params->meta_buf;\n+\tuint16_t qx_len = sess->ec_ctx.q.x.length;\n+\tuint16_t qy_len = sess->ec_ctx.q.y.length;\n+\tuint8_t curveid = sess->ec_ctx.curveid;\n \tuint16_t o_offset, r_offset, s_offset;\n-\tuint16_t qx_len = ecdsa->q.x.length;\n-\tuint16_t qy_len = ecdsa->q.y.length;\n \tuint16_t r_len = ecdsa->r.length;\n \tuint16_t s_len = ecdsa->s.length;\n \tuint16_t order_len, prime_len;\n@@ -802,10 +804,10 @@ cpt_ecdsa_verify_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \tmemcpy(dptr, ec_grp[curveid].prime.data, prime_len);\n \tdptr += p_align;\n \n-\tmemcpy(dptr + qx_offset, ecdsa->q.x.data, qx_len);\n+\tmemcpy(dptr + qx_offset, sess->ec_ctx.q.x.data, qx_len);\n \tdptr += p_align;\n \n-\tmemcpy(dptr + qy_offset, ecdsa->q.y.data, qy_len);\n+\tmemcpy(dptr + qy_offset, sess->ec_ctx.q.y.data, qy_len);\n \tdptr += p_align;\n \n \tmemcpy(dptr, ec_grp[curveid].consta.data, prime_len);\n@@ -852,10 +854,10 @@ cpt_enqueue_ecdsa_op(struct rte_crypto_op *op,\n \tuint8_t curveid = sess->ec_ctx.curveid;\n \n \tif (ecdsa->op_type == RTE_CRYPTO_ASYM_OP_SIGN)\n-\t\tcpt_ecdsa_sign_prep(ecdsa, params, fpm_iova[curveid], curveid);\n+\t\tcpt_ecdsa_sign_prep(ecdsa, params, fpm_iova[curveid], sess);\n \telse if (ecdsa->op_type == RTE_CRYPTO_ASYM_OP_VERIFY)\n \t\tcpt_ecdsa_verify_prep(ecdsa, params, fpm_iova[curveid],\n-\t\t\t\t      curveid);\n+\t\t\t\t      sess);\n \telse {\n \t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n \t\treturn -EINVAL;\ndiff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h\nindex 7ad259b7f4..8fdb45177b 100644\n--- a/drivers/crypto/cnxk/cnxk_ae.h\n+++ b/drivers/crypto/cnxk/cnxk_ae.h\n@@ -198,6 +198,21 @@ cnxk_ae_fill_ec_params(struct cnxk_ae_sess *sess,\n \t\treturn -EINVAL;\n \t}\n \n+\tif (xform->xform_type == RTE_CRYPTO_ASYM_XFORM_ECPM)\n+\t\treturn 0;\n+\n+\tec->pkey.length = xform->ec.pkey.length;\n+\tif (xform->ec.pkey.length)\n+\t\trte_memcpy(ec->pkey.data, xform->ec.pkey.data, xform->ec.pkey.length);\n+\n+\tec->q.x.length = xform->ec.q.x.length;\n+\tif (xform->ec.q.x.length)\n+\t\trte_memcpy(ec->q.x.data, xform->ec.q.x.data, xform->ec.q.x.length);\n+\n+\tec->q.y.length = xform->ec.q.y.length;\n+\tif (xform->ec.q.y.length)\n+\t\trte_memcpy(ec->q.y.data, xform->ec.q.y.data, xform->ec.q.y.length);\n+\n \treturn 0;\n }\n \n@@ -502,10 +517,11 @@ static __rte_always_inline void\n cnxk_ae_ecdsa_sign_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \t\t\tstruct roc_ae_buf_ptr *meta_buf,\n \t\t\tuint64_t fpm_table_iova, struct roc_ae_ec_group *ec_grp,\n-\t\t\tuint8_t curveid, struct cpt_inst_s *inst)\n+\t\t\tstruct cnxk_ae_sess *sess, struct cpt_inst_s *inst)\n {\n \tuint16_t message_len = ecdsa->message.length;\n-\tuint16_t pkey_len = ecdsa->pkey.length;\n+\tuint16_t pkey_len = sess->ec_ctx.pkey.length;\n+\tuint8_t curveid = sess->ec_ctx.curveid;\n \tuint16_t p_align, k_align, m_align;\n \tuint16_t k_len = ecdsa->k.length;\n \tuint16_t order_len, prime_len;\n@@ -555,7 +571,7 @@ cnxk_ae_ecdsa_sign_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \tmemcpy(dptr + o_offset, ec_grp->order.data, order_len);\n \tdptr += p_align;\n \n-\tmemcpy(dptr + pk_offset, ecdsa->pkey.data, pkey_len);\n+\tmemcpy(dptr + pk_offset, sess->ec_ctx.pkey.data, pkey_len);\n \tdptr += p_align;\n \n \tmemcpy(dptr, ecdsa->message.data, message_len);\n@@ -579,17 +595,99 @@ cnxk_ae_ecdsa_sign_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \tinst->rptr = (uintptr_t)dptr;\n }\n \n+static __rte_always_inline void\n+cnxk_ae_sm2_sign_prep(struct rte_crypto_sm2_op_param *sm2,\n+\t\t\tstruct roc_ae_buf_ptr *meta_buf,\n+\t\t\tuint64_t fpm_table_iova, struct roc_ae_ec_group *ec_grp,\n+\t\t\tstruct cnxk_ae_sess *sess, struct cpt_inst_s *inst)\n+{\n+\tuint16_t message_len = sm2->message.length;\n+\tuint16_t pkey_len = sess->ec_ctx.pkey.length;\n+\tuint16_t p_align, k_align, m_align;\n+\tuint16_t k_len = sm2->k.length;\n+\tuint16_t order_len, prime_len;\n+\tuint16_t o_offset, pk_offset;\n+\tunion cpt_inst_w4 w4;\n+\tuint16_t dlen;\n+\tuint8_t *dptr;\n+\n+\tprime_len = ec_grp->prime.length;\n+\torder_len = ec_grp->order.length;\n+\n+\t/* Truncate input length to curve prime length */\n+\tif (message_len > prime_len)\n+\t\tmessage_len = prime_len;\n+\tm_align = RTE_ALIGN_CEIL(message_len, 8);\n+\n+\tp_align = RTE_ALIGN_CEIL(prime_len, 8);\n+\tk_align = RTE_ALIGN_CEIL(k_len, 8);\n+\n+\t/* Set write offset for order and private key */\n+\to_offset = prime_len - order_len;\n+\tpk_offset = p_align - pkey_len;\n+\n+\t/* Input buffer */\n+\tdptr = meta_buf->vaddr;\n+\tinst->dptr = (uintptr_t)dptr;\n+\n+\t/*\n+\t * Set dlen = sum(sizeof(fpm address), ROUNDUP8(scalar len, input len),\n+\t * ROUNDUP8(priv key len, prime len, order len)).\n+\t * Please note, private key, order cannot exceed prime\n+\t * length i.e 3 * p_align.\n+\t */\n+\tdlen = sizeof(fpm_table_iova) + k_align + m_align + p_align * 5;\n+\n+\tmemset(dptr, 0, dlen);\n+\n+\t*(uint64_t *)dptr = fpm_table_iova;\n+\tdptr += sizeof(fpm_table_iova);\n+\n+\trte_memcpy(dptr, sm2->k.data, k_len);\n+\tdptr += k_align;\n+\n+\trte_memcpy(dptr, ec_grp->prime.data, prime_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr + o_offset, ec_grp->order.data, order_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr + pk_offset, sess->ec_ctx.pkey.data, pkey_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr, sm2->message.data, message_len);\n+\tdptr += m_align;\n+\n+\trte_memcpy(dptr, ec_grp->consta.data, prime_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr, ec_grp->constb.data, prime_len);\n+\tdptr += p_align;\n+\n+\t/* Setup opcodes */\n+\tw4.s.opcode_major = ROC_AE_MAJOR_OP_ECDSA;\n+\tw4.s.opcode_minor = ROC_AE_MINOR_OP_ECDSA_SIGN;\n+\n+\tw4.s.param1 = 2 | 1 << 7 | 1 << 6 | (message_len << 8);\n+\tw4.s.param2 = (p_align << 8) | k_len;\n+\tw4.s.dlen = dlen;\n+\n+\tinst->w4.u64 = w4.u64;\n+\tinst->rptr = (uintptr_t)dptr;\n+}\n+\n static __rte_always_inline void\n cnxk_ae_ecdsa_verify_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \t\t\t  struct roc_ae_buf_ptr *meta_buf,\n \t\t\t  uint64_t fpm_table_iova,\n-\t\t\t  struct roc_ae_ec_group *ec_grp, uint8_t curveid,\n+\t\t\t  struct roc_ae_ec_group *ec_grp, struct cnxk_ae_sess *sess,\n \t\t\t  struct cpt_inst_s *inst)\n {\n \tuint32_t message_len = ecdsa->message.length;\n+\tuint16_t qx_len = sess->ec_ctx.q.x.length;\n+\tuint16_t qy_len = sess->ec_ctx.q.y.length;\n+\tuint8_t curveid = sess->ec_ctx.curveid;\n \tuint16_t o_offset, r_offset, s_offset;\n-\tuint16_t qx_len = ecdsa->q.x.length;\n-\tuint16_t qy_len = ecdsa->q.y.length;\n \tuint16_t r_len = ecdsa->r.length;\n \tuint16_t s_len = ecdsa->s.length;\n \tuint16_t order_len, prime_len;\n@@ -649,10 +747,10 @@ cnxk_ae_ecdsa_verify_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \tmemcpy(dptr, ec_grp->prime.data, prime_len);\n \tdptr += p_align;\n \n-\tmemcpy(dptr + qx_offset, ecdsa->q.x.data, qx_len);\n+\tmemcpy(dptr + qx_offset, sess->ec_ctx.q.x.data, qx_len);\n \tdptr += p_align;\n \n-\tmemcpy(dptr + qy_offset, ecdsa->q.y.data, qy_len);\n+\tmemcpy(dptr + qy_offset, sess->ec_ctx.q.y.data, qy_len);\n \tdptr += p_align;\n \n \tmemcpy(dptr, ec_grp->consta.data, prime_len);\n@@ -673,6 +771,100 @@ cnxk_ae_ecdsa_verify_prep(struct rte_crypto_ecdsa_op_param *ecdsa,\n \tinst->rptr = (uintptr_t)dptr;\n }\n \n+static __rte_always_inline void\n+cnxk_ae_sm2_verify_prep(struct rte_crypto_sm2_op_param *sm2,\n+\t\t\t  struct roc_ae_buf_ptr *meta_buf,\n+\t\t\t  uint64_t fpm_table_iova,\n+\t\t\t  struct roc_ae_ec_group *ec_grp, struct cnxk_ae_sess *sess,\n+\t\t\t  struct cpt_inst_s *inst)\n+{\n+\tuint32_t message_len = sm2->message.length;\n+\tuint16_t o_offset, r_offset, s_offset;\n+\tuint16_t qx_len = sess->ec_ctx.q.x.length;\n+\tuint16_t qy_len = sess->ec_ctx.q.y.length;\n+\tuint16_t r_len = sm2->r.length;\n+\tuint16_t s_len = sm2->s.length;\n+\tuint16_t order_len, prime_len;\n+\tuint16_t qx_offset, qy_offset;\n+\tuint16_t p_align, m_align;\n+\tunion cpt_inst_w4 w4;\n+\tuint16_t dlen;\n+\tuint8_t *dptr;\n+\n+\tprime_len = ec_grp->prime.length;\n+\torder_len = ec_grp->order.length;\n+\n+\t/* Truncate input length to curve prime length */\n+\tif (message_len > prime_len)\n+\t\tmessage_len = prime_len;\n+\n+\tm_align = RTE_ALIGN_CEIL(message_len, 8);\n+\tp_align = RTE_ALIGN_CEIL(prime_len, 8);\n+\n+\t/* Set write offset for sign, order and public key coordinates */\n+\to_offset = prime_len - order_len;\n+\tqx_offset = prime_len - qx_len;\n+\tqy_offset = prime_len - qy_len;\n+\tr_offset = prime_len - r_len;\n+\ts_offset = prime_len - s_len;\n+\n+\t/* Input buffer */\n+\tdptr = meta_buf->vaddr;\n+\tinst->dptr = (uintptr_t)dptr;\n+\n+\t/*\n+\t * Set dlen = sum(sizeof(fpm address), ROUNDUP8(message len),\n+\t * ROUNDUP8(sign len(r and s), public key len(x and y coordinates),\n+\t * prime len, order len)).\n+\t * Please note sign, public key and order can not exceed prime length\n+\t * i.e. 6 * p_align\n+\t */\n+\tdlen = sizeof(fpm_table_iova) + m_align + (8 * p_align);\n+\n+\tmemset(dptr, 0, dlen);\n+\n+\t*(uint64_t *)dptr = fpm_table_iova;\n+\tdptr += sizeof(fpm_table_iova);\n+\n+\trte_memcpy(dptr + r_offset, sm2->r.data, r_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr + s_offset, sm2->s.data, s_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr, sm2->message.data, message_len);\n+\tdptr += m_align;\n+\n+\trte_memcpy(dptr + o_offset, ec_grp->order.data, order_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr, ec_grp->prime.data, prime_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr + qx_offset, sess->ec_ctx.q.x.data, qx_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr + qy_offset, sess->ec_ctx.q.y.data, qy_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr, ec_grp->consta.data, prime_len);\n+\tdptr += p_align;\n+\n+\trte_memcpy(dptr, ec_grp->constb.data, prime_len);\n+\tdptr += p_align;\n+\n+\t/* Setup opcodes */\n+\tw4.s.opcode_major = ROC_AE_MAJOR_OP_ECDSA;\n+\tw4.s.opcode_minor = ROC_AE_MINOR_OP_ECDSA_VERIFY;\n+\n+\tw4.s.param1 = 2 | 1 << 7 | 1 << 6 | (message_len << 8);\n+\tw4.s.param2 = 0;\n+\tw4.s.dlen = dlen;\n+\n+\tinst->w4.u64 = w4.u64;\n+\tinst->rptr = (uintptr_t)dptr;\n+}\n+\n static __rte_always_inline int __rte_hot\n cnxk_ae_enqueue_ecdsa_op(struct rte_crypto_op *op,\n \t\t\t struct roc_ae_buf_ptr *meta_buf,\n@@ -685,10 +877,33 @@ cnxk_ae_enqueue_ecdsa_op(struct rte_crypto_op *op,\n \n \tif (ecdsa->op_type == RTE_CRYPTO_ASYM_OP_SIGN)\n \t\tcnxk_ae_ecdsa_sign_prep(ecdsa, meta_buf, fpm_iova[curveid],\n-\t\t\t\t\tec_grp[curveid], curveid, inst);\n+\t\t\t\t\tec_grp[curveid], sess, inst);\n \telse if (ecdsa->op_type == RTE_CRYPTO_ASYM_OP_VERIFY)\n \t\tcnxk_ae_ecdsa_verify_prep(ecdsa, meta_buf, fpm_iova[curveid],\n-\t\t\t\t\t  ec_grp[curveid], curveid, inst);\n+\t\t\t\t\t  ec_grp[curveid], sess, inst);\n+\telse {\n+\t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n+\t\treturn -EINVAL;\n+\t}\n+\treturn 0;\n+}\n+\n+static __rte_always_inline int __rte_hot\n+cnxk_ae_enqueue_sm2_op(struct rte_crypto_op *op,\n+\t\t\t struct roc_ae_buf_ptr *meta_buf,\n+\t\t\t struct cnxk_ae_sess *sess, uint64_t *fpm_iova,\n+\t\t\t struct roc_ae_ec_group **ec_grp,\n+\t\t\t struct cpt_inst_s *inst)\n+{\n+\tstruct rte_crypto_sm2_op_param *sm2 = &op->asym->sm2;\n+\tuint8_t curveid = sess->ec_ctx.curveid;\n+\n+\tif (sm2->op_type == RTE_CRYPTO_ASYM_OP_SIGN)\n+\t\tcnxk_ae_sm2_sign_prep(sm2, meta_buf, fpm_iova[curveid],\n+\t\t\t\t\tec_grp[curveid], sess, inst);\n+\telse if (sm2->op_type == RTE_CRYPTO_ASYM_OP_VERIFY)\n+\t\tcnxk_ae_sm2_verify_prep(sm2, meta_buf, fpm_iova[curveid],\n+\t\t\t\t\t  ec_grp[curveid], sess, inst);\n \telse {\n \t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n \t\treturn -EINVAL;\ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c\nindex 5e8624cebe..c234882417 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd.c\n@@ -2673,12 +2673,8 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop,\n {\n \tEVP_PKEY_CTX *kctx = NULL, *sctx = NULL, *cctx = NULL;\n \tstruct rte_crypto_asym_op *op = cop->asym;\n-\tOSSL_PARAM_BLD *param_bld = NULL;\n-\tOSSL_PARAM *params = NULL;\n+\tOSSL_PARAM *params = sess->u.sm2.params;\n \tEVP_PKEY *pkey = NULL;\n-\tBIGNUM *pkey_bn = NULL;\n-\tuint8_t pubkey[64];\n-\tsize_t len = 0;\n \tint ret = -1;\n \n \tcop->status = RTE_CRYPTO_OP_STATUS_ERROR;\n@@ -2686,50 +2682,6 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop,\n \tif (cop->asym->sm2.k.data != NULL)\n \t\tgoto err_sm2;\n \n-\tparam_bld = OSSL_PARAM_BLD_new();\n-\tif (!param_bld) {\n-\t\tOPENSSL_LOG(ERR, \"failed to allocate params\\n\");\n-\t\tgoto err_sm2;\n-\t}\n-\n-\tret = OSSL_PARAM_BLD_push_utf8_string(param_bld,\n-\t\tOSSL_PKEY_PARAM_GROUP_NAME, \"SM2\", 0);\n-\tif (!ret) {\n-\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n-\t\tgoto err_sm2;\n-\t}\n-\n-\tpkey_bn = BN_bin2bn((const unsigned char *)op->sm2.pkey.data,\n-\t\t\t\t\t\top->sm2.pkey.length, pkey_bn);\n-\n-\tmemset(pubkey, 0, RTE_DIM(pubkey));\n-\tpubkey[0] = 0x04;\n-\tlen += 1;\n-\tmemcpy(&pubkey[len], op->sm2.q.x.data, op->sm2.q.x.length);\n-\tlen += op->sm2.q.x.length;\n-\tmemcpy(&pubkey[len], op->sm2.q.y.data, op->sm2.q.y.length);\n-\tlen += op->sm2.q.y.length;\n-\n-\tret = OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_PRIV_KEY,\n-\t\t\t\t\t\t\t\t pkey_bn);\n-\tif (!ret) {\n-\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n-\t\tgoto err_sm2;\n-\t}\n-\n-\tret = OSSL_PARAM_BLD_push_octet_string(param_bld,\n-\t\t\tOSSL_PKEY_PARAM_PUB_KEY, pubkey, len);\n-\tif (!ret) {\n-\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n-\t\tgoto err_sm2;\n-\t}\n-\n-\tparams = OSSL_PARAM_BLD_to_param(param_bld);\n-\tif (!params) {\n-\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n-\t\tgoto err_sm2;\n-\t}\n-\n \tswitch (op->sm2.op_type) {\n \tcase RTE_CRYPTO_ASYM_OP_ENCRYPT:\n \t\t{\n@@ -2940,9 +2892,6 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop,\n \tif (pkey)\n \t\tEVP_PKEY_free(pkey);\n \n-\tif (param_bld)\n-\t\tOSSL_PARAM_BLD_free(param_bld);\n-\n \treturn ret;\n }\n \ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c\nindex 2eb450fcfd..2a307aa839 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c\n@@ -1302,11 +1302,11 @@ static int openssl_set_asym_session_parameters(\n #ifndef OPENSSL_NO_SM2\n \t\tOSSL_PARAM_BLD *param_bld = NULL;\n \t\tOSSL_PARAM *params = NULL;\n+\t\tBIGNUM *pkey_bn = NULL;\n+\t\tuint8_t pubkey[64];\n+\t\tsize_t len = 0;\n \t\tint ret = -1;\n \n-\t\tif (xform->sm2.hash != RTE_CRYPTO_AUTH_SM3)\n-\t\t\treturn -1;\n-\n \t\tparam_bld = OSSL_PARAM_BLD_new();\n \t\tif (!param_bld) {\n \t\t\tOPENSSL_LOG(ERR, \"failed to allocate params\\n\");\n@@ -1320,6 +1320,38 @@ static int openssl_set_asym_session_parameters(\n \t\t\tgoto err_sm2;\n \t\t}\n \n+\t\tret = OSSL_PARAM_BLD_push_utf8_string(param_bld,\n+\t\t\t\tOSSL_PKEY_PARAM_GROUP_NAME, \"SM2\", 0);\n+\t\tif (!ret) {\n+\t\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n+\t\t\tgoto err_sm2;\n+\t\t}\n+\n+\t\tpkey_bn = BN_bin2bn((const unsigned char *)xform->ec.pkey.data,\n+\t\t\t\t\t\t\txform->ec.pkey.length, pkey_bn);\n+\n+\t\tret = OSSL_PARAM_BLD_push_BN(param_bld, OSSL_PKEY_PARAM_PRIV_KEY,\n+\t\t\t\t\t\t\t\t\t pkey_bn);\n+\t\tif (!ret) {\n+\t\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n+\t\t\tgoto err_sm2;\n+\t\t}\n+\n+\t\tmemset(pubkey, 0, sizeof(pubkey));\n+\t\tpubkey[0] = 0x04;\n+\t\tlen += 1;\n+\t\tmemcpy(&pubkey[len], xform->ec.q.x.data, xform->ec.q.x.length);\n+\t\tlen += xform->ec.q.x.length;\n+\t\tmemcpy(&pubkey[len], xform->ec.q.y.data, xform->ec.q.y.length);\n+\t\tlen += xform->ec.q.y.length;\n+\n+\t\tret = OSSL_PARAM_BLD_push_octet_string(param_bld,\n+\t\t\t\tOSSL_PKEY_PARAM_PUB_KEY, pubkey, len);\n+\t\tif (!ret) {\n+\t\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\n+\t\t\tgoto err_sm2;\n+\t\t}\n+\n \t\tparams = OSSL_PARAM_BLD_to_param(param_bld);\n \t\tif (!params) {\n \t\t\tOPENSSL_LOG(ERR, \"failed to push params\\n\");\ndiff --git a/drivers/crypto/qat/qat_asym.c b/drivers/crypto/qat/qat_asym.c\nindex 7abd513423..0f196ace30 100644\n--- a/drivers/crypto/qat/qat_asym.c\n+++ b/drivers/crypto/qat/qat_asym.c\n@@ -593,7 +593,7 @@ ecdsa_set_input(struct icp_qat_fw_pke_request *qat_req,\n \t\tqat_func_alignsize =\n \t\t\tRTE_ALIGN_CEIL(qat_function.bytesize, 8);\n \n-\t\tSET_PKE_9A_IN(asym_op->ecdsa.pkey, 0);\n+\t\tSET_PKE_9A_IN(xform->ec.pkey, 0);\n \t\tSET_PKE_9A_IN(asym_op->ecdsa.message, 1);\n \t\tSET_PKE_9A_IN(asym_op->ecdsa.k, 2);\n \t\tSET_PKE_9A_EC(curve[curve_id], b, 3);\n@@ -635,8 +635,8 @@ ecdsa_set_input(struct icp_qat_fw_pke_request *qat_req,\n \t\tSET_PKE_9A_EC(curve[curve_id], n, 7);\n \t\tSET_PKE_9A_EC(curve[curve_id], x, 6);\n \t\tSET_PKE_9A_EC(curve[curve_id], y, 5);\n-\t\tSET_PKE_9A_IN(asym_op->ecdsa.q.x, 4);\n-\t\tSET_PKE_9A_IN(asym_op->ecdsa.q.y, 3);\n+\t\tSET_PKE_9A_IN(xform->ec.q.x, 4);\n+\t\tSET_PKE_9A_IN(xform->ec.q.y, 3);\n \t\tSET_PKE_9A_EC(curve[curve_id], a, 2);\n \t\tSET_PKE_9A_EC(curve[curve_id], b, 1);\n \t\tSET_PKE_9A_EC(curve[curve_id], p, 0);\ndiff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c\nindex fed5596f36..7ae2c6c007 100644\n--- a/examples/fips_validation/main.c\n+++ b/examples/fips_validation/main.c\n@@ -1006,8 +1006,6 @@ prepare_ecdsa_op(void)\n \t\tasym->ecdsa.op_type = RTE_CRYPTO_ASYM_OP_SIGN;\n \t\tasym->ecdsa.message.data = msg.val;\n \t\tasym->ecdsa.message.length = msg.len;\n-\t\tasym->ecdsa.pkey.data = vec.ecdsa.pkey.val;\n-\t\tasym->ecdsa.pkey.length = vec.ecdsa.pkey.len;\n \t\tasym->ecdsa.k.data = vec.ecdsa.k.val;\n \t\tasym->ecdsa.k.length = vec.ecdsa.k.len;\n \n@@ -1029,10 +1027,6 @@ prepare_ecdsa_op(void)\n \t\tasym->ecdsa.op_type = RTE_CRYPTO_ASYM_OP_VERIFY;\n \t\tasym->ecdsa.message.data = msg.val;\n \t\tasym->ecdsa.message.length = msg.len;\n-\t\tasym->ecdsa.q.x.data = vec.ecdsa.qx.val;\n-\t\tasym->ecdsa.q.x.length = vec.ecdsa.qx.len;\n-\t\tasym->ecdsa.q.y.data = vec.ecdsa.qy.val;\n-\t\tasym->ecdsa.q.y.length = vec.ecdsa.qy.len;\n \t\tasym->ecdsa.r.data = vec.ecdsa.r.val;\n \t\tasym->ecdsa.r.length = vec.ecdsa.r.len;\n \t\tasym->ecdsa.s.data = vec.ecdsa.s.val;\n@@ -1570,6 +1564,9 @@ prepare_ecdsa_xform(struct rte_crypto_asym_xform *xform)\n \t\t\t\tinfo.device_name, RTE_CRYPTO_ASYM_OP_SIGN);\n \t\t\treturn -EPERM;\n \t\t}\n+\n+\t\txform->ec.pkey.data = vec.ecdsa.pkey.val;\n+\t\txform->ec.pkey.length = vec.ecdsa.pkey.len;\n \t\tbreak;\n \tcase FIPS_TEST_ASYM_SIGVER:\n \t\tif (!rte_cryptodev_asym_xform_capability_check_optype(cap,\n@@ -1578,6 +1575,11 @@ prepare_ecdsa_xform(struct rte_crypto_asym_xform *xform)\n \t\t\t\tinfo.device_name, RTE_CRYPTO_ASYM_OP_VERIFY);\n \t\t\treturn -EPERM;\n \t\t}\n+\n+\t\txform->ec.q.x.data = vec.ecdsa.qx.val;\n+\t\txform->ec.q.x.length = vec.ecdsa.qx.len;\n+\t\txform->ec.q.y.data = vec.ecdsa.qy.val;\n+\t\txform->ec.q.y.length = vec.ecdsa.qy.len;\n \t\tbreak;\n \tdefault:\n \t\tbreak;\ndiff --git a/lib/cryptodev/rte_crypto_asym.h b/lib/cryptodev/rte_crypto_asym.h\nindex cbcfe1dc26..b72876240c 100644\n--- a/lib/cryptodev/rte_crypto_asym.h\n+++ b/lib/cryptodev/rte_crypto_asym.h\n@@ -376,16 +376,12 @@ struct rte_crypto_dsa_xform {\n struct rte_crypto_ec_xform {\n \tenum rte_crypto_curve_id curve_id;\n \t/**< Pre-defined ec groups */\n-};\n \n-/**\n- * Asymmetric SM2 transform data.\n- *\n- * Structure describing SM2 xform params.\n- */\n-struct rte_crypto_sm2_xform {\n-\tenum rte_crypto_auth_algorithm hash;\n-\t/**< Hash algorithm used in SM2 op. */\n+\trte_crypto_uint pkey;\n+\t/**< Private key */\n+\n+\tstruct rte_crypto_ec_point q;\n+\t/**< Public key */\n };\n \n /**\n@@ -571,11 +567,8 @@ struct rte_crypto_ecdsa_op_param {\n \tenum rte_crypto_asym_op_type op_type;\n \t/**< Signature generation or verification */\n \n-\trte_crypto_uint pkey;\n-\t/**< Private key of the signer for signature generation */\n-\n-\tstruct rte_crypto_ec_point q;\n-\t/**< Public key of the signer for verification */\n+\tenum rte_crypto_auth_algorithm hash;\n+\t/**< Hash algorithm used in EC op. */\n \n \trte_crypto_param message;\n \t/**< Input message digest to be signed or verified */\n@@ -657,11 +650,8 @@ struct rte_crypto_sm2_op_param {\n \tenum rte_crypto_asym_op_type op_type;\n \t/**< Signature generation or verification. */\n \n-\trte_crypto_uint pkey;\n-\t/**< Private key for encryption or sign generation. */\n-\n-\tstruct rte_crypto_ec_point q;\n-\t/**< Public key for decryption or verification. */\n+\tenum rte_crypto_auth_algorithm hash;\n+\t/**< Hash algorithm used in EC op. */\n \n \trte_crypto_param message;\n \t/**<\n",
    "prefixes": [
        "v2",
        "2/7"
    ]
}