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 90CC8A04BC for ; Fri, 9 Oct 2020 11:50:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 860661C295; Fri, 9 Oct 2020 11:50:21 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 71BEB1C295; Fri, 9 Oct 2020 11:50:18 +0200 (CEST) IronPort-SDR: RDBA7RmB5/iPT58VXECulaoU5PMCKDKHZxDO0BfPlym1PmUyttLlZY+g/51R1qTLJ5/YV95G+Q 1Zrbppvo8rUA== X-IronPort-AV: E=McAfee;i="6000,8403,9768"; a="145330057" X-IronPort-AV: E=Sophos;i="5.77,354,1596524400"; d="scan'208";a="145330057" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2020 02:50:17 -0700 IronPort-SDR: hEp9rQJq3O3WZLzlHfN3fBXHt1li51BoUMOA4cPy3w9Y3cZqfGeSdUptijbkItAwFH+50hUWRX NkPMRG8dCVFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,354,1596524400"; d="scan'208";a="419368384" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga001.fm.intel.com with ESMTP; 09 Oct 2020 02:50:17 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 9 Oct 2020 02:50:16 -0700 Received: from shsmsx605.ccr.corp.intel.com (10.109.6.215) by SHSMSX601.ccr.corp.intel.com (10.109.6.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 9 Oct 2020 17:50:14 +0800 Received: from shsmsx605.ccr.corp.intel.com ([10.109.6.215]) by SHSMSX605.ccr.corp.intel.com ([10.109.6.215]) with mapi id 15.01.1713.004; Fri, 9 Oct 2020 17:50:14 +0800 From: "Jiang, YuX" To: Archana Muniganti , "Zhang, Roy Fan" , "Kovacevic, Marko" , "akhil.goyal@nxp.com" CC: Anoob Joseph , "Mcnamara, John" , "Xu, Qian Q" , "dev@dpdk.org" , "stable@dpdk.org" , "Jiang, YuX" Thread-Topic: [PATCH] examples/fips_validation: fix req file version incompatibility Thread-Index: AQHWhsYI6zhD/o8ZaUKv2HjmHbBRaalyNsIAgBz9eIA= Date: Fri, 9 Oct 2020 09:50:14 +0000 Message-ID: <92913c34efa64b3896c67adfe26c16f5@intel.com> References: <1599668795-11278-1-git-send-email-marchana@marvell.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH] examples/fips_validation: fix req file version incompatibility X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Tested-by: Jiang, YuX Best Regards Jiang yu > > -----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 > > incompatibility > > > > Separate out CAVS request file version 21.4 code to support lower versi= ons. > > > > Fixes: 32440cdf2af9 ("examples/fips_validation: fix parsing of TDES > > vectors") > > Fixes: 2b84d2bd47df ("examples/fips_validation: fix count overwrite > > for > > TDES") > > > > 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(-) > > > > 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; > > } > > > > +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; > > > > - 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; > > > > + 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 @@ > > } > > } > > > > - 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; > > + } > > } > > > > + 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 @@ > > > > cb =3D &info.writeback_callbacks[0]; > > > > - 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= ); > > > > - 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; > > > > 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; > > > > 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); > > > > fips_test_write_one_case(); > > -- > > 1.8.3.1