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 9571BA0543 for ; Tue, 21 Jun 2022 10:05:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90C7540151; Tue, 21 Jun 2022 10:05:05 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2089.outbound.protection.outlook.com [40.107.94.89]) by mails.dpdk.org (Postfix) with ESMTP id AE8BE40151 for ; Tue, 21 Jun 2022 10:05:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GgNAcSL4/BNzsUKW/wK9UR0MvE15nvoclIkpgT7xCUg7elLSYUgD1mMdh1d7gclllJfBXHxX96O+nZ8rAfeEsiDv6WCJc9mskWNDWhEJsmPxF50Rpoyu63Y4BG/Bn/gHO//Mr3mAJP7DFZlv2pFL/eogn7CE9ChwSpa8xH8TQvCCK8RsNi5vxI9dZEVI5H2+AEbq9LFMw3hka/pfznZh/dX3oiccaqS2K26MHUW81qMw1XTnPtMEfzj9hl0Rz683ZqJHTkikCXcIV/g1JU3KpvJ2W+tULkjw3NSv2jCt4aGZ65tvWtcC5YPEAYFVPa1eT7RDImcUeSBOITc6Vp6VlA== 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=ExLSg6xWm8hk2lne3xWYT0szPZTzImbZC227RdFFvfs=; b=MgNlEbx7DXoQ8wxYk7B8J7ySWnVx/TaeIwsqkumTXd4znUBVrzujwDDvR6dPi6lGGXDK1Ego1Jbx2V6GmYMKWpwVrEIUHw0RVnufPGPyfPnJ+NZKhtP2Hz4XGi6Z8o/09JNj+kKncCHFLXk2tiDLxVqlqWuokplxbDr2ZWid+b00Vc2mYS1JaljyBxLayp60Fj/F3HAtnpQ9NHu2eZ8ADT6hF8KWvGS4w+FbM2Nhfj2Laq9eKKIOZWtYnFigJ/D+YfET8zW7fJdn6fzRlWjqU3o7RL4sSKtDz5D2RM1P/GCnMW33xgFZvIc7SCScptZPAi8Nd1B5jGkI3DiGDeODMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) 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=ExLSg6xWm8hk2lne3xWYT0szPZTzImbZC227RdFFvfs=; b=X6hZUScZqycP1lWh2dwbbVPaHAb4uNvS05A/fYg2mUyY0nq6Ws0HmRhUwCkuI86EIqwwYgAUdzt1NMGO3si9wBYFfKHvAJFxQQxIftd74xZ5VbNR0i3Cr7m2YH7qHM06mrWhngsmnw3cOoMkAxSK1BJdf6sIH95v6bHx9G66LE0Ulk8qo6nJgzcmHWoaaOD2NCQ4oaHqHpdrFSwUn9Iyrq8rx1uj8JqwgcrusXMmDkpJJtJxTZR+hLzorYsplHxGRclP3jx+MLpaPUkoDcvRTbxlAPZiQjW5mEHO3Eq3BtPHem6zN8gPgkFnuk3d5bJT62v8CQuWeM2/GSc9K0FPnw== Received: from MW4PR04CA0232.namprd04.prod.outlook.com (2603:10b6:303:87::27) by CH0PR12MB5202.namprd12.prod.outlook.com (2603:10b6:610:b9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:05:01 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::5) by MW4PR04CA0232.outlook.office365.com (2603:10b6:303:87::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16 via Frontend Transport; Tue, 21 Jun 2022 08:05:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:05:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:05:00 +0000 Received: from nvidia.com (10.126.230.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.22; Tue, 21 Jun 2022 01:04:59 -0700 From: Xueming Li To: Gagandeep Singh CC: Akhil Goyal , dpdk stable Subject: patch 'common/dpaax: fix short MAC-I IV calculation for ZUC' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:26 +0300 Message-ID: <20220621080301.2315720-21-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: 8c30f91e-6710-443a-9997-08da535cbddf X-MS-TrafficTypeDiagnostic: CH0PR12MB5202:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZG1lZcG/TGJUY2X/lizc/2vPJapLuthsx5Ywn/VwtYrpcViR85tJiQuc4pg5hdFeZzYPgsw4lVpETd5bk8zDu58r8GkzX2hTVt1IZPWcDDB71o/Ab+/7Usw5dOPMnwYiRgRkKroao4t87Gjgq8dNTPuGNtvhCGrzUxdUHmn+MQlzYse999Wmti0heiD3kYzqTmiYVIqN48LP+PG2ah9FZhzXOWQ8So2D4YCPeDMqSu+spd4y2Pwfw7atybDjr9ZHW5dFD0vsvFnp4K/KXtFuKFSFk0MMklIPCbiJ5b8yJOUTy15Ylm3TJbVh10rrS5a9SbtKL2QSPFq6O89kbFwYyyPZ2WJSBu3+2/xJR7jbU+VnGVvEPRuKMpkDCcWiRGf9mLE+Q54xCH9Bnuz3mimAqCZ2gOLD7Go/maHvYgmU0xA1yJiQBDynZJM5cPIw8hVQopFEduicLIxgxTIoe1Ft3cPCiq5HRQ1ZHiIu0XiBRVuSYwPtf6dSjlJCZjfcd6fqObaCgXPEZTm5l1Q7qxxBCiRXHHXI1NXAlHviKFfEx+sq8h0uTqphFWNSMWzFbCP/HQ4cSpJAfjZXpXrY0rT5c8lf4l3BoRN7b3nxsGtUdWZKu+2HdTGRSNQoOJVaS3GJ/EfgqKWLQao2Ga5xwyyhqklwq2GUmbKhAjtTt8yBOaWlbJEZnYiSldJ8CUxKnSkctmmHeHM6/5xWaxzgEAPX9Ljt5oonXYHQA4XXBzrDZ368omnBwA9d32xvh4kEw1vc/V73zFF/wfQ/mWBkm6oCk8Rsx3ulvgkxhJzHGjYuC7Yu3HlI6aJDdL8LnpIihY4+XbYW7cAX/vcvq57OSvbemVNeEfvA0mxhTfgW6zFY3xg= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(136003)(39860400002)(396003)(346002)(40470700004)(46966006)(36840700001)(336012)(70206006)(6666004)(2616005)(1076003)(82740400003)(426003)(81166007)(41300700001)(7696005)(53546011)(47076005)(70586007)(26005)(36860700001)(6286002)(186003)(16526019)(356005)(83380400001)(82310400005)(86362001)(8936002)(55016003)(8676002)(36756003)(5660300002)(40480700001)(4326008)(2906002)(316002)(40460700003)(54906003)(478600001)(6916009)(966005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:05:01.2897 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c30f91e-6710-443a-9997-08da535cbddf 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.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5202 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 06/23/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/25165ac2415b369d76ee05f4ea3e43ddda646ec9 Thanks. Xueming Li --- >From 25165ac2415b369d76ee05f4ea3e43ddda646ec9 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Thu, 28 Apr 2022 17:17:33 +0530 Subject: [PATCH] common/dpaax: fix short MAC-I IV calculation for ZUC Cc: Xueming Li [ upstream commit c54fb3f7f77fa919673966227fd8964dbfbb3781 ] Fixing the IV calculation for ZUC based short MAC-I as per the HW security engine guidelines. Fixes: 73a24060cd70 ("crypto/dpaa2_sec: add sample PDCP descriptor APIs") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/common/dpaax/caamflib/desc/pdcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 51d40b5dd9..6dd1122e15 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -3790,7 +3790,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, return -ENOTSUP; } iv[0] = 0xFFFFFFFF; - iv[1] = swap ? swab32(0xFC000000) : 0xFC000000; + iv[1] = swab32(0xFC000000); iv[2] = 0x00000000; /* unused */ KEY(p, KEY2, authdata->key_enc_flags, authdata->key, -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:50.204556318 +0800 +++ 0020-common-dpaax-fix-short-MAC-I-IV-calculation-for-ZUC.patch 2022-06-21 15:37:48.994451098 +0800 @@ -1 +1 @@ -From c54fb3f7f77fa919673966227fd8964dbfbb3781 Mon Sep 17 00:00:00 2001 +From 25165ac2415b369d76ee05f4ea3e43ddda646ec9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c54fb3f7f77fa919673966227fd8964dbfbb3781 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 46153b9c29..289ee2a7d5 100644 +index 51d40b5dd9..6dd1122e15 100644 @@ -22,3 +24,3 @@ -@@ -3066,7 +3066,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, - - case PDCP_AUTH_TYPE_ZUC: +@@ -3790,7 +3790,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, + return -ENOTSUP; + }