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 1D25AA0503; Wed, 18 May 2022 17:44:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E7AF4161A; Wed, 18 May 2022 17:44:56 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 15B3640A7D for ; Wed, 18 May 2022 17:44:54 +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 24I9ErQH008070; Wed, 18 May 2022 08:44:54 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3g4m6f3mng-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 May 2022 08:44:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sw/NZNVRiiOZYkP4voWe+ZSToPdfE0OK/I87HeoNy7F4I8Y76bi/ujJzN51bYYqKc8lO1gyz29BJa0JuX8EDYmoEX9TSb3/8e0o5wSMJimhEPrK32tHEAbOS9agweCf04oar3RnVaZoS6FaASyC7WBUIjySQ6sXxUoSQmoy/+dUwtBhfOSBlWG9LIp2/shPRmawKKNk213+0hqovUXgtordd1hmrwMA5mIIYlJyuK70dVir1laTGteHlOnqZPn2LENo+Wg4v0MuOsxvg/MPZR7Y1ZdnUWhgUD+J7+400K/UKgc/QX6z8MstzJiXwDrZ2cUX0T4a0ktd7xq05LZE9Dw== 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=j8+w2AsjB8wNsAwn21qeloBSLRsxX3H2eBGnDGKLnjQ=; b=mkeEBX4bMib5wVcbiu7qYBMdVjxMGZovFmwB7SkN0v6m4qSmoY88KYcVjP9/KYoLzvy8irr+McKbBgRecTEkagQcZdu6U94ILPQ78Lm3mdySFUJ4R1BAnJtsVGeJRqTuQpDswBlCw3VGAGE1jTDzfrt8AHkYy3ltsuhSfapcZ2B9mgfqLqa1YNOJjhFaMtwyrKhsQyeNBzABlZX68zMy3jT4AxwgxGcIUSJf/LuHOeieUwRuWHTBIpXOin8mNjA4Em2khXYKACkwBpOSZvgmky+Inc9rO+E3XwWz74WWt+nZjdQloqPJFW1p0kkub3v1S8Nct8mcUc940AWLgHjmlA== 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=j8+w2AsjB8wNsAwn21qeloBSLRsxX3H2eBGnDGKLnjQ=; b=clucQWLQbWM+FOFYHqYCWjvmhcRmBJcho5v96v6mVoIjoQm8H/JAQv/QLZC+eTTMd1Lp8O5sU3KQfYmPDOeNmf9YJtuYPEIl7mF+2GbHSANbNJGvMJcnickEJQD0XBAT0d2fTQQaoyKe+QcBPEWuxD5N7AbGutFRkhh2dVraAfU= Received: from CO1PR18MB4714.namprd18.prod.outlook.com (2603:10b6:303:e9::18) by CO1PR18MB4732.namprd18.prod.outlook.com (2603:10b6:303:eb::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Wed, 18 May 2022 15:44:52 +0000 Received: from CO1PR18MB4714.namprd18.prod.outlook.com ([fe80::f83c:2654:ed5:fd1f]) by CO1PR18MB4714.namprd18.prod.outlook.com ([fe80::f83c:2654:ed5:fd1f%6]) with mapi id 15.20.5273.014; Wed, 18 May 2022 15:44:52 +0000 From: Gowrishankar Muthukrishnan To: Brandon Lo , "roy.fan.zhang@intel.com" , "ciara.power@intel.com" CC: "dev@dpdk.org" , Akhil Goyal Subject: RE: [EXT] [PATCH v4 2/8] examples/fips_validation: add json info to header Thread-Topic: [EXT] [PATCH v4 2/8] examples/fips_validation: add json info to header Thread-Index: AQHYW+R7vIYhEmOdh0eJEQQ3vaD1960k5JUQ Date: Wed, 18 May 2022 15:44:51 +0000 Message-ID: References: <20220129175514.746925-1-blo@iol.unh.edu> <20220429161559.415645-1-blo@iol.unh.edu> <20220429161559.415645-3-blo@iol.unh.edu> In-Reply-To: <20220429161559.415645-3-blo@iol.unh.edu> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a5f645c7-7941-47b9-ce5b-08da38e55918 x-ms-traffictypediagnostic: CO1PR18MB4732:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5hw5robcqxsz+V0MIYfDpb7FNyNlhM0D8rKA9agkWw5npn4WQsBOKcpTdhZ0TmP63nwI4xpeGU4HLg6mMmmC7qQnzy+sd7V989mRqB5O1+HlBgAfUf7gIv8pqina/03G+zWk2bkJ1qXahwJI5PHPFnaCxtBcdB14Vnh+2uXugC4SNK+3jmjOEt45FtHjF6ZY/g/MfHNRECQB4BExT9g507HmJJphSLJiPGJUWQdmcLP+JsYNNcszKFuT+F4DE7RmQ6yFKaCjOReVYiIawtsxxntNK91rFZHIeAAP50vHPcutaGgCjD6BKDMhZe63T9drijq9QaOS9WOQtxhR5Pz6qOxnK0WmlGKKArYmraGYy+E2HCoOlztpe0/ylkv+KGqx4tPLXzgLgSsCaSNnibHmIuGHtHellhyIS2fAn4kt63J0MBqwuoRqmZOVl1ZK5gXUrUi+1L9YhqU+IBBzGeZFxAZwAlA0IwW5OkPvhiIIbMa96Hdz/sU0HUUZLHrXAtQxRlzQ49uuiyX4Rqd5ZXwyMRaawI5y15PxM3poRnBKGDdF+BHBl9SjYWuS7dNBkqHPTFBbLgCmmVgw/CFYjNubf0fmN2yzmSyexF26opHEEfGFU+kLBidqZ8Rvzf75mkDEpKuPhcrDDnvxnYQTWT9ygh8ZIF8dknYTZP+LG3Wh+iKFbFWS7HQNjX2ktmYG0Zpm0FoeMTWUQ2QPl8bqLP07rg== 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:(13230001)(4636009)(366004)(38070700005)(38100700002)(52536014)(26005)(110136005)(8676002)(64756008)(4326008)(316002)(508600001)(53546011)(33656002)(66946007)(66476007)(66556008)(76116006)(66446008)(122000001)(9686003)(54906003)(83380400001)(2906002)(107886003)(55016003)(5660300002)(71200400001)(186003)(86362001)(8936002)(7696005)(6506007); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?I7b/vwUNdnHrYaNxBCAQCoNll0pIHxkLDVb4JV3eN+aZJCqnkYut6GlWZiME?= =?us-ascii?Q?mwK4mQIAC7+y1uludUP3/arMEdR8llmglXkqRp2tdiXOUROeafvm0ucAehXr?= =?us-ascii?Q?At+Rc5fxpAAKy1o/ijW1g5jGaVyicN+4KnGXEMFwskWtwvjIMuBCocJcwaSV?= =?us-ascii?Q?+OpfEKkKcykIIh7Qow+aoi8lFtaseJtgi2JXUf2w7X6F+zDJt//d/akqaJZq?= =?us-ascii?Q?hsEzfUUoNvFJmsWDi+qVFoQYrPM+BACSzOLUXzCB/ePCI7yYpib20OPbteMh?= =?us-ascii?Q?u5om1BtSbdkuBfr507MiWsQiihX2BJ3R/gS8EOsfTDtQrK53Ay+ZfdmAazJt?= =?us-ascii?Q?9w+19GjH92mfLjY700pPxsPSLl0K/fCpyqcyiIAixfidR67Upx7m6uEghKQN?= =?us-ascii?Q?OvBPAo4wxcqhsHhKBdNGQa/0JzuMdCruRYgO+HBNIthyi7f6xK2D75tISKSY?= =?us-ascii?Q?vc75s386XNcXBLPKTFUMrvtbm0DePQB0DzwPpQuH6uflceg1Z45r4XMYT6b4?= =?us-ascii?Q?3FVL2tfHFmfrJwz+BcSsR6am8hE+Vm3u0AaxX9s6LiYnGQFGrq9NLHhZsJ9J?= =?us-ascii?Q?LgwxWm8PQ6QVx38XKVkbsIkQHAuO5DlOV+fT1wXU9f9hTTyvbpllPY45vbO5?= =?us-ascii?Q?M3qyva7FmWo90/csi2qsb7n3QNd1wWK+7yRQT13vQuMbZWzGga/aq34yvNuX?= =?us-ascii?Q?9x6ICzyFFOO3Lk/z4lsEptQbNi9q/QSrlEQ38XpyljDuKzNfSj3P5QuSYrgK?= =?us-ascii?Q?lbfPWLD4GioOxC71BhFX3rrNy2nu20QBOEvWh7gF0PTtYRK5yvJjtbAzkmjV?= =?us-ascii?Q?U1aS8g+kGQqePn2fJFDsCSaOFWMp4D08tTPCYHS80TGkYhZHFgXYjHx732nW?= =?us-ascii?Q?D6tV5GEFOoJGjI4iSe8tR76dgsKk/ElEvEa3T8ij+QQVB7oeolORllEEVXIH?= =?us-ascii?Q?R4phy8tbgdyarStqe6rQfp4MYusBQ9tS06i4a4MyMw9kEUX6/D95ycQW//qR?= =?us-ascii?Q?Mp+UFfCxXmMt78WTZqTHfDgmfTX70R/iN0xy4KFdtj9ZNotMKYnrpBlm5wmw?= =?us-ascii?Q?rRGH9AEENiAKQxBUXU/qIkKEYamgmloh/ubxVzX8PNB6/yMDaYMZmmokOdJt?= =?us-ascii?Q?Xr/j5jlEuSwaqKZyw8HkFo8bl5yRQGSzigepeM4WsUEF3sDYjK9xVdXdCmh+?= =?us-ascii?Q?/euiC1efLLzrGPgGxL80DJahxfkxopxovZT6KPVJMzhV8dkDK3FNQMB4DQKy?= =?us-ascii?Q?fufrz1Q5WBUBTmX2d57fU7m1LTV0pWDfeV502Dd00Kh6u49hqVKntDB1YHKr?= =?us-ascii?Q?5qvyUWA044Io3XNcViDljS07asAhWQFPYvC37KflyYqMPQnsC9PQxAYs3OQN?= =?us-ascii?Q?HZnGJY7XVmXGdsZ9bOA8fvAZIdWtt4UzFj7qkN3WW4JzIfzikgK9kBXy+scJ?= =?us-ascii?Q?155v34m87RnNP5CsgExZt+rVym3a5d+HWulhpMZfuZAcCFoLdSv0uK42P5PH?= =?us-ascii?Q?vkUZLcgnywgquTLB1dYOMr2CrVHkQXuSulDhqSl0Ym8AEpokFvr9a8eb8/2g?= =?us-ascii?Q?2mWATs1LJG+arCDiBv7kMjCLG/eUq320f4CnvAwIHkBl6ggU2M2AT6Q9z5LE?= =?us-ascii?Q?03QTsK8v5XJAsxeeb2AbK01GvfdGCKBGNKECNt/9pR+JV9pGT1YF1Y7QgU9q?= =?us-ascii?Q?wYOygahiHa7RZVLakv5YeaNQUtJtZfq7CH1rIDS113hbyq7Fd2JaWg2OEi4g?= =?us-ascii?Q?G53I281Q8w=3D=3D?= 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: a5f645c7-7941-47b9-ce5b-08da38e55918 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 May 2022 15:44:51.9341 (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: FDfYCTchUiWaQltzDFKWghu7Tp8AzHMfU1aKwyAOSIu0QeuK3ickzo2u6deZtWUQqIKq3eMtGP9modxpWGy9C/BRf8vYgrzw6XVs4AhNx+Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR18MB4732 X-Proofpoint-GUID: cLa1JG9r4xxbQMe4B_T9XUi8hKJUZzQi X-Proofpoint-ORIG-GUID: cLa1JG9r4xxbQMe4B_T9XUi8hKJUZzQi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-18_06,2022-05-17_02,2022-02-23_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 Verified the functionality changes and looks good to me. Acked-by: Gowrishankar Muthukrishnan Thanks. > -----Original Message----- > From: Brandon Lo > Sent: Friday, April 29, 2022 9:46 PM > To: roy.fan.zhang@intel.com; ciara.power@intel.com > Cc: dev@dpdk.org; Brandon Lo > Subject: [EXT] [PATCH v4 2/8] examples/fips_validation: add json info to > header >=20 > External Email >=20 > ---------------------------------------------------------------------- > Added json-specific functions and other information needed to test the ne= w > FIPS test vectors. >=20 > Signed-off-by: Brandon Lo > --- > v2: > * fix type of prefix to suffix >=20 > examples/fips_validation/fips_validation.h | 42 +++++++++++++++++++++- > 1 file changed, 41 insertions(+), 1 deletion(-) >=20 > diff --git a/examples/fips_validation/fips_validation.h > b/examples/fips_validation/fips_validation.h > index aaadf01ba8..e2789df93a 100644 > --- a/examples/fips_validation/fips_validation.h > +++ b/examples/fips_validation/fips_validation.h > @@ -5,6 +5,10 @@ > #ifndef _FIPS_VALIDATION_H_ > #define _FIPS_VALIDATION_H_ >=20 > +#ifdef RTE_HAS_JANSSON > +#include > +#endif /* RTE_HAS_JANSSON */ > + > #define FIPS_PARSE_ERR(fmt, args) \ > RTE_LOG(ERR, USER1, "FIPS parse error" ## fmt ## "\n", ## args) >=20 > @@ -24,6 +28,9 @@ > #define REQ_FILE_PERFIX "req" > #define RSP_FILE_PERFIX "rsp" > #define FAX_FILE_PERFIX "fax" > +#define JSON_FILE_PERFIX "json" > + > +#define ACVVERSION "1.0" >=20 > enum fips_test_algorithms { > FIPS_TEST_ALGO_AES =3D 0, > @@ -40,7 +47,8 @@ enum fips_test_algorithms { enum file_types { > FIPS_TYPE_REQ =3D 1, > FIPS_TYPE_FAX, > - FIPS_TYPE_RSP > + FIPS_TYPE_RSP, > + FIPS_TYPE_JSON, > }; >=20 > enum fips_test_op { > @@ -161,6 +169,23 @@ struct gcm_interim_data { > uint8_t gen_iv; > }; >=20 > +#ifdef RTE_HAS_JANSSON > +struct fips_test_json_info { > + /* Information used for reading from json */ > + json_t *json_root; > + json_t *json_vector_set; > + json_t *json_test_group; > + json_t *json_test_case; > + /* Location of json write output */ > + json_t *json_write_root; > + json_t *json_write_group; > + json_t *json_write_set; > + json_t *json_write_case; > + /* Other info */ > + uint8_t is_sample; > +}; > +#endif /* RTE_HAS_JANSSON */ > + > struct fips_test_interim_info { > FILE *fp_rd; > FILE *fp_wr; > @@ -196,6 +221,10 @@ struct fips_test_interim_info { extern struct > fips_test_vector vec; extern struct fips_test_interim_info info; >=20 > +#ifdef RTE_HAS_JANSSON > +extern struct fips_test_json_info json_info; #endif /* RTE_HAS_JANSSON > +*/ > + > int > fips_test_init(const char *req_file_path, const char *rsp_file_path, > const char *device_name); > @@ -212,6 +241,17 @@ fips_test_parse_one_case(void); void > fips_test_write_one_case(void); >=20 > +#ifdef RTE_HAS_JANSSON > +int > +fips_test_parse_one_json_vector_set(void); > + > +int > +fips_test_parse_one_json_group(void); > + > +int > +fips_test_parse_one_json_case(void); > +#endif /* RTE_HAS_JANSSON */ > + > int > parse_test_aes_init(void); >=20 > -- > 2.25.1