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 1D517428F8 for ; Sun, 9 Apr 2023 17:27:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1790F4067E; Sun, 9 Apr 2023 17:27:40 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) by mails.dpdk.org (Postfix) with ESMTP id EFB6540141 for ; Sun, 9 Apr 2023 17:27:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A2HDjMbOZB1rWDxunjZ9I40iomV3/XFxsOB4/zM4TBy6SJWHYh+71nbmWViYAtA7LSP+107txIMoZmw7qtXtmk39Pz4b1eVHaHtOTx60W5xCONktfe1FHTmloCpo6HJo9BvV5GSE9ngdGzZ8abnA9bqdsnSERWTAatvdTjCqcMCdHOQcgWVTtm6hhEozIs5yEqdygJgfbDr+EdtQgvU8YOotC6HRXarNeBcn8xdYV0q6/aOycAzAm8upmf2nyOUIrHMwNCZO/cg282i74NjwsTbDGPPZQ73Ez1dpBxkS6gHpcVYdpRy0A7qsEg9hTWxUeJSIniJxnDvgdMu5wuY9JA== 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=ytQa6AQOaA4LLDDcS5P94l44Rs4oliTSTj49sAaJxao=; b=HS8e0amIBT4aGX+Wk/1j3N3J53gGTgdbn/8nBc2qFma0mH1+CkUvaiiR3dOgL3vAsM+s4dUfBIz1C/QW8yfUtvLZ7dKTCXuPyNwaANUYrZ1tfgi4hknLVaNyBeETb8AE/TvbI0LkA+fM2loCivrzujcZZ1ukEl8UUQzmZ+nWdMI0nZYZCFALo6VxMKQRVfUru5YWbcSGOZw+0Re+Qhu5MVxBYsjlbMLpf0f1YjpETx0AvAZ2pGI0DdRGs2Np6okP2vBqvZW6iZG3paF+YYStFS0Mo9LKTYgbnfAYi6knH6T1gJ6iHgFc6yqbi4U6mF7M5pxquFSBuJxmIM6VHI7lpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ytQa6AQOaA4LLDDcS5P94l44Rs4oliTSTj49sAaJxao=; b=AOZQO6MnrtjRz/NLNlDraZS0eapVLM+jXdD1qR6QnBDoHTMCdwNlACM0DDrW4AjAxIU2ZafqWOljxgUU5pLmwmZPYBw19fWOcU7U0lx3vlXHyNFtXKvlXVRa083+AVUJQjogi0Sl8cCrMQeVJRN35/V5IKOizCog55eKhuJ9s6tAxwB8D0YNoZPwb4c3l0h5pHoqTKageRc7vRhqW8QLsFnYZ8KvcBlwSXHskgI0G3UqisUUJbcyJphCLFy4JlKKWatszFT6C7HvtpyNTGJ7FhphC/apXBJfLDKDn4i3Es8k0KPYkX8IJSrTWyJiGKn2NLqB/TGQAmrA1XAFmtsznQ== Received: from DM6PR13CA0009.namprd13.prod.outlook.com (2603:10b6:5:bc::22) by CH0PR12MB5187.namprd12.prod.outlook.com (2603:10b6:610:ba::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:27:36 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:5:bc:cafe::a8) by DM6PR13CA0009.outlook.office365.com (2603:10b6:5:bc::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:27:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.26 via Frontend Transport; Sun, 9 Apr 2023 15:27:36 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:27:32 -0700 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:27:31 -0700 From: Xueming Li To: Gowrishankar Muthukrishnan CC: Brian Dooley , dpdk stable Subject: patch 'examples/fips_validation: fix MCT output for SHA' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:31 +0800 Message-ID: <20230409152529.5308-24-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT059:EE_|CH0PR12MB5187:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a4eac67-9def-4b7b-6c9c-08db390ef2b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 24WxCg65Ry8PK1g0XHEt45H5TOQy4VK1RZDW7DWSkSEwRjL0BcuMrc8VAn7Pt/x8GiwIvzoljqbrj5vQgpByAmmA4YN3iiaS7NYtmxC27S0RS4E9p4hnu8CMiRy+j0nG0EC1+GL0Mpx6CN4rkofjxJLtKORHJDH9HWxqQMKT+gchi4O+2JtiZICz8Pp+OO5xQQbEpmkG4wvaM4QbZkW93dev/sOkPUTVnhzhdVal7qfcHgGeuZ4bHyDw3FNyQxJAvptKcZr4UjORR6H22nDdjZ9innii3yaBX+PGoQn4jAEQyN4U3uiGJNf4RCUKMP7MN/xU85pVN9OryDmbHqbFNQG+pCbqNUsG3xi4K6vBisX9FL9dJ340cebygOg2WE7d3Cbxq3CREWl5LheWAGjjJ1Z5kKB2Ubh4ig4OA4+1fgBKcCRQwi0sP6cN7f5JNmfkIEgmDmsq/xQab0Xg8Xl/iv1uZ2O/uTEZp2IDsugPrkisnOejc4j0Yygf7PsI+DEiTsIKaMM1DADvcRKCqp4VRL7wcc/h5ow7rz5XcCcYKFyW8LVlADe2JQQSWm6BpVfZ0NQh6FJAUfbaMHXR2P7rxoV//E4hnAYI1WGi8CrxFmw+P8ODY9WIELk0tX8tAAzGkASEgWjzZWG3IaH2HdRjlZeWqIsLJSqaOMD91hoGlZnXgtBr5GFoSpzbEedAar3GjwY8r8TFbODgukaXpFEbEPs5nApRFU7DYIHQsepiDHKXtpE28q2cu6WxbZMHtZYOQkEt/1fT9PIITe9GKuNa8AjxmNAPm5aOWZWnFfGBCCeef281u+D/Qp8Mnx948PV0MTmzsfDekMLlNYuxqn5pFA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(396003)(39860400002)(376002)(451199021)(40470700004)(36840700001)(46966006)(478600001)(7696005)(54906003)(316002)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(966005)(2906002)(4326008)(70586007)(70206006)(5660300002)(8676002)(6916009)(41300700001)(8936002)(82310400005)(7636003)(356005)(82740400003)(55016003)(86362001)(40480700001)(36756003)(40460700003)(47076005)(83380400001)(2616005)(426003)(336012)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:27:36.5755 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a4eac67-9def-4b7b-6c9c-08db390ef2b2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5187 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/ac87a06f6b908e77f56be9ca3d772e54f9e111d2 Thanks. Xueming Li --- >From ac87a06f6b908e77f56be9ca3d772e54f9e111d2 Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Tue, 28 Feb 2023 22:58:47 +0530 Subject: [PATCH] examples/fips_validation: fix MCT output for SHA Cc: Xueming Li [ upstream commit fc78f69d6482fd69b9d475b7f7d003bcd26e4588 ] MCT test for SHA need not print message string along with digest value. Fixes: d5c247145c2 ("examples/fips_validation: add parsing for SHA") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Brian Dooley --- examples/fips_validation/fips_validation_sha.c | 8 ++------ examples/fips_validation/main.c | 13 +++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) 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; tcId = json_object_get(json_info.json_test_case, "tcId"); @@ -208,11 +208,7 @@ parse_test_sha_mct_json_writeback(struct fips_val *val) res = json_object(); - writeback_hex_str("", info.one_line_text, &val[1]); - msg = json_string(info.one_line_text); - json_object_set_new(res, "msg", msg); - - val_local.val = val[0].val + vec.pt.len; + val_local.val = val->val + vec.pt.len; val_local.len = vec.cipher_auth.digest.len; 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] = {{NULL, 0},}; + struct fips_val val = {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; } - ret = get_writeback_data(&val[0]); + ret = get_writeback_data(&val); if (ret < 0) return ret; @@ -2337,7 +2336,7 @@ fips_mct_sha_test(void) memcpy(md[1].val, md[2].val, md[2].len); md[1].len = md[2].len; - 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 = vec.cipher_auth.digest.len; } @@ -2348,9 +2347,7 @@ fips_mct_sha_test(void) if (info.file_type != FIPS_TYPE_JSON) fprintf(info.fp_wr, "COUNT = %u\n", j); - val[1].val = msg.val; - val[1].len = msg.len; - info.parse_writeback(val); + info.parse_writeback(&val); if (info.file_type != FIPS_TYPE_JSON) fprintf(info.fp_wr, "\n"); @@ -2361,7 +2358,7 @@ fips_mct_sha_test(void) rte_free(vec.pt.val); - free(val[0].val); + free(val.val); free(msg.val); return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.413374300 +0800 +++ 0023-examples-fips_validation-fix-MCT-output-for-SHA.patch 2023-04-09 21:45:38.609042200 +0800 @@ -1 +1 @@ -From fc78f69d6482fd69b9d475b7f7d003bcd26e4588 Mon Sep 17 00:00:00 2001 +From ac87a06f6b908e77f56be9ca3d772e54f9e111d2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fc78f69d6482fd69b9d475b7f7d003bcd26e4588 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org