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 8086E428F8 for ; Sun, 9 Apr 2023 17:28:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BD48410EF; Sun, 9 Apr 2023 17:28:02 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.68]) by mails.dpdk.org (Postfix) with ESMTP id D20FF41149 for ; Sun, 9 Apr 2023 17:28:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R5k60Bp2mBpM7Ay6nklv1/vjn8WRO/E279ZFXZT9uTkTJkfDP03hTpM+YTFkTKRpbcJb7qwAItGF7zzqkar+dlozlT9x0yiSfKKQ9HJ2TstdA218GxhbOShYr/U0gZH3tZcUYXh3AEsTr0w0s8XtVyJCDnQx2o5J4duRlQm6k/7YZKbReEocmj+zd7YDOigXBpxU0+2Rxzau8x9vodrwujXjqEFPO0nyldZqGkM+WeY1WgDkSRi1HBKso8erqCfNtBD/mesJDKyMiIbu7AfXQ5xky3loVvX8KuHqvEOT9ZEzT/esZOL23cvsCaPRwIFqoJMpi3BBLLqZwxOiGup9eQ== 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=20RJBXIBDeFNmJNYQIZ1H2fweTfyjf3evo0t1IN5roQ=; b=Sdy+faJbKt2jcT4ZkDDzIcvVYLxc9WlgeeZaAx2YVWzevoQw0Xx0MLGlqY4v7OJEZxb7W7yipj8l2N4k2+HY6upNG8ig42tmC3cpcRn48Uzn/jvHtnPiKhEx4eg8BYwE06zb8JIcgN/vN/3RuLnSx78E/KyzCC9BXKq6eqPYA9op7FLNuV8PO41NY0KgaC0mcQgQPKLHF+k6i/pZc/5uYi/o8Hh+10VMqjlruzzSpr/mgQNvnzE3w8hfyDwL3DtBY4x23jEMR4RxF55pmLW4h2GRhJPuD1jEaz4MFTsZCyFbQpXJ2ACVXOe6movr0SWIOHzaVe5NKN3P7hpiBhJNpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=20RJBXIBDeFNmJNYQIZ1H2fweTfyjf3evo0t1IN5roQ=; b=jWQUMLlL+QH/gpVFaHYa0up76Wh8Kayul82+9tQ+s/ToPsNDHR7SSj0MlcplFQ39mF1waaG7CNISf2HDzaCiM1JIUURVxNeG00vfGlcsLtns5pxt+2mQERZkzbeCPa2uUU7xuPSqXU5du7UOxfFgqhu9QZskFFDO1AQUMwY/PXGeBM84NhCKI0mtpq49y/TAXigjckZF7TfG+oSPEiosuF6LOzGhWFfEZAImOGGOc3f7zbZWyiCe7ig/ahaqJhZ9cZ2TCmzoGsoovQFx3n+06at4bnyZt3OVK0cC4W9652dyZuHjaTL2v9ensPTHlYkzwWOsd8sMyEoWZNM5QkxmJw== Received: from BN9PR03CA0527.namprd03.prod.outlook.com (2603:10b6:408:131::22) by IA0PR12MB8746.namprd12.prod.outlook.com (2603:10b6:208:490::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:27:56 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:131:cafe::85) by BN9PR03CA0527.outlook.office365.com (2603:10b6:408:131::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:27:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:27:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:53 -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:52 -0700 From: Xueming Li To: Gowrishankar Muthukrishnan CC: Brian Dooley , dpdk stable Subject: patch 'examples/fips_validation: fix AES-GCM tests' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:33 +0800 Message-ID: <20230409152529.5308-26-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: BN8NAM11FT031:EE_|IA0PR12MB8746:EE_ X-MS-Office365-Filtering-Correlation-Id: c8a79a50-c59c-4ce9-4d63-08db390efe5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7I0ZNrwFZZsWBIUT+X9tgcr9BJqIFW4iSDiDgyJQkzWJZ+FJvr1F4OS7SJL8imTGoh5jZNGJ2GkUXtAF2kT5MbaI4gVbkVPgrDRx8a8WYLhX8F3q8Af10j0+23Eq0PZ7DzjiLcTEGR/l4ajpSZQVgogLpjsv8/WbR5kD+6YcP2i6iAfDREFq9lyxshzgMaWMTtX+hlpM59EHc6wbjohCtB3xSXAD19qQ0WOSZMDOJ465RakDyb5Dz4ZRY+8r3nM60/5X+mbQYsLVwfEy0GUG6/lQTwreyrfVtZpesGdiYBPfFbTn2pDdyAKc6xk7k1G8gcbYUeGp6NnwXPGvqCW18zngNvDqV9VH32qVwLBC0eQ0/KE31/yXE/b3gtZmhVzoF+xguGc9DMcdcKH/kywJfnneAXaou+O22HB5RTjoiZ/9d3te/dtNVjvdde3l097JPP1i4XUSdtsZCVYH6HRhjWhDaCdpldiO1tmq1LU+uSB/g+syajuxh+nTVKzBcJc/DTHKqES0PrnM0xX56aviKAiUWajVykkVpTWZOoOoou6BykrsFLPVMEkzXD6Kt1fbyTNVp5auHjlXWvHEw/1arCaIYP2r8u6dCihwrU96GbmlsWjKPV/ROmSSY4PhvDR+WFf3iFlmzxMyCHdzzLx4u698bNrhrWYARHnKk6gjbYwEJBTgORz2z8BqibpmBj+VHusDNMUMYBbDZFryW55rTc2mYjk6X4wlxsEQWr7f878Rd6/0uuyf8NpYPvz+DZakQeS/B7bf9Pyxh0epCOQsm4aXbZy9hXqNgZxgm1PNxVlWK+WQwdmKAmwPUjGmIzX7mPZ4Dcol6xy77iLcx21fUw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.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)(6666004)(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:56.0682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8a79a50-c59c-4ce9-4d63-08db390efe5a 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8746 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/91c80e936a315c764b9a9954a14db1d63c5435cf Thanks. Xueming Li --- >From 91c80e936a315c764b9a9954a14db1d63c5435cf Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Tue, 28 Feb 2023 22:58:54 +0530 Subject: [PATCH] examples/fips_validation: fix AES-GCM tests Cc: Xueming Li [ upstream commit 02913adaed71fa8437fca727220303b4a0df0896 ] AES GCM validation tests fail in FIPS validation due to incorrect fields populated in response file. This patch fixes them. Fixes: 5b540bebac8e ("examples/fips_validation: fix GMAC decryption output") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Brian Dooley --- examples/fips_validation/fips_validation_gcm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/fips_validation/fips_validation_gcm.c b/examples/fips_validation/fips_validation_gcm.c index a80d8b3e4d..bf08d1b995 100644 --- a/examples/fips_validation/fips_validation_gcm.c +++ b/examples/fips_validation/fips_validation_gcm.c @@ -79,7 +79,7 @@ parser_read_gcm_pt_len(const char *key, char *src, if (ret < 0) return ret; - if (vec.pt.len == 0) { + if (info.algo == FIPS_TEST_ALGO_AES_GMAC && vec.pt.len == 0) { info.interim_info.gcm_data.is_gmac = 1; test_ops.prepare_sym_op = prepare_auth_op; test_ops.prepare_sym_xform = prepare_gmac_xform; @@ -296,6 +296,7 @@ parse_test_gcm_json_writeback(struct fips_val *val) tmp_val.val = val->val; tmp_val.len = vec.pt.len; + info.one_line_text[0] = '\0'; writeback_hex_str("", info.one_line_text, &tmp_val); ct = json_string(info.one_line_text); json_object_set_new(json_info.json_write_case, CT_JSON_STR, ct); @@ -326,6 +327,7 @@ parse_test_gcm_json_writeback(struct fips_val *val) tmp_val.val = val->val; tmp_val.len = vec.pt.len; + info.one_line_text[0] = '\0'; writeback_hex_str("", info.one_line_text, &tmp_val); json_object_set_new(json_info.json_write_case, PT_JSON_STR, json_string(info.one_line_text)); @@ -334,12 +336,8 @@ parse_test_gcm_json_writeback(struct fips_val *val) json_true()); } } else { - if (!info.interim_info.gcm_data.is_gmac) - json_object_set_new(json_info.json_write_case, PT_JSON_STR, - json_string("")); - else - json_object_set_new(json_info.json_write_case, "testPassed", - json_false()); + json_object_set_new(json_info.json_write_case, "testPassed", + json_false()); } } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.462033600 +0800 +++ 0025-examples-fips_validation-fix-AES-GCM-tests.patch 2023-04-09 21:45:38.609042200 +0800 @@ -1 +1 @@ -From 02913adaed71fa8437fca727220303b4a0df0896 Mon Sep 17 00:00:00 2001 +From 91c80e936a315c764b9a9954a14db1d63c5435cf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 02913adaed71fa8437fca727220303b4a0df0896 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org