Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77079/?format=api
{ "id": 77079, "url": "https://patches.dpdk.org/api/patches/77079/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1599668795-11278-1-git-send-email-marchana@marvell.com/", "project": { "id": 1, "url": "https://patches.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": "<1599668795-11278-1-git-send-email-marchana@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1599668795-11278-1-git-send-email-marchana@marvell.com", "date": "2020-09-09T16:26:35", "name": "examples/fips_validation: fix req file version incompatibility", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6fe4ed62b5c2331e485d1e35f5485473b2476958", "submitter": { "id": 1515, "url": "https://patches.dpdk.org/api/people/1515/?format=api", "name": "Archana Muniganti", "email": "marchana@marvell.com" }, "delegate": { "id": 6690, "url": "https://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1599668795-11278-1-git-send-email-marchana@marvell.com/mbox/", "series": [ { "id": 12062, "url": "https://patches.dpdk.org/api/series/12062/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=12062", "date": "2020-09-09T16:26:35", "name": "examples/fips_validation: fix req file version incompatibility", "version": 1, "mbox": "https://patches.dpdk.org/series/12062/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/77079/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/77079/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9C662A04B5;\n\tWed, 9 Sep 2020 18:26:53 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E764E1BF8F;\n\tWed, 9 Sep 2020 18:26:52 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 93BDE1BF8D;\n Wed, 9 Sep 2020 18:26:51 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 089GPUOa022449; Wed, 9 Sep 2020 09:26:50 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n by mx0b-0016f401.pphosted.com with ESMTP id 33ccvr77jb-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 09 Sep 2020 09:26:50 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH02.marvell.com\n (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Wed, 9 Sep 2020 09:26:49 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Wed, 9 Sep 2020 09:26:49 -0700", "from hyd1409.caveonetworks.com (unknown [10.29.45.15])\n by maili.marvell.com (Postfix) with ESMTP id 164083F703F;\n Wed, 9 Sep 2020 09:26:45 -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 : mime-version : content-type; s=pfpt0220;\n bh=vhwNk911efNcVsnTKgePDbqpD6dIKK/tx8fyYkVXKoU=;\n b=Ed/EmgX5M5UMlV7g7Ac4acHmVmd+ov88ks6giSjeFnWz0RJIgG8DVN3axQ2iNMs3w+1M\n F+A2jmhNYVKh/H3WUTA4szDjJmJ2ncb2GIZabo4NEIopMwuYmnmFnGUg3veVTGr3elx+\n Fg3zynG4g2S7unCP8citnXYnf85p7HngVg7hmRUJ8EN7zmvm2jOiCL2EujY9OLBNTCYi\n 7YgdhSVBtmedf3hW9XaQxWSn3JW240UY7UN8UwLMIc/lHXpOfvySiFdlwmM0c3bbIrJc\n Wce+47mfB5zBmA0EDx3N69PNNMiV7NZXTUKF79rvOXnPQGykbWLMHW/U7163uIBj0eaM VQ==", "From": "Archana Muniganti <marchana@marvell.com>", "To": "<roy.fan.zhang@intel.com>, <marko.kovacevic@intel.com>,\n <akhil.goyal@nxp.com>", "CC": "Archana Muniganti <marchana@marvell.com>, <anoobj@marvell.com>,\n <john.mcnamara@intel.com>, <yux.jiang@intel.com>,\n <qian.q.xu@intel.com>, <dev@dpdk.org>, <stable@dpdk.org>", "Date": "Wed, 9 Sep 2020 21:56:35 +0530", "Message-ID": "<1599668795-11278-1-git-send-email-marchana@marvell.com>", "X-Mailer": "git-send-email 1.8.3.1", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687\n definitions=2020-09-09_12:2020-09-09,\n 2020-09-09 signatures=0", "Subject": "[dpdk-dev] [PATCH] examples/fips_validation: fix req file version\n\tincompatibility", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Separate out CAVS request file version 21.4 code to support\nlower versions.\n\nFixes: 32440cdf2af9 (\"examples/fips_validation: fix parsing of TDES vectors\")\nFixes: 2b84d2bd47df (\"examples/fips_validation: fix count overwrite for TDES\")\n\nSigned-off-by: Archana Muniganti <marchana@marvell.com>\n---\n examples/fips_validation/fips_validation.c | 42 ++++++++++++++++++++++--------\n examples/fips_validation/fips_validation.h | 1 +\n examples/fips_validation/main.c | 6 +++--\n 3 files changed, 36 insertions(+), 13 deletions(-)", "diff": "diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c\nindex 9bdf257..317f6c9 100644\n--- a/examples/fips_validation/fips_validation.c\n+++ b/examples/fips_validation/fips_validation.c\n@@ -92,6 +92,15 @@\n \treturn -ENOMEM;\n }\n \n+static void\n+fips_test_parse_version(void)\n+{\n+\tint len = strlen(info.vec[0]);\n+\tchar *ptr = info.vec[0];\n+\n+\tinfo.version = strtof(ptr + len - 4, NULL);\n+}\n+\n static int\n fips_test_parse_header(void)\n {\n@@ -106,7 +115,10 @@\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tfor (i = 0; i < info.nb_vec_lines; i++) {\n+\tif (info.nb_vec_lines)\n+\t\tfips_test_parse_version();\n+\n+\tfor (i = 1; i < info.nb_vec_lines; i++) {\n \t\tif (!algo_parsed) {\n \t\t\tif (strstr(info.vec[i], \"AESVS\")) {\n \t\t\t\talgo_parsed = 1;\n@@ -344,6 +356,8 @@\n \tuint32_t interim_cnt = 0;\n \tint ret;\n \n+\tinfo.vec_start_off = 0;\n+\n \tif (info.interim_callbacks) {\n \t\tfor (i = 0; i < info.nb_vec_lines; i++) {\n \t\t\tis_interim = 0;\n@@ -365,17 +379,24 @@\n \t\t}\n \t}\n \n-\tinfo.vec_start_off = interim_cnt;\n-\n \tif (interim_cnt) {\n-\t\tfor (i = 0; i < interim_cnt; i++)\n-\t\t\tfprintf(info.fp_wr, \"%s\\n\", info.vec[i]);\n-\t\tfprintf(info.fp_wr, \"\\n\");\n-\n-\t\tif (info.nb_vec_lines == interim_cnt)\n+\t\tif (info.version == 21.4f) {\n+\t\t\tfor (i = 0; i < interim_cnt; i++)\n+\t\t\t\tfprintf(info.fp_wr, \"%s\\n\", info.vec[i]);\n+\t\t\tfprintf(info.fp_wr, \"\\n\");\n+\n+\t\t\tif (info.nb_vec_lines == interim_cnt)\n+\t\t\t\treturn 1;\n+\t\t} else {\n+\t\t\tfor (i = 0; i < info.nb_vec_lines; i++)\n+\t\t\t\tfprintf(info.fp_wr, \"%s\\n\", info.vec[i]);\n+\t\t\tfprintf(info.fp_wr, \"\\n\");\n \t\t\treturn 1;\n+\t\t}\n \t}\n \n+\tinfo.vec_start_off = interim_cnt;\n+\n \tfor (i = info.vec_start_off; i < info.nb_vec_lines; i++) {\n \t\tfor (j = 0; info.callbacks[j].key != NULL; j++)\n \t\t\tif (strstr(info.vec[i], info.callbacks[j].key)) {\n@@ -640,7 +661,7 @@\n \n \tcb = &info.writeback_callbacks[0];\n \n-\tif (!(strstr(info.vec[0], cb->key))) {\n+\tif ((info.version == 21.4f) && (!(strstr(info.vec[0], cb->key)))) {\n \t\tfprintf(info.fp_wr, \"%s%u\\n\", cb->key, count);\n \t\ti = 0;\n \t} else {\n@@ -648,9 +669,8 @@\n \t\t\t\tcount);\n \t\ti = 1;\n \t}\n-\tsnprintf(info.vec[0], strlen(info.vec[0]) + 4, \"%s%u\", cb->key, count);\n \n-\tfor (i = 1; i < info.nb_vec_lines; i++) {\n+\tfor (; i < info.nb_vec_lines; i++) {\n \t\tfor (j = 1; info.writeback_callbacks[j].key != NULL; j++) {\n \t\t\tcb = &info.writeback_callbacks[j];\n \t\t\tif (strstr(info.vec[i], cb->key)) {\ndiff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h\nindex 75fa555..a25958d 100644\n--- a/examples/fips_validation/fips_validation.h\n+++ b/examples/fips_validation/fips_validation.h\n@@ -165,6 +165,7 @@ struct fips_test_interim_info {\n \tuint32_t nb_vec_lines;\n \tchar device_name[MAX_STRING_SIZE];\n \tchar file_name[MAX_STRING_SIZE];\n+\tfloat version;\n \n \tunion {\n \t\tstruct aesavs_interim_data aes_data;\ndiff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c\nindex efd32a8..6edb83e 100644\n--- a/examples/fips_validation/main.c\n+++ b/examples/fips_validation/main.c\n@@ -1070,10 +1070,12 @@ struct fips_test_ops {\n \tint test_mode = info.interim_info.tdes_data.test_mode;\n \n \tfor (i = 0; i < TDES_EXTERN_ITER; i++) {\n-\t\tif (i == 0) {\n+\t\tif ((i == 0) && (info.version == 21.4f)) {\n \t\t\tif (!(strstr(info.vec[0], \"COUNT\")))\n \t\t\t\tfprintf(info.fp_wr, \"%s%u\\n\", \"COUNT = \", 0);\n-\t\t} else\n+\t\t}\n+\n+\t\tif (i != 0)\n \t\t\tupdate_info_vec(i);\n \n \t\tfips_test_write_one_case();\n", "prefixes": [] }