From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 70595A04B7; Mon, 21 Sep 2020 09:02:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C892A1D933; Mon, 21 Sep 2020 09:02:52 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id F18DF1C1EF; Mon, 21 Sep 2020 09:02:50 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 08L6p64d003237; Mon, 21 Sep 2020 00:02:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=qubHyGNKStAQ/UAyfRVifPsLMUc1D2AfYLD12qEI3F0=; b=LJsQ4xTknuUGDwKiTxvClKncI5UZOfzOBSIZhNwD/m+bnXmC7howhO9BNBY8u2Cf/vkg KoE3L7hmBz2hOmdvZwEXJVPut5ndKB0GOWHyJTeDWrl61eKfKQxwuXoKCgogoLnpdgSK E+iVdlP1MGez+jdIsgLi1looKC6a21DLpnhBl9rCw1LI5hadPaKU2GG5qPLrlHbIMVFR VbYqVqAxjPIZcEca4WouQ2DoSve9aYvGF14i64g/tiuWkL3NOypUN2V2xL3rtSvzIyeb ZW1krLlW5l+LSypqZr4Wt8tPWvFf4ztwSViEXBtumhcEhqoVHuHN2Zk00Mo9WIZfZBTx zQ== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 33nfbpmwbj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2020 00:02:49 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 21 Sep 2020 00:02:49 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.170) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Mon, 21 Sep 2020 00:02:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Appe547gEzlzZapk/Fv204viYV8b8cs5bsTn4hVj+VqO5DmGlitcRmSXc9k42htTKe9v4CCxp5Qodh6BG/wAvMVeQLGqkOeytmq/XnpjLBoTFZKhMnsXhL0XC/rskowV6GtTbedc4i60ccIBcPXiHfVDMoXIqaItrowneHHk2WZuJQJQRxFIBlHHvHqGSZRA/VwAXIvnRNCrb9wZ5LRT15pPnmXbu2NBAT1Jb9bzREonj6FeENIm8bBlMOT9HWWgJg3Abgu8A2zhgqH9uvpnXsBKLRZB4UCkLz+raJYSIkuE73Ao1ATA30jwhJDY3EFQrv9qS4Ef264mD2ZVKippfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qubHyGNKStAQ/UAyfRVifPsLMUc1D2AfYLD12qEI3F0=; b=KKDNFMSSSHurnrtPm3C99X+cc/diXJpSBP57UZ5xC12QlwBb1tNhX5C2maiQVeB4gNt54gVY6To+M6VoSF1U/suLVVwTZIiRQQr/GwgXloelNvSXuXpmZUP0YGksSJ7oIK4oDxyKtCU3JT1vOflnfgigE7QbYaab/iKU9beFqz+fp5+JB31Gzf8qgwEQNZNBopRSoHw+WcU2OBkjDxll166cb1V9FYtn/M1EIqjJVi7giCjDGv9aFjVysZzMxHnFOZFg9/1qEgjg3scEmL4ntM8vcuJD/fyA+OzAzluHzePqNCXs/zsxRpl3ua/JQrqrKeqkYNbfqljOH4kQHJc79A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qubHyGNKStAQ/UAyfRVifPsLMUc1D2AfYLD12qEI3F0=; b=gNb1A0uB/6Fa3k8K8zWZz1e3vMQVQn8GGLM67NvVb6OTcR4rS8fsN0hwqKMI4sj3b0gOec5pH83Gdfu9EaelKH4PbfI2bAIsAjCOcfGav6z4Bwr5nV10a2tE/llWaMsFa/RIptJj39q4Dp8NpQbR2/i9TeOuQh+bCiDdo+u4mZk= Received: from MWHPR1801MB2077.namprd18.prod.outlook.com (2603:10b6:301:6a::13) by MWHPR18MB1152.namprd18.prod.outlook.com (2603:10b6:300:a0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.15; Mon, 21 Sep 2020 07:02:46 +0000 Received: from MWHPR1801MB2077.namprd18.prod.outlook.com ([fe80::8972:1feb:9e2:ad2c]) by MWHPR1801MB2077.namprd18.prod.outlook.com ([fe80::8972:1feb:9e2:ad2c%7]) with mapi id 15.20.3391.026; Mon, 21 Sep 2020 07:02:46 +0000 From: Archana Muniganti To: Archana Muniganti , "roy.fan.zhang@intel.com" , "marko.kovacevic@intel.com" , "akhil.goyal@nxp.com" CC: Anoob Joseph , "john.mcnamara@intel.com" , "yux.jiang@intel.com" , "qian.q.xu@intel.com" , "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH] examples/fips_validation: fix req file version incompatibility Thread-Index: AQHWhsYRtYysUlNAZEK9W+uZHks7wKlyu/Bg Date: Mon, 21 Sep 2020 07:02:46 +0000 Message-ID: References: <1599668795-11278-1-git-send-email-marchana@marvell.com> In-Reply-To: <1599668795-11278-1-git-send-email-marchana@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [124.123.169.88] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c9d54634-c8dc-4165-4b66-08d85dfc5841 x-ms-traffictypediagnostic: MWHPR18MB1152: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:343; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: KNUhg2MpcckD1Or3fjqs7yZ0qG2eCclap2/mzt84altWb4gGGbxbWws3bXAn4ll3KGo7WL2fHNIClpjWYfK1Oo3/sxob4mJbhGcDWmjmyYobBrXOjAzWPCEVOjx01hsVHISuzbZpIaRbVBAgy2OXTI2a/d4gyl3qJ5/fwSJcCt4AQfygmdQ0BO9t0pebccdzY8M4y6B0KzIiRtSyvys/LSGD3nKfyCblaFPR27En1RoEhJ3Lf1jVKJ7gtYzMElA1flKDcyyvRBbPr53QUjwxBbjUy4Mt9tu03cXL9OLSInpP4aGNrYBfcyerlNWynUXurxH/LOTeL+wq4eWSucu+9bPMewhUTVD+3zUYCamMooqPBrefM7DOwpvXX4oowspO x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1801MB2077.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(136003)(366004)(39850400004)(53546011)(7696005)(52536014)(33656002)(26005)(5660300002)(186003)(71200400001)(316002)(66946007)(4326008)(76116006)(6506007)(66446008)(54906003)(110136005)(83380400001)(8936002)(9686003)(8676002)(55016002)(86362001)(66476007)(478600001)(64756008)(66556008)(2906002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: q0e7PMOZV8AaVDBbvkAze6iVriae0QrM4lOVchZMe8BtSFXEea8dfOtCBPYdgevSqNbliLADryOhlvPQ1J6WelXdN6mHD84wh8Maa0Qsju3fsOBWRdr52tt2t7CfAOquI8px8lr1VDSD3Lq+8JCPpAhXxMf9qvpcux/3YOX3SIRe0XpqDdAOqtEa0qsRRyrz1cEV2G24z/xlzvCQn2yO5Uph8FmmIEbKGb+Em+eeUWN5I+lGfoFrafx4ZVHqkE/asbQs3wQaXQOQVoBChJ5KCMCki7NveMPAxXvqXHwZVMjO4Gt3RziVscm0XXukbTNkbtZ4KH5vEzGIcxf1z+vjisyLvAtcUziHpBY/l91oCLDQuLhklOgx8j/Ga2YX1i/W4cIRXgpeNAfXJG6XPi9LVCM1rjKgG9uUDUhR5PeNfIoK3k8yqPFBUP3fRDRCQ/Ikx2WJ9ENG/avBrzARhLQyhlLDL5iD41KQT2I9tzWP7wpy95H2TaThM1oWH+sAvLoAzZWezRzliap3PTTXh9FkW7+3tP+FRDOmb01RR9u8ImimFD80e+S+PwMnYHwrmJ2tWbLWNtm2hr3TbJNvrEdmpl/Qosi2nSWnBHdEkeBho+bA1fm5wm/I+j7fqZPWTphIhnjN1eXQl7EOeVrNLxO61w== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1801MB2077.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9d54634-c8dc-4165-4b66-08d85dfc5841 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Sep 2020 07:02:46.4612 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sJzzcR+xVucqIIXLonapHVNlIyw9GepzFtEHhM5Uf8ZpXcJALyEflFsvbcSNbP+Qz5BtC4zcOjuOTjceLv6pYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR18MB1152 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-09-21_01:2020-09-21, 2020-09-20 signatures=0 Subject: Re: [dpdk-dev] [PATCH] examples/fips_validation: fix req file version incompatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Fan, Could you please review the changes? Thanks, Archana > -----Original Message----- > From: Archana Muniganti > Sent: Wednesday, September 9, 2020 9:57 PM > To: roy.fan.zhang@intel.com; marko.kovacevic@intel.com; > akhil.goyal@nxp.com > Cc: Archana Muniganti ; Anoob Joseph > ; john.mcnamara@intel.com; yux.jiang@intel.com; > qian.q.xu@intel.com; dev@dpdk.org; stable@dpdk.org > Subject: [PATCH] examples/fips_validation: fix req file version incompati= bility >=20 > Separate out CAVS request file version 21.4 code to support lower version= s. >=20 > Fixes: 32440cdf2af9 ("examples/fips_validation: fix parsing of TDES vecto= rs") > Fixes: 2b84d2bd47df ("examples/fips_validation: fix count overwrite for > TDES") >=20 > Signed-off-by: Archana Muniganti > --- > examples/fips_validation/fips_validation.c | 42 ++++++++++++++++++++++--= - > ----- examples/fips_validation/fips_validation.h | 1 + > examples/fips_validation/main.c | 6 +++-- > 3 files changed, 36 insertions(+), 13 deletions(-) >=20 > diff --git a/examples/fips_validation/fips_validation.c > b/examples/fips_validation/fips_validation.c > index 9bdf257..317f6c9 100644 > --- a/examples/fips_validation/fips_validation.c > +++ b/examples/fips_validation/fips_validation.c > @@ -92,6 +92,15 @@ > return -ENOMEM; > } >=20 > +static void > +fips_test_parse_version(void) > +{ > + int len =3D strlen(info.vec[0]); > + char *ptr =3D info.vec[0]; > + > + info.version =3D strtof(ptr + len - 4, NULL); } > + > static int > fips_test_parse_header(void) > { > @@ -106,7 +115,10 @@ > if (ret < 0) > return ret; >=20 > - for (i =3D 0; i < info.nb_vec_lines; i++) { > + if (info.nb_vec_lines) > + fips_test_parse_version(); > + > + for (i =3D 1; i < info.nb_vec_lines; i++) { > if (!algo_parsed) { > if (strstr(info.vec[i], "AESVS")) { > algo_parsed =3D 1; > @@ -344,6 +356,8 @@ > uint32_t interim_cnt =3D 0; > int ret; >=20 > + info.vec_start_off =3D 0; > + > if (info.interim_callbacks) { > for (i =3D 0; i < info.nb_vec_lines; i++) { > is_interim =3D 0; > @@ -365,17 +379,24 @@ > } > } >=20 > - info.vec_start_off =3D interim_cnt; > - > if (interim_cnt) { > - for (i =3D 0; i < interim_cnt; i++) > - fprintf(info.fp_wr, "%s\n", info.vec[i]); > - fprintf(info.fp_wr, "\n"); > - > - if (info.nb_vec_lines =3D=3D interim_cnt) > + if (info.version =3D=3D 21.4f) { > + for (i =3D 0; i < interim_cnt; i++) > + fprintf(info.fp_wr, "%s\n", info.vec[i]); > + fprintf(info.fp_wr, "\n"); > + > + if (info.nb_vec_lines =3D=3D interim_cnt) > + return 1; > + } else { > + for (i =3D 0; i < info.nb_vec_lines; i++) > + fprintf(info.fp_wr, "%s\n", info.vec[i]); > + fprintf(info.fp_wr, "\n"); > return 1; > + } > } >=20 > + info.vec_start_off =3D interim_cnt; > + > for (i =3D info.vec_start_off; i < info.nb_vec_lines; i++) { > for (j =3D 0; info.callbacks[j].key !=3D NULL; j++) > if (strstr(info.vec[i], info.callbacks[j].key)) { @@ - > 640,7 +661,7 @@ >=20 > cb =3D &info.writeback_callbacks[0]; >=20 > - if (!(strstr(info.vec[0], cb->key))) { > + if ((info.version =3D=3D 21.4f) && (!(strstr(info.vec[0], cb->key)))) { > fprintf(info.fp_wr, "%s%u\n", cb->key, count); > i =3D 0; > } else { > @@ -648,9 +669,8 @@ > count); > i =3D 1; > } > - snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key, count); >=20 > - for (i =3D 1; i < info.nb_vec_lines; i++) { > + for (; i < info.nb_vec_lines; i++) { > for (j =3D 1; info.writeback_callbacks[j].key !=3D NULL; j++) { > cb =3D &info.writeback_callbacks[j]; > if (strstr(info.vec[i], cb->key)) { > diff --git a/examples/fips_validation/fips_validation.h > b/examples/fips_validation/fips_validation.h > index 75fa555..a25958d 100644 > --- a/examples/fips_validation/fips_validation.h > +++ b/examples/fips_validation/fips_validation.h > @@ -165,6 +165,7 @@ struct fips_test_interim_info { > uint32_t nb_vec_lines; > char device_name[MAX_STRING_SIZE]; > char file_name[MAX_STRING_SIZE]; > + float version; >=20 > union { > struct aesavs_interim_data aes_data; > diff --git a/examples/fips_validation/main.c > b/examples/fips_validation/main.c index efd32a8..6edb83e 100644 > --- a/examples/fips_validation/main.c > +++ b/examples/fips_validation/main.c > @@ -1070,10 +1070,12 @@ struct fips_test_ops { > int test_mode =3D info.interim_info.tdes_data.test_mode; >=20 > for (i =3D 0; i < TDES_EXTERN_ITER; i++) { > - if (i =3D=3D 0) { > + if ((i =3D=3D 0) && (info.version =3D=3D 21.4f)) { > if (!(strstr(info.vec[0], "COUNT"))) > fprintf(info.fp_wr, "%s%u\n", "COUNT =3D ", 0); > - } else > + } > + > + if (i !=3D 0) > update_info_vec(i); >=20 > fips_test_write_one_case(); > -- > 1.8.3.1