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 2E20B428F8 for ; Sun, 9 Apr 2023 17:34:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28EA54114A; Sun, 9 Apr 2023 17:34:38 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2084.outbound.protection.outlook.com [40.107.94.84]) by mails.dpdk.org (Postfix) with ESMTP id 5CB3740A80 for ; Sun, 9 Apr 2023 17:34:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GHeM/xubwqGWFHNbxv0zDJYngjxySxHf/7boa+bwODpKeyzKAUHG+e3FVUr+n3Zp1Od/OUVx8Hupfx7CvO0yTzlBJsO0xQG0ZNVxshYx9ipllCVRQzqy9BxKgOK5Rj2a5uP9Y6UX+DrNpne8j1T7+CY5dAEJsu9xTh6jwSreJb+cLfKqgJ8B/WNKxYzUXMRxcoEsKQWTH5U9WN2NtigwGKZckSXHnX4pfQY0Mi08kXdlDHKEto+Y4kmpKkyeZLrLHVTCUSK0aBPTizwJiRMA7A/d/NNRRImZSIpz0h/qW8uRe+QmdknP5YnLKGoOW513ixbA3BJzo16toSdUn610GQ== 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=02D6bAUlubxtxeq1wzyM7zs4Xwo8RPPf1UjVbDUf94Y=; b=eoSZ4beY1bSJDy5VOmJnGBvKkIMMkSKJwB4ixB0GDYy1+CjmDDjYm3uIFlfI+RVMr/u9Zf06+dUx15OdzoobF6Uv0p8NesPvAqZos3qElfo6NsPBuu9fplMH7eCw/2O/0TKgLcsBCZ0aLu8pKDT23KXzG59FD4IESXMumJaqQa9mMU1m333ahYVUO6arZ5zSkPpkQfPwkhgiR9wBWw0dbpUhQKdEZblGf+0ldSRzgNlUHDmlRWA/aXxg6mHg9WhRC04MOss25ZJtTgaDHxsmAtCLetBAETYK9x3UOsb+jNY2ecjJLW698Nc/Z6OZYNSsgvPPQiVItNwXvJYee+chMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=02D6bAUlubxtxeq1wzyM7zs4Xwo8RPPf1UjVbDUf94Y=; b=mzmA4pF3WWoilCwnVbJ4OHUlVvUZVJYwHb19MnJlhRwkiudU+BVoNXL3GAPkrIFG+lc4i76OYhp7xs1v5yGn18V79JuAeqDqqzL6EVcoNHzrelJ28B5N8qHqA2r0xH9H02SjWR/l8jQnDt8qLFQI23QYvZ7frtJDql8leuVdpyuTK6EQ6Zjb5KI3mO85mKqJAAD87AVJnr7Mmuip98jd0U5YOh2DNFWnMGfifRJ5HSMokuYM0Q2gLA53p6K8IOAuQdpJVpkFBGPc8RfJ1aotOwp4LfE46/mVXsq3KTN8kLQG9ye4Ub/2ihj4DzyuXF51CIZhxZQkkf6eaGT8i3+wuw== Received: from BN9PR03CA0705.namprd03.prod.outlook.com (2603:10b6:408:ef::20) by CH0PR12MB5235.namprd12.prod.outlook.com (2603:10b6:610:d2::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Sun, 9 Apr 2023 15:34:34 +0000 Received: from BN8NAM11FT093.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ef:cafe::82) by BN9PR03CA0705.outlook.office365.com (2603:10b6:408:ef::20) 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:34:33 +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 BN8NAM11FT093.mail.protection.outlook.com (10.13.177.22) 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:34:33 +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:34:21 -0700 Received: from nvidia.com (10.126.230.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:34:19 -0700 From: Xueming Li To: Ciara Power CC: Brian Dooley , Tejasree Kondoj , Pablo de Lara , "dpdk stable" Subject: patch 'test/crypto: fix ZUC digest length in comparison' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:51 +0800 Message-ID: <20230409152529.5308-104-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.230.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: BN8NAM11FT093:EE_|CH0PR12MB5235:EE_ X-MS-Office365-Filtering-Correlation-Id: f171e60d-c65e-49d3-7d53-08db390feb1e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BvuxBJutrVQBPd5iPBhkPF37ACRIqgr9fsFc0s+rLb0j4xqs1I67Z+hMgn3+vKUwSAgFJR2/nz/nhvhu6xySn1MG7zvkuXmW1I86aiJSLAhuZc2nvhBzDjmRNqeDqqjlPulAmHVVsMjPtyQHSkx9UeyV6VZ0a0/4Mxys4bLM5pLU6qyG8fM3e5NHeykX/2cfL3HiYCZGGomnPj9drhu/fV1wc5YXQNuFTlgvhOj4UHDsFlhA2DXTTCqRLpgg735ffw7uHtpWK/84xAOb0zmD3ZbW7qg3vLoQ5pyqpxf411BRrBD7SQjfaAzhbqyzB3Xj2P1dacVtQBh1Ed/nwN42h7BXo5WstlHheO2n7vPkhgf24CkjVmD/21brd9/TzLvMSofq2a/W8CI/nZmajdR4ArLXZ8x3ot/Re6lgSxv8CfFVrM5NpCnuHT50aoPNVylcTKOjJxok7GDfEup7G/SZHA0MeAeADBmryTH8n+Qte7ksBbYitY0BzzFhjwQ9eF/NwLQ0oIj8rBKNyj6c/FfVY1OfIIJ2HxapjY6JUTMoqxgVONbd6ogVy230WL+449Th95HcbZiimu2uaHmwqWEMcvx3adHgwKrgaI+TYnC+JzrJZt8YH5uwope2o/0MbtEnWteAO1fYxXHKStxX7rJD4kjqZypa18OhmkG8lQ3UKVNBCT2aqfrSXJ8WNGs061mpSsPlRmo/3CRYwZXLUYBsKvhMLBktqpQpgt2V9mVuyA5j8nBPOI55JK0q28Y0j/6eejDHzDkblm9jIBuHvrU5esIzZWX7HBs4CZGN2pxxzT884rKib1bhHXc30Dvfsoswj7myarYmbH+JTY3yzr4QUw== 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)(39860400002)(396003)(136003)(346002)(376002)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(966005)(7696005)(8676002)(6916009)(4326008)(54906003)(478600001)(70206006)(41300700001)(316002)(70586007)(86362001)(36756003)(83380400001)(47076005)(2616005)(426003)(336012)(1076003)(26005)(6666004)(53546011)(8936002)(5660300002)(2906002)(82310400005)(55016003)(40480700001)(82740400003)(356005)(7636003)(186003)(6286002)(16526019)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:34:33.2962 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f171e60d-c65e-49d3-7d53-08db390feb1e 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: BN8NAM11FT093.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5235 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/0217458d5e793eb62f8e32ae700b639dd954c39c Thanks. Xueming Li --- >From 0217458d5e793eb62f8e32ae700b639dd954c39c Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 3 Mar 2023 09:38:18 +0000 Subject: [PATCH] test/crypto: fix ZUC digest length in comparison Cc: Xueming Li [ upstream commit dc3042ba468196c6f51777b7d41596618b2e47f4 ] The digest length used in ZUC tests for verifying the digest was hardcoded at 4 bytes, which was suitable for ZUC-128 only. Now that ZUC256 is supported by these test functions, the digest length can vary. Using the test vector digest length directly in these comparisons allows for variable digest length. Fixes: 83397b9f0739 ("test/crypto: add further ZUC test cases") Fixes: fa5bf9345d4e ("test/crypto: add ZUC cases with 256-bit keys") Signed-off-by: Ciara Power Acked-by: Brian Dooley Acked-by: Tejasree Kondoj Acked-by: Pablo de Lara --- app/test/test_cryptodev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index d6ae762df9..a216e9ff58 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -4853,7 +4853,7 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) TEST_ASSERT_BUFFERS_ARE_EQUAL( ut_params->digest, tdata->digest.data, - 4, + tdata->digest.len, "ZUC Generated auth tag not as expected"); return 0; } @@ -6415,7 +6415,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, TEST_ASSERT_BUFFERS_ARE_EQUAL( ut_params->digest, tdata->digest.data, - DIGEST_BYTE_LENGTH_KASUMI_F9, + tdata->digest.len, "ZUC Generated auth tag not as expected"); } return 0; @@ -6622,7 +6622,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, TEST_ASSERT_BUFFERS_ARE_EQUAL( digest, tdata->digest.data, - DIGEST_BYTE_LENGTH_KASUMI_F9, + tdata->digest.len, "ZUC Generated auth tag not as expected"); } return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.404623800 +0800 +++ 0103-test-crypto-fix-ZUC-digest-length-in-comparison.patch 2023-04-09 21:45:38.739042200 +0800 @@ -1 +1 @@ -From dc3042ba468196c6f51777b7d41596618b2e47f4 Mon Sep 17 00:00:00 2001 +From 0217458d5e793eb62f8e32ae700b639dd954c39c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dc3042ba468196c6f51777b7d41596618b2e47f4 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 9b18883547..dea0788b4e 100644 +index d6ae762df9..a216e9ff58 100644 @@ -39 +41 @@ -@@ -6499,7 +6499,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, +@@ -6415,7 +6415,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, @@ -48 +50 @@ -@@ -6706,7 +6706,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, +@@ -6622,7 +6622,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,