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 0E09B41D8F; Mon, 27 Feb 2023 10:31:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F302741148; Mon, 27 Feb 2023 10:31:24 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 9EC3340A84 for ; Mon, 27 Feb 2023 10:31:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677490283; x=1709026283; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=tEQWhyagOiCTDGQxmKA1vx5+iR6OzR8HNEr/JCapSaI=; b=hU+Mi7vTOOy8opRA+r3HDZzTX8lbnLIe3i+3/+kKnqs2UgUqV5crn45F Q05F8o0X8rF2yZlqlm0Ad4qUhxQmUxaFOZGeQgmFv5uCps2G4xQ7fajcK b/9OUkqVcBjNSJvxSUmn2XtVwA37Zy+q/hHv8PMFtOVSh/4ZAjEGMRBe2 diNQiPbaROqV8A5h9x6n6AwNoum3ztjPxGrEb/fFgMV6K34qoLZ4liCP/ KMlq+EIhhFnT6cOPK8IpcFxA1Ech6F6lNYEqXhp4xLtzrU2XQNAQXereR 5poZzBWpjhTBiyiWZ8xPCMdFi3tLB6lI7l0eOCa7aH4In7bUXzmdyykuO g==; X-IronPort-AV: E=McAfee;i="6500,9779,10633"; a="317619384" X-IronPort-AV: E=Sophos;i="5.97,331,1669104000"; d="scan'208";a="317619384" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2023 01:31:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10633"; a="797544823" X-IronPort-AV: E=Sophos;i="5.97,331,1669104000"; d="scan'208";a="797544823" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga004.jf.intel.com with ESMTP; 27 Feb 2023 01:31:20 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Mon, 27 Feb 2023 01:31:20 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Mon, 27 Feb 2023 01:31:19 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Mon, 27 Feb 2023 01:31:19 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.102) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Mon, 27 Feb 2023 01:31:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fp/x0KU9ZEo66BrYHo9/zFgEmZCpj5qOALlASmC3gXb38wgWdoHv6g+yQ9L4Yxw8CXFWi375qVVAdAHRqgm0C9Bw0qwnJO3Gx2DOfCXCVvyG6Lrn0g5eQGSIjpZSXEPpK58828JeGwmgNQBvQj5sZxN9x8hl1iFQEpI2yepHIMFjxmeEDQIewHEB/9GQgkDBbTIo3RgqXbbIkXytel56jLhinwCjs1kLBu5K+e5/t73TA/menB0T857iEEPY2lNFbsbeJCmfEydEzVP/FeesXY/Z3MlKHbYxPg4v2LHbPIb/5ePHRWuIaOGZy0oFsz+SW+WRN1Hy+/OxXw2VKnHNhg== 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=ABUp41aSyP3CviXAYxSIsRfhSS9j+51EcC4iEZitrJQ=; b=PrMtnV9lvdQGfRIU5EhaEOYHT7Aan+zoeulCUFK6WZhygR/zXkSiiEAV17od6KNJQvxkWgKuSCAe+8m5UdgIzjuHKPP3DYypfQhmHJtOZw2lSlUppDuB01YIvT7UIaXXV3H4r2+a2Ba+xKhi6CYKf0Z2fNvbdVWgYE/gyX4K/VRkWtMnx30OTYVcKEti4X5/4RsfSaxJE+nV+fDuBooLLfNv2W4kUXBp+pjbMEn4K1Co09capHmcp2WQQcnmshNG1UQOHY8lmrd5Y/K60OChINhn9h9HNNkmOyvMJjge1ZZ9DmaOg1mMX3bhXND1KpgjhpL68bd0nb5xh5LKTs2MZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM5PR11MB1851.namprd11.prod.outlook.com (2603:10b6:3:114::18) by MN0PR11MB6277.namprd11.prod.outlook.com (2603:10b6:208:3c3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 09:31:16 +0000 Received: from DM5PR11MB1851.namprd11.prod.outlook.com ([fe80::3c23:7638:8d23:670f]) by DM5PR11MB1851.namprd11.prod.outlook.com ([fe80::3c23:7638:8d23:670f%5]) with mapi id 15.20.6134.027; Mon, 27 Feb 2023 09:31:16 +0000 From: "Dooley, Brian" To: Gowrishankar Muthukrishnan , "dev@dpdk.org" CC: Anoob Joseph , "jerinj@marvell.com" , Akhil Goyal Subject: RE: [v1, 01/10] examples/fips_validation: fix MCT output for SHA Thread-Topic: [v1, 01/10] examples/fips_validation: fix MCT output for SHA Thread-Index: AQHZOjnWRP0QnnGqjk22EzkGagt7yK7ip//A Date: Mon, 27 Feb 2023 09:31:16 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM5PR11MB1851:EE_|MN0PR11MB6277:EE_ x-ms-office365-filtering-correlation-id: e727bc6e-cd03-41ee-04b0-08db18a56001 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: krVo/iKon2tbY2yRvwU4Mq+sZza8cb2O5VKxag7J6pcDadfxnSbDXuy6NxIk0WbX6fzdXn7xut7h5qbA4oKN0A7ZWDqwQyCGP3cPYUo5A80544XS5Wx9bI6EtjGUF/aL8MgO3kGHJ/961h4sRsFzhrEdkc0Hb57dGSpLu2VqDmKiUdAfHznNLFlu2la2jYNH6xZnyGDjFyFBldgkwPX1jBgXdLkaWpFh0RMVHnPT470R6Rl1jApU4wwT5cxFTub9ysfkLmkNEO/41hiVyuUzXucpf52+I/P0zNQcj2Lteu0W1LQrxs1WzELvrX9MwHO34nfri81sr9RCIYmVKD9ZkEVNdpz4WBSfMR77PVQEIX5dHZUSQ88GW3QPHCJF2btADFNf6Gh0na8sWNQqFnvEUQF4WfI6ojVJHCsOc9K+mRHUKD+h1tIaoHyuMizxgMQyTG0kVxC+eSEGhIRwgU0OWo/zWxMhxmVrHhTAofrBInsVgW1V0vvTKiZYx8J6qshKBxooidKKQoKGk9HF33sSRleBQe5AxY+2YDgFD+zSnzLpzQ2h+/AYibQQeQWUx/xYtUT3myxRAWwksK1n0/7UzJ6TuvAkA9r0nsYP4swVBMLXhSB5TNZTV7Kb8lfD0B6ARIkCeOVoKni9qSVrLJ+hKnouiztvaNJh2q7GJLnjXpdRON7KHgbAjFhu0Dish6X+eYlntsBxUKqeRNKM6invug== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR11MB1851.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(376002)(136003)(39860400002)(396003)(346002)(366004)(451199018)(41300700001)(66476007)(66556008)(8676002)(83380400001)(66946007)(4326008)(64756008)(66446008)(76116006)(38100700002)(82960400001)(122000001)(55016003)(2906002)(38070700005)(33656002)(86362001)(5660300002)(8936002)(110136005)(71200400001)(52536014)(478600001)(7696005)(53546011)(316002)(54906003)(9686003)(26005)(186003)(6506007); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?NO2jYH9jAL+ORSn9V/2syVlq0SUVn0WyevEzPQCLKGKYB5JwdBGwMnvrcNW+?= =?us-ascii?Q?ru3jyL6n36lexHTNy5CHp83DhP+1fSP4lBbkDUpazE17md9hjSVVcziis0v8?= =?us-ascii?Q?gZkWQ2KpuUrlOcH5HEtIqVKhDZH8ieBTtO7GS7bcGghT03HSREoChrV1/5iX?= =?us-ascii?Q?Ji0V1ByHIevIo020Laec1xpa/ijyN6nmLq2rUO9jvcHZl3WHNEI7NxTa//M4?= =?us-ascii?Q?c9TJf1zSubdUHXaLyfQX7lxbui17nl75gCFKxATlTRbBqrd0uVJuw0k04pjE?= =?us-ascii?Q?8fXQElrp9BTQDpDwze+bB8EJZxTdt0hWkP1eDYw9MU4izkw4iTpFwVD3yOx4?= =?us-ascii?Q?hrOt/MQ/GEiJufAgD6dLHrS0HxoEpxjGi9/duQG4/iLeA/ZmXUepvwCCczms?= =?us-ascii?Q?OeczcL2Q1Y3SeSqCwJ07wiUFAVIDcKUey+AxdNK3udoTgn29B8zODwo15/7T?= =?us-ascii?Q?zfVfhz9jROmUWTtJkB72WyzZbFOccc3yezmkCBOYtElIXXzx4kH7sEikXqlX?= =?us-ascii?Q?ELKKPGErv4sMCh+P1FrznInYl8ttan2aoX/Jm/Z9cSZTE4PoLaYlTIJJmxtg?= =?us-ascii?Q?ZIGqWWp9QTPgic0qYhD03AgNTyKuznI0k4UxqOJTpaJf7K6ZRfFkM61zZi7G?= =?us-ascii?Q?re6TU0C6MmgoJX3ksfAdvD9GdJOs+SXwhp0eGVJ+mq7wKIGC66jUCoGhLEsv?= =?us-ascii?Q?+GfBlfwuDKajDf/GlrdicSfk/Rm+ZRyzVRtqKUq3y9CqAWXRxBOexyQh7D6X?= =?us-ascii?Q?vRRuC/8TqJeNxgNGCPSmHXk0NNR5AWZN7vlFrLDsJ0Jw7qJrsdK2Hs0G/fBW?= =?us-ascii?Q?BwGBc0J9V2JjDMuCgjsegzaDBJDPZLeHemns4Wq4Bua++lxDYFVEbbkTcN5z?= =?us-ascii?Q?Kg/BNADa4LsRAIZ6p1eMGurimc33ZbIjn9m2HgDacTVKJ1ICAWyIyqqrj8vp?= =?us-ascii?Q?twIy4HyPHOO4EMVyszbxkdZ8SaTTtNBunWJ5zbTPpRcKYbKnfDoPfcDRCFcV?= =?us-ascii?Q?/18HZMYl1mLRgc3A6wmh7V3kr3rcgeBzqbt1CRcLCdgtoVUCxr5XL3MlyTZT?= =?us-ascii?Q?IOznFopcJRpBCl+0EQC5WBN7bCnZksZo0WQdKr4Yb+a+GKly9Q2Oab6lUaEL?= =?us-ascii?Q?Q1gVTzU0dfLydQAikiImQiS/xnz24Yw8dXJYfdCItbO9qeg5FewTDu6kVZkL?= =?us-ascii?Q?xmeA2DRpPL3MtRDI3LzJas7JrP68xxotNbFUj08bmQhtMH/atdtBGYbtJK3I?= =?us-ascii?Q?COJTf/WdD/l4T/AkrPUet/J0YDgM27M1oH4m5iVrw/OSsy2Ve/moT57rdHrQ?= =?us-ascii?Q?3ZodTXgiXPVOytJD2aMrCy4IMyTjIGQYGOXzAJKF2QV/UQs9cksrlKdhvP7S?= =?us-ascii?Q?/lJ4pT4AeVIHdrx7Ec4aa1g2vcSeXm/JVdy8KD9pitc1LfRo0Qk2Omu94tNa?= =?us-ascii?Q?oRuiJnqw81TdlTmZ4HpoiRisOoMXMZuBzReDHIMKRFAE591Nnst/TjngrPE2?= =?us-ascii?Q?LiqfqlDLnnNkFgmApxXdI5Dwa/NeKr7n2nZZiIdDspfxoFbq0XeJcNSpEuFp?= =?us-ascii?Q?e20Otfy0EaBpF35l4o3o/jJPFwffJ/vpY1tjbCO+?= 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: DM5PR11MB1851.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e727bc6e-cd03-41ee-04b0-08db18a56001 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2023 09:31:16.1938 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: a9QUV1uYVDEk59fOREKRv2+ETw3fFzBIs2ALpQp7AzGfZD3tCN/JWR1dp8VFKnrMVlBU5dm5oQMP/1c55t67+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB6277 X-OriginatorOrg: intel.com 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 > -----Original Message----- > From: Gowrishankar Muthukrishnan > Sent: Monday 6 February 2023 14:46 > To: dev@dpdk.org > Cc: Anoob Joseph ; jerinj@marvell.com; Akhil Goyal > ; Dooley, Brian ; > Gowrishankar Muthukrishnan > Subject: [v1, 01/10] examples/fips_validation: fix MCT output for SHA >=20 > MCT test for SHA need not print message string along with digest value. >=20 > Fixes: d5c247145c2 ("examples/fips_validation: add parsing for SHA") >=20 > Signed-off-by: Gowrishankar Muthukrishnan > --- > examples/fips_validation/fips_validation_sha.c | 8 ++------ > examples/fips_validation/main.c | 13 +++++-------- > 2 files changed, 7 insertions(+), 14 deletions(-) >=20 > diff --git a/examples/fips_validation/fips_validation_sha.c > b/examples/fips_validation/fips_validation_sha.c > index c5da2cc623..178ea492d3 100644 > --- a/examples/fips_validation/fips_validation_sha.c > +++ b/examples/fips_validation/fips_validation_sha.c > @@ -182,7 +182,7 @@ parse_test_sha_json_writeback(struct fips_val *val) > static int parse_test_sha_mct_json_writeback(struct fips_val *val) { > - json_t *tcId, *msg, *md, *resArr, *res; > + json_t *tcId, *md, *resArr, *res; > struct fips_val val_local; >=20 > tcId =3D json_object_get(json_info.json_test_case, "tcId"); @@ - > 208,11 +208,7 @@ parse_test_sha_mct_json_writeback(struct fips_val *val) >=20 > res =3D json_object(); >=20 > - writeback_hex_str("", info.one_line_text, &val[1]); > - msg =3D json_string(info.one_line_text); > - json_object_set_new(res, "msg", msg); > - > - val_local.val =3D val[0].val + vec.pt.len; > + val_local.val =3D val->val + vec.pt.len; > val_local.len =3D vec.cipher_auth.digest.len; >=20 > writeback_hex_str("", info.one_line_text, &val_local); diff --git > a/examples/fips_validation/main.c b/examples/fips_validation/main.c index > 622f8b5a6e..cc585e8418 100644 > --- a/examples/fips_validation/main.c > +++ b/examples/fips_validation/main.c > @@ -2268,8 +2268,7 @@ fips_mct_sha_test(void) > #define SHA_EXTERN_ITER 100 > #define SHA_INTERN_ITER 1000 > #define SHA_MD_BLOCK 3 > - /* val[0] is op result and other value is for parse_writeback callback > */ > - struct fips_val val[2] =3D {{NULL, 0},}; > + struct fips_val val =3D {NULL, 0}; > struct fips_val md[SHA_MD_BLOCK], msg; > int ret; > uint32_t i, j; > @@ -2328,7 +2327,7 @@ fips_mct_sha_test(void) > return ret; > } >=20 > - ret =3D get_writeback_data(&val[0]); > + ret =3D get_writeback_data(&val); > if (ret < 0) > return ret; >=20 > @@ -2337,7 +2336,7 @@ fips_mct_sha_test(void) > memcpy(md[1].val, md[2].val, md[2].len); > md[1].len =3D md[2].len; >=20 > - memcpy(md[2].val, (val[0].val + vec.pt.len), > + memcpy(md[2].val, (val.val + vec.pt.len), > vec.cipher_auth.digest.len); > md[2].len =3D vec.cipher_auth.digest.len; > } > @@ -2348,9 +2347,7 @@ fips_mct_sha_test(void) > if (info.file_type !=3D FIPS_TYPE_JSON) > fprintf(info.fp_wr, "COUNT =3D %u\n", j); >=20 > - val[1].val =3D msg.val; > - val[1].len =3D msg.len; > - info.parse_writeback(val); > + info.parse_writeback(&val); >=20 > if (info.file_type !=3D FIPS_TYPE_JSON) > fprintf(info.fp_wr, "\n"); > @@ -2361,7 +2358,7 @@ fips_mct_sha_test(void) >=20 > rte_free(vec.pt.val); >=20 > - free(val[0].val); > + free(val.val); > free(msg.val); >=20 > return 0; > -- > 2.25.1 Acked-by: Brian Dooley