From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E9548A0542; Wed, 26 Oct 2022 06:26:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5EEF40E28; Wed, 26 Oct 2022 06:26:54 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id EB7D340A7F for ; Wed, 26 Oct 2022 06:26:52 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29Q3q66T021119; Tue, 25 Oct 2022 21:26:52 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3kejc9jmj0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Oct 2022 21:26:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B5L85ZDHzFyomMNxf3S8MI+L1iHwSDqOt0dv1hRpALzaGR4+3012a62yhfMYe/i9Xk5esAFc7dCBYokk4VEydbaaDrI0x9FtPa1nkMxPVODybg5xtsreJIGjZ8FlbmYLOZAJjl+2W8kQsVRJ79X98UolFfnF0cGQS853AqIofNWQv4G2TFun1kcf07tBor4XJMcEAgweAYI8xNiPJtnHpCwjHX3uOml4k3gRXrweDlaOaIURxx3oscI2SzTKA3KfNiJ3QDHWAziApPc/Pv0FBN+5F2yjpFC6rUGoUN55tcwlCQjcWFKgjRA9o8QlXsz3BYEq882mxudDAGbVr2Aq0Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=V5ne5GP1szHICap/fS/MjmXP1DqPiqcd3lqf3SvN7Po=; b=XWiHUebaJu8k4AwZv94Yzlvz5dvnetGmhTRqjIZQ7y+4Vt833Ut5zXfqwgdgtDkod/eJgZ1NdlWs0rx5etTj7gaZJtKuAdvwN4ajPdjXkPBLmknJrZU1Ioh0iagH4XgbpW/xVxLQhfS6WgPAb6j/s31eqvGzFOgnn2p7jDZiBe51WMHacGa7Y68cVarz6EaHgQIvVRpI4mt7RSq95zd3efhFSN0viYIlDnEjl5OuHuUWMRftSFReHVmkEd0ugSFsxJhkkpmGob0j/vxDvpKGZewv8s+jgetqlVr3kbCujsCWPwa+EiMA6pdgKEWVS3iPl8pxbY1oIaAfqPhRPf4MpQ== 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=V5ne5GP1szHICap/fS/MjmXP1DqPiqcd3lqf3SvN7Po=; b=JsqLQiojdBC65iWqxn+i8YRsVao2VtqELWJHmYswQQgTMpVCOgKS0JnmN1TcMtAnMhL2XxhRtFSKbNb7Wz6rIXaUUmvyqiTx6FVcyoMf1P1+AZ6lWdhxXNxx/OF4O8T9fcy8Rdzf4jjR7NEgXGiuicgGCENrinZb6oqqwsYE0/Q= Received: from CO1PR18MB4714.namprd18.prod.outlook.com (2603:10b6:303:e9::18) by PH0PR18MB4622.namprd18.prod.outlook.com (2603:10b6:510:c2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 04:26:49 +0000 Received: from CO1PR18MB4714.namprd18.prod.outlook.com ([fe80::c1a2:60c4:6ba6:a520]) by CO1PR18MB4714.namprd18.prod.outlook.com ([fe80::c1a2:60c4:6ba6:a520%3]) with mapi id 15.20.5746.028; Wed, 26 Oct 2022 04:26:49 +0000 From: Gowrishankar Muthukrishnan To: Brian Dooley CC: "dev@dpdk.org" , Akhil Goyal Subject: RE: [EXT] [PATCH v1] examples/fips_validation: parse block error fix Thread-Topic: [EXT] [PATCH v1] examples/fips_validation: parse block error fix Thread-Index: AQHY55SRZXX81TOKgEuMh2Z7EcAtFq4gFwXg Date: Wed, 26 Oct 2022 04:26:49 +0000 Message-ID: References: <20221024103652.499554-1-brian.dooley@intel.com> In-Reply-To: <20221024103652.499554-1-brian.dooley@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO1PR18MB4714:EE_|PH0PR18MB4622:EE_ x-ms-office365-filtering-correlation-id: 0d1a561a-840e-44e7-69a4-08dab70a4cef x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: WWsPDW8oWHJlcGpzYopao0e7D4a/MXVtL22NJXq8gXBnPcJ8C677i8/KTJUM+8UXcWRnZ9XWRRXyFYbm+EAUrN7F9ouqj1f99V+MGe0jQdet4wh7fCV9yV60cvqNt8OC531ATuMJbuvtgpRsiP71MfJxK9Nl7NRN4LGVmevcIrxVgmRsY5R7OEV9S7W8/jcJjUzYwb6DBoAG/NQ5vHn2YAPE1s+8m8NR1B3DYUUMqKFUPty71unJNUqIVYpZwybWjlHM5Bal44fqXJuwMUUruqy1QSdBCABDeefSUhVLh0lQgSF/QvCT6AK1BvXAMdfDc2RT2z5ihY8y6zvOZuvRjNp9cy9sW5zjtTcAKzIuVnEnlDhNiMv9o6y+I1ObU0SX+uCMG1aZO/ar5yYv6+Aq6Bq8dbcVN8QT/BnTgwNuWc0Rz7eWxXI67zbjUAMZI32R0SZCPZ3AfnZp7anjopW41ZXKhRjWpVinr/MWAQQOynfcmPZd2PMQz538dg3v7aX/k8NT1wtL65/6fgT27n2makr27q5kAf8nK66Wpok2g5tc+Rryt3LVZZn0pjPkihJ0OpLpWEfRSIhNLZXQH28RHu6p5k/6DJOSuH/xq8ErzPHWBd0KJnV+uaFAvfRy4X+Ie9jku1422ZVzzpsKEpyULzxV98rSmgIJX5F4xuppEA8suJMMVNbzMVnztgiln09Tm4FfpY1DDe5BKfmszqdKkKCMW6iKdzyCrcg+ZiqITbB3QrEP8qloejLsfYdd2DUAS0RloaekFR1WX+OhSf9LQA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO1PR18MB4714.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(39860400002)(346002)(376002)(396003)(366004)(451199015)(9686003)(66946007)(83380400001)(33656002)(86362001)(122000001)(38100700002)(38070700005)(41300700001)(52536014)(55016003)(71200400001)(64756008)(66476007)(66446008)(8936002)(5660300002)(316002)(4326008)(8676002)(76116006)(66556008)(6916009)(478600001)(7696005)(53546011)(107886003)(186003)(2906002)(26005)(54906003)(6506007); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?v2zE9SmOtzCi2YcyCoIkCy6NGiVdFuz5JFP1eZ7zdAs2SLjqSzK+r3X7Y72E?= =?us-ascii?Q?lUDohzpuI0wY8MmDx84mQCvqr2qsBY2VbMHTkxTJLXy9UbzcL/0hKA+uCFaq?= =?us-ascii?Q?WAAlr5KtU3+D1VNKD97nW1fIG4bq3tPhh6O730eC191XI3B7NvERkZGnfUW7?= =?us-ascii?Q?/KKzZw8LCb0Y4/WaqQyGi1Wpb9j303g7VOtWZadJ6MtYVPI4XnxYVviaINgo?= =?us-ascii?Q?Vlao9EFTsJiv0Bla8LnybbdVf1gLLk1P+e7edUqQP1e3CCxZq8YxTw9lxFxV?= =?us-ascii?Q?7lUEEEGkZueW3APfT/LCeP/APpVQnloRAM5gnQ2bhB6FWHiFE0p1o27+WfDr?= =?us-ascii?Q?s4/5yGOUeMekF1K5z+Sgw0J9e8J0gs528DBCaKXFEfDrZ6JRFBLtyZge3y3E?= =?us-ascii?Q?NdWq1nwCMxQs13Qwf5sE7bZWlQrCe1kj/mcFNY1H9WxSZPOJYgFMuaCP6bRk?= =?us-ascii?Q?oNYJB+CxpBbiNb/U3MaHAtL6T9UFZV34dFK2fGu3iZHvt8z2WR7c9saciwi6?= =?us-ascii?Q?hZ1gRdtePg3uy87XF8jy0ulMvg+vCIOu9+8kxZ0oLuj8PKhJwgy1aRrFKq9x?= =?us-ascii?Q?k1QqaN3RpgZfOIJAgX+4qMsDxfvP77B9iBKiaeov0DLlfOlTWuW55LUnYbKT?= =?us-ascii?Q?SVODfTu9ZPLiWC6Y44/dO9mgcvlTTsmaIoFggdE2qkO383MItkFwJatIyn4a?= =?us-ascii?Q?QPNDGiFWvOf1GtBArFvC+MqYWQczhzR5ZH6wLAvP5XxbQDZErHHW1fvYQkDy?= =?us-ascii?Q?knElvKsBSTqeIZBryfWnOA+1nGx3bVZjTZ3tw8+ytzhhUdGpM9gj8Vea7R0G?= =?us-ascii?Q?/y1JaBRhO2GdqrtdOUTvUladGAgEemxL9kqGlB64D1Y9kX0uHU7g6w1tROQK?= =?us-ascii?Q?uyv68KpwGptvJZe7zYaR4osWkYjdXaA9MwumQtOzZi6pj7o982R0oEhlKGvZ?= =?us-ascii?Q?NXmT8MN3mCsuaxGe0Tp3adOWf8Hc3kZU0jlpWt7h0SuRKxrAISyI/sMXjMkM?= =?us-ascii?Q?mRHCFcZqCmNr36Ly5HoO6zAiGV4VumjB9d/q9GvqQpdoQJdhFzhVYry+uSjl?= =?us-ascii?Q?cWCNa1kXhcTcPIxsMqV4iTqYjO5COZUquWHUSqgDCsUUJYkPgAgQ80WjdBOY?= =?us-ascii?Q?lgg06YMDYYK70y7EzEruxKWPYaudXmxu6RSnFWEZPj7/oas/Nm32ZEwQtx8W?= =?us-ascii?Q?1j4ar62sw+3ajGFUXUn2fWgDmuD1RRSUJPHmVwKGCKkYK5td6KVwdUbvYPLG?= =?us-ascii?Q?207aRJCbnfeGNOzftOTfffbuPz1cyXStI4G/2Bi7+ZEvg6E0C1QGqAr2b0VO?= =?us-ascii?Q?ccHR0yfChot0sIkIIWEqPXLMKgIUIGIRoWLc3BFTKZaqpCKB+r1q3DQ8WOOQ?= =?us-ascii?Q?YEwgb5C55IYkOhS/l6p1Zdl2fFY4Onc+MWBHCNY7tFUOW0PVKEQCcFzuXZMN?= =?us-ascii?Q?NO9DL9ZN22Ho+rg2QrO570ZGS2YCahWobJEXKz61F8c5qlKKWusXBKQUkmqL?= =?us-ascii?Q?MRD4hqZnpg41Gjzy90Kzwg4mi4InLLUAjwXERDJf9/drpPw/JqztMGSiNfdE?= =?us-ascii?Q?qAcbtKvkgJDGk6d/SWkoyOZarfkcK5dBXrf79ITv?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: marvell.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR18MB4714.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d1a561a-840e-44e7-69a4-08dab70a4cef X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Oct 2022 04:26:49.4192 (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: vYmq7/nXZTg4sAWrWT5Zr0o/SqlrmYinBqQlRtTnKNB/MuIRcg8OrSlDeUUhGjoPm7yMzYYdXjPwOVh90meqd6axz49PTpMd1RHdfRR7KzA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR18MB4622 X-Proofpoint-ORIG-GUID: e_hLNMthug87PxasA8hFZof_mEwfHLTA X-Proofpoint-GUID: e_hLNMthug87PxasA8hFZof_mEwfHLTA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-26_02,2022-10-25_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Acked-by: Gowrishankar Muthukrishnan Thanks. > -----Original Message----- > From: Brian Dooley > Sent: Monday, October 24, 2022 4:07 PM > To: Brian Dooley > Cc: dev@dpdk.org; Gowrishankar Muthukrishnan > ; Akhil Goyal > Subject: [EXT] [PATCH v1] examples/fips_validation: parse block error fix >=20 > External Email >=20 > ---------------------------------------------------------------------- > When parsing request files check for file type. This fix will remove > dependence on command line parameter for using libjansson >=20 > Fixes: 0f42f3d6034c ("examples/fips_validation: share callback with multi= ple > keys") > Cc: gmuthukrishn@marvell.com > Signed-off-by: Brian Dooley > --- > examples/fips_validation/fips_validation.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) >=20 > diff --git a/examples/fips_validation/fips_validation.c > b/examples/fips_validation/fips_validation.c > index 363e17a6f3..5a2a5f86e6 100644 > --- a/examples/fips_validation/fips_validation.c > +++ b/examples/fips_validation/fips_validation.c > @@ -638,10 +638,11 @@ parse_uint8_hex_str(const char *key, char *src, > struct fips_val *val) > /* > * Offset not applicable in case of JSON test vectors. > */ > - RTE_SET_USED(key); > -#else > - src +=3D strlen(key); > + if (info.file_type =3D=3D FIPS_TYPE_JSON) { > + RTE_SET_USED(key); > + } else > #endif > + src +=3D strlen(key); >=20 > len =3D strlen(src) / 2; >=20 > @@ -669,18 +670,16 @@ parse_uint8_hex_str(const char *key, char *src, > struct fips_val *val) > return 0; > } >=20 > -#ifdef USE_JANSSON > int > parser_read_uint32_val(const char *key, char *src, struct fips_val *val)= { > - RTE_SET_USED(key); > +#ifdef USE_JANSSON > + if (info.file_type =3D=3D FIPS_TYPE_JSON) { > + RTE_SET_USED(key); >=20 > - return parser_read_uint32(&val->len, src); > -} > -#else > -int > -parser_read_uint32_val(const char *key, char *src, struct fips_val *val)= -{ > + return parser_read_uint32(&val->len, src); > + } > +# endif > char *data =3D src + strlen(key); > size_t data_len =3D strlen(data); > int ret; > @@ -701,7 +700,6 @@ parser_read_uint32_val(const char *key, char *src, > struct fips_val *val) >=20 > return ret; > } > -#endif >=20 > int > parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *= val) > -- > 2.25.1