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 310F9A00C5 for ; Wed, 20 Jul 2022 10:26:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B9E340697; Wed, 20 Jul 2022 10:26:03 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2082.outbound.protection.outlook.com [40.107.243.82]) by mails.dpdk.org (Postfix) with ESMTP id DF0A64003C for ; Wed, 20 Jul 2022 10:26:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N3owJ34Itm0h7urW8VQmZWcDcFxqEIX/BLb7Uf9tPm5Ch59gxg1xy6cM39CgMfw9ECBWTh2tuCu7iOwPk0UDfKXJDaUEl8jmEqDgEimE1s1o7RIBCp5NzniTU+C3NON/+N2M+W9Y4IgiFn50qFOF/Bc0JTeAjVz8E8iqkN9eneF4dwqp53MqJUx3+6QpGpHQwVgXmMie2J60BV7Qf/7gNyldbxvAHIwLRirVSxRTfoKCz/xdIDuu1MtOouMEDUD8HR5yNpNzYzmrHkodWmoJN2BI0gESgOrzjEzPgG94N/9mi1Vj6LrlVOfnGcLYLtAv5ybzZ258q4FnJWE4WWyZ5Q== 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=jdy2OiHyMlk8QNceEW+cgKP6XPnlnDCyVI0Ymx7wgtc=; b=NieaZsu6qIBS7t7VgMvHp1IpMEpxw5LGKw4k7tkyhtw+B4a02jQFeo89xkFa6+lN0OcmJ63Wz8FcVLEKdCo8pgzDiSLnU2h2Yr4QlQCFQGcOrnYQHxby9xRgRfZrc2FoXgEfuiLivheGIZRInfnnD/8ZijWkg74RTJTw9Q+ckIxnVd8VEitUFTgvw/aERBlJec+Az78EOVwb5Atf8fJ+zY9yJS0WnkewFLO6QTeai8I9gJ2mI3KjO5jawHpuqzMamnTHN1OBlhb6we/IVLSUH1wN2zyrMt+hdiYawb2jcOR6OxRAmKI4jAhGUrpZfR8iC3H79MaUZ4NtqTq3GwLing== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.org 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=jdy2OiHyMlk8QNceEW+cgKP6XPnlnDCyVI0Ymx7wgtc=; b=naLQOczNW7ExxiPfixa+8PpEtoVGjQ2o913Mx1s4LRcu43tsNk9V14Fhb/WMtfYpr93H4Yx+u/VLKROwickrrjYQmHiDcJz9cPt+VMJUCcUJr867yAxC+v7sT+uq0BOqJ2AK6uJZJKc180hmd0CLcrPc2P9psKtKucq3PHZOCJbUz4bu/17OSsXz/qEI3u2MfU8CxohEl+/uCurvYB2qBXi1iC7fhzMYM97xfJOct4vwsy5BZKRKiTv2I+uM4Vkr3s067vmS6fMVyyEcf5MVtLZdilmd3bFH+pD5vPDzBYv5m5vbDQ8CnKAyofoDoWA4gw/Z8zQeWKLyI8ZaTk+H0Q== Received: from MW4P223CA0016.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::21) by IA1PR12MB6185.namprd12.prod.outlook.com (2603:10b6:208:3e7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Wed, 20 Jul 2022 08:26:00 +0000 Received: from CO1NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::27) by MW4P223CA0016.outlook.office365.com (2603:10b6:303:80::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Wed, 20 Jul 2022 08:26:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT056.mail.protection.outlook.com (10.13.175.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:25:59 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:25:59 +0000 Received: from nvidia.com (10.126.231.35) 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.26; Wed, 20 Jul 2022 01:25:57 -0700 From: Xueming Li To: Ciara Power CC: , Tejasree Kondoj , "dpdk stable" Subject: patch 'test/crypto: fix ZUC vector IV format' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:21:16 +0300 Message-ID: <20220720082132.3954126-47-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54951586-28a8-41fd-6de9-08da6a297a10 X-MS-TrafficTypeDiagnostic: IA1PR12MB6185:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JXzIXgkQWkpg0LYx928wsYy+DLbioG1jUsZGz4Q607DeUNXB+T0WiHeL10UU?= =?us-ascii?Q?s6YEdb6wfAoxoKfAE+0w6ojXSMoBmZQELTG9LLEkZkWDAH37krInVaKM48QS?= =?us-ascii?Q?9H1Qil+d0XeCfnTiIrMzoic63fyxvbAYB454ME9/Ve1j/Ji5+JwSn64CRN4/?= =?us-ascii?Q?bx6VlPxa78wcS1PRYG5cHeMeW22XvqjjLSGLJsRbsfyqMae0moyyd2rVMv3W?= =?us-ascii?Q?34eTfwh1jP1xpHjqH2DnrI1jTDZdjiSM2/VEltrjkew6GN7YFA1UKH0HuoUe?= =?us-ascii?Q?+IVYRd96T5uxKPJVjIcLPmRdB57lRuGjWCVG1bFFj2wttWcbMJGQX6UQOOLx?= =?us-ascii?Q?pWeZTCLbq6bP5n6/OblC7f9Q5devh5rsltXryR3zmi0HrP9DvG/kTnbSqtHn?= =?us-ascii?Q?Ek1aX7cDBaCZiukK8A0CxSFiL1bKi4p7EkeO6754HU3F9PImXBEJHWPhrIZk?= =?us-ascii?Q?rZ3N1eygoV4KfNZoNJQqjWy6FsfMziTmxVyGAmv6sN4eFC9hCitugEXHfBVR?= =?us-ascii?Q?Irsz/B0Zt+Q328XnrN6CVEJ5lv91qA0XfsBOzOmMFcXig2yJeesSqX5OlvKF?= =?us-ascii?Q?W2qj9WWnP88fUgPBchMIbvKcvd4nTWcmE6keny3zX2jhLz2AQpmu4hSojbJY?= =?us-ascii?Q?kEW9Iga1r3nK9WttN6Be/rroO0mCLuycOKzQtJoqlP00TMw78HGhX3aE1UEw?= =?us-ascii?Q?sG8y+bDZP0Di3HqzcLqvcSv2oPvDWoTg21a/invxbvvJG0cHm+ewfg8EhuUS?= =?us-ascii?Q?fh6MqXLwo2ZI5o9sHOu5bKVj4qc5spCIPqcb9/avp2i9oB9XIZ4e3hewJQLn?= =?us-ascii?Q?uy610dwCcpdlGE+NWk0renQawd5QOSCpv8J4kfvMZr+LhbMGga3lglqQQthr?= =?us-ascii?Q?Z1EOK/XP/bQUKP/hTYi6EFVfyA/8+TKFR9kDYMYLHTf9D0xXe4BY5cYl+kY1?= =?us-ascii?Q?p0Ue7Em/Mf6nBZgb24EBdcW6S/FHtk8kUdcBRCIzqYR5K8g1oRZiIUHrLmqO?= =?us-ascii?Q?whBo?= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(376002)(136003)(396003)(346002)(36840700001)(40470700004)(46966006)(316002)(86362001)(8936002)(8676002)(5660300002)(356005)(7696005)(55016003)(6666004)(19627235002)(82740400003)(81166007)(53546011)(83380400001)(4326008)(70586007)(186003)(426003)(40140700001)(16526019)(2616005)(1076003)(82310400005)(26005)(40460700003)(6916009)(41300700001)(70206006)(40480700001)(336012)(478600001)(54906003)(47076005)(36860700001)(6286002)(36756003)(966005)(2906002)(36900700001)(15398625002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:25:59.9353 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54951586-28a8-41fd-6de9-08da6a297a10 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6185 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/22. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/373d6e1d5e43d445c1cbc10a6ffa40120ac6ca23 Thanks. Xueming Li --- >From 373d6e1d5e43d445c1cbc10a6ffa40120ac6ca23 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Thu, 23 Jun 2022 14:42:49 +0000 Subject: [PATCH] test/crypto: fix ZUC vector IV format Cc: Xueming Li [ upstream commit 3025fe291015686f3e954dd520e7cbc130439d33 ] Some authentication and cipher IV formats were not following the spec [1]. For ZUC128 cipher IV, an 8 byte block is repeated, with the last 3 bytes of each being 0x0. IV[4] and IV[12] must have the last 2 bits set to 0. Auth IVs must also have repeated bytes with the last 3 bytes containing 0x0 in each 8 byte block. IV[4] and IV[12] must have the last 3 bits set to 0. IV[8] and IV[14] may have a flipped bit based on direction. [1] https://www.gsma.com/security/wp-content/uploads/2019/05/EEA3_EIA3_specification_v1_8.pdf Fixes: a81a81850fb1 ("test/crypto: add ZUC test cases for QAT") Fixes: b1c1df46878d ("test/crypto: add ZUC test cases for auth-cipher") Signed-off-by: Ciara Power Acked-by: Tejasree Kondoj --- app/test/test_cryptodev_zuc_test_vectors.h | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/app/test/test_cryptodev_zuc_test_vectors.h b/app/test/test_cryptodev_zuc_test_vectors.h index cc2338e107..067fb5eb34 100644 --- a/app/test/test_cryptodev_zuc_test_vectors.h +++ b/app/test/test_cryptodev_zuc_test_vectors.h @@ -558,13 +558,13 @@ static struct wireless_test_data zuc_test_case_cipher_200b_auth_200b = { }, .auth_iv = { .data = { - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00 }, .len = 16 }, .digest = { - .data = {0x01, 0xFE, 0x5E, 0x38}, + .data = {0x2F, 0x45, 0x7D, 0x7B}, .len = 4 }, .validAuthLenInBits = { @@ -631,13 +631,13 @@ static struct wireless_test_data zuc_test_case_cipher_800b_auth_120b = { }, .auth_iv = { .data = { - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00 }, .len = 16 }, .digest = { - .data = {0x9D, 0x42, 0x1C, 0xEA}, + .data = {0xCA, 0xBB, 0x8D, 0x94}, .len = 4 }, .validAuthLenInBits = { @@ -1056,15 +1056,15 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { }, .cipher_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00, + 0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00 }, .len = 16 }, .auth_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00 }, .len = 16 }, @@ -1091,22 +1091,22 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { }, .ciphertext = { .data = { - 0x5A, 0x5A, 0xDB, 0x3D, 0xD5, 0xB7, 0xB9, 0x58, - 0xA5, 0xD3, 0xE3, 0xF9, 0x18, 0x73, 0xB4, 0x74, - 0x05, 0xF0, 0xE9, 0xB6, 0x5D, 0x9A, 0xE3, 0xFA, - 0x5D, 0xFD, 0x24, 0x51, 0xAD, 0x73, 0xCA, 0x64, - 0x91, 0xD5, 0xB3, 0x94, 0x10, 0x91, 0x89, 0xEA, - 0x73, 0x6F, 0xB0, 0x2A, 0x0A, 0x63, 0x0F, 0x8D, - 0x64, 0x87, 0xA3, 0x14, 0x6B, 0x93, 0x31, 0x0F, - 0x14, 0xAD, 0xEA, 0x62, 0x80, 0x3F, 0x44, 0xDD, - 0x4E, 0x30, 0xFA, 0xC8, 0x0E, 0x5F, 0x46, 0xE7, - 0x60, 0xEC, 0xDF, 0x8B, 0x94, 0x7D, 0x2E, 0x63, - 0x48, 0xD9, 0x69, 0x06, 0x13, 0xF2, 0x20, 0x49, - 0x54, 0xA6, 0xD4, 0x98, 0xF4, 0xF6, 0x1D, 0x4A, - 0xC9, 0xA5, 0xDA, 0x46, 0x3D, 0xD9, 0x02, 0x47, - 0x1C, 0x20, 0x73, 0x35, 0x17, 0x1D, 0x81, 0x8D, - 0x2E, 0xCD, 0x70, 0x37, 0x22, 0x55, 0x3C, 0xF3, - 0xDA, 0x70, 0x42, 0x12, 0x0E, 0xAA, 0xC4, 0xAB + 0x5A, 0x5A, 0x94, 0xE7, 0xB8, 0xD7, 0x4E, 0xBB, + 0x4C, 0xC3, 0xD1, 0x16, 0xFC, 0x8C, 0xE4, 0x27, + 0x44, 0xEC, 0x04, 0x26, 0x60, 0x9C, 0xFF, 0x81, + 0xB6, 0x2B, 0x48, 0x1D, 0xEE, 0x26, 0xF7, 0x58, + 0x40, 0x38, 0x58, 0xEA, 0x22, 0x23, 0xE6, 0x34, + 0x9A, 0x69, 0x32, 0x68, 0xBD, 0xDD, 0x7D, 0xA3, + 0xC0, 0x04, 0x79, 0xF0, 0xF1, 0x58, 0x78, 0x5E, + 0xD0, 0xDF, 0x27, 0x9A, 0x53, 0x70, 0x5D, 0xFB, + 0x1B, 0xCA, 0xBA, 0x97, 0x12, 0x1F, 0x59, 0x6B, + 0x75, 0x7B, 0x94, 0xF6, 0xE7, 0xFA, 0x49, 0x6B, + 0x7D, 0x7F, 0x8F, 0x0F, 0x78, 0x56, 0x40, 0x52, + 0x84, 0x3E, 0xA9, 0xE8, 0x84, 0x6F, 0xEF, 0xFB, + 0x4A, 0x48, 0x3A, 0x4C, 0x81, 0x98, 0xDD, 0x17, + 0x89, 0x66, 0x3B, 0xC0, 0xEC, 0x71, 0xDB, 0xF6, + 0x44, 0xDF, 0xA7, 0x97, 0xB2, 0x9B, 0x84, 0xA7, + 0x2D, 0x2D, 0xC1, 0x93, 0x12, 0x37, 0xEA, 0xD2 }, .len = 128 << 3 }, @@ -1123,7 +1123,7 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { .len = 2 << 3 }, .digest = { - .data = {0x0E, 0xAA, 0xC4, 0xAB}, + .data = {0x12, 0x37, 0xEA, 0xD2}, .len = 4, .offset_bytes = 124 } -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:01:01.016932339 +0800 +++ 0047-test-crypto-fix-ZUC-vector-IV-format.patch 2022-07-20 15:00:58.781000383 +0800 @@ -1 +1 @@ -From 3025fe291015686f3e954dd520e7cbc130439d33 Mon Sep 17 00:00:00 2001 +From 373d6e1d5e43d445c1cbc10a6ffa40120ac6ca23 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3025fe291015686f3e954dd520e7cbc130439d33 ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index 5d1d264579..299d7649fe 100644 +index cc2338e107..067fb5eb34 100644 @@ -67 +69 @@ -@@ -1166,15 +1166,15 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { +@@ -1056,15 +1056,15 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { @@ -87 +89 @@ -@@ -1201,22 +1201,22 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { +@@ -1091,22 +1091,22 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { @@ -126 +128 @@ -@@ -1233,7 +1233,7 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { +@@ -1123,7 +1123,7 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = {