From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 058A2A0093
for <public@inbox.dpdk.org>; Fri, 22 Apr 2022 05:52:08 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 73D00427F4;
Fri, 22 Apr 2022 05:52:02 +0200 (CEST)
Received: from EUR02-VE1-obe.outbound.protection.outlook.com
(mail-eopbgr20042.outbound.protection.outlook.com [40.107.2.42])
by mails.dpdk.org (Postfix) with ESMTP id 5698C42841;
Fri, 22 Apr 2022 05:52:00 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=lhKyvWP4aOFFt7N7JAh+jmsAMN3dKqObIdjDy9fj8TZeAqCFvrNTeDoTELBUhl86FWhsOxDx/2vf+YCoHRzWP1Gt7E1QfEapwHIPWvtT9BRJBEExAd6Zz2rI74I+TXLXO+UOTdKaW3IUvAt4jTKFoIzqaD0wdiiFkLrEH0TqdFKe1Zeu6IDHk7UJpEUHfV3Y4sxRs2iVeYW717xyfu0QG/a8SjaR0DcuSt/kNT++lPffNj+L5e5QK/JNF62Abht5FJP5ocSnmwF4dsrF6/WEivWSLINNtDoaydeZ+tc02Vk6x7l77yqEMDr+BURL25iU4a0MtIiFaUl7pv7mxe7D3g==
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=uF8A9ZLhEY1EhhItm+zF5PWziN113iqtqOnFg7lgMV8=;
b=ZbdHF54WU4UW3uL4bG46VW8UHlGH0b2VydvgZBt1q7vqYj2kuP/D2r23Ucvul6iP451mQy1w6T3982GQDHwKp/ZOmhVVDkxmT18JNSKUjAZ5nDx/AOFVAzq2025uBni4vDPwm2mHqup+dzbFzTMSv2FVjaTZquNPiUFI/RLcG4PjskLXH6RJTK7kDuPRARadykn0A3K2WTnZ8zZYZRCTK6MWcS8ZY3g2/TEONV8442oH+EbX5ONPLAfbZRaWW5P88gqJrbHCg14DHvpu9ko4895nO6ajaq5u5itIMF+b6u8ekXf+wSTttf/mAZYr+0j170fpI/8G75DXpZdoftXdGw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass
header.d=nxp.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=uF8A9ZLhEY1EhhItm+zF5PWziN113iqtqOnFg7lgMV8=;
b=sdV9UMrKIZ8DlCpksXHd7845yb679QR97Wdv4xZMPvRao/ra/pl+FJLchpunVs15ryQ/plHQu6dv9BXbbbYm8jai8ESzmFGaxVKU8itXqfFtBrCqGCcd1xmmvaO75zpmt1u4bTnrKDzSkjQ5g6PlWlOBt8wWBV8RxqjxdUmbwEM=
Authentication-Results: dkim=none (message not signed)
header.d=none;dmarc=none action=none header.from=nxp.com;
Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14)
by AS8PR04MB8515.eurprd04.prod.outlook.com (2603:10a6:20b:342::10)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr
2022 03:51:59 +0000
Received: from AS8PR04MB8198.eurprd04.prod.outlook.com
([fe80::8cf1:93b:c340:3be2]) by AS8PR04MB8198.eurprd04.prod.outlook.com
([fe80::8cf1:93b:c340:3be2%7]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022
03:51:59 +0000
From: Gagandeep Singh <g.singh@nxp.com>
To: gakhil@marvell.com,
dev@dpdk.org
Cc: Gagandeep Singh <g.singh@nxp.com>,
stable@dpdk.org
Subject: [PATCH 14/14] common/dpaax: fix short MAC-I IV calculation for zuc
Date: Fri, 22 Apr 2022 09:21:00 +0530
Message-Id: <20220422035100.3180870-14-g.singh@nxp.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220422035100.3180870-1-g.singh@nxp.com>
References: <20220422035100.3180870-1-g.singh@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: SG2PR03CA0127.apcprd03.prod.outlook.com
(2603:1096:4:91::31) To AS8PR04MB8198.eurprd04.prod.outlook.com
(2603:10a6:20b:3b0::14)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 2075c22a-31c6-4bf2-3509-08da24137396
X-MS-TrafficTypeDiagnostic: AS8PR04MB8515:EE_
X-Microsoft-Antispam-PRVS: <AS8PR04MB8515D5B296E1BF170E555529E1F79@AS8PR04MB8515.eurprd04.prod.outlook.com>
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: hNAr3//bEMPaH7UXtGweusKv9ezk8MoGIe4JpTAmJTHwabgvPw0fGtJEHM+kbvrqTHyGGZE7mXROSXkXhLtvCvKNoDoipwmhRIQ7hZ133SgmkHqSfL6EBmo4snkSPredz8AjPgE7dUdJrYHO5oAhJA9fWniNtpXGrNwt1rDFoxZtM0tXZL0Z7G7ovHyq0pdps3+qyFmaeLF6U2WBT/y+9G6suolmf812r5CKNqSJj4v8BynEBYF88Sqx5p3+qlhJzFmvQ3YBWjmHLaoxjDT1ueOxAT/H91D+2sreqgkFWL+/zYkFE4XXedXriuo7l6jAUi4E1FZUTt+Q940r1EqkMQJuZkgOSOI5PZWHHawEpteFEr4YzuamCE/G5ZxxPCEBsA0tFeSqVC/jP9Gfu81vVyGHpUKAZAJURrwOh58XIByPpg5Wg5Vqt1Z+EBDPwtMD4n+qPOH3UEoMgzBYtrUrA7u0EF5U8sgwPwyfJoawauh/OOUjn/c7PHeLZQhYRyoKJp7/JQS6YWYmX/BVoj2N9lk3oH0RgQgsRxvDSVv4rjGhzx7EwODHYp/vBRlTqcJekJSQL0AWNsaNaltOib2I/iColfRAmPiMUvkGS6BkV2MUFWo0YeEtDFCuon5qiTgq+dmqfptW05ww9KxeeKJTE9M5C5g8c7Rp39N3H133AkqFDFGhMPeX7InT8kHGPvvX0FyNYA/1KXTvxeqZfjPk5A==
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE;
SFS:(13230001)(4636009)(366004)(6506007)(55236004)(52116002)(6512007)(2906002)(2616005)(1076003)(4326008)(38100700002)(186003)(38350700002)(83380400001)(36756003)(8676002)(26005)(66476007)(66946007)(66556008)(5660300002)(6666004)(508600001)(86362001)(316002)(4744005)(8936002)(6486002);
DIR:OUT; SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OHmrfdCsdId+d4ySMwyU7dsdkPx2LS7Vyu+YylNb/EFH41VSjeXyV3fttuR0?=
=?us-ascii?Q?TGzfCqAgeUycOS3gtPKtQlNc3s8NSobipbUTJcHPdKuqmt7TbLiveiAGYgMR?=
=?us-ascii?Q?lJIWx7PzqXhNtzXHpR8GqVWadtLY2J5aq0wOAf4zHNR1NRJu3eXkpwIhraZF?=
=?us-ascii?Q?e4sSXlsUfrW4BuqLq2IQlTyw1qOCa/V2Lo6VxUBl7LN+t6hLhdpIeuldyIf6?=
=?us-ascii?Q?uvRxbAgRS+PMbp7Scki82ryS8aigO6C1SQkchFikTs0+vLNV6DhXkZlua8pA?=
=?us-ascii?Q?sAZFdRkuyirXdWgbFBYhzv2jKGj9JICyj/ELcZnjQ4ifJgi0lcu69uOV79yt?=
=?us-ascii?Q?35wpfvJ7Nxv0XTv3XZZOw/EqIHiWOMRcfPC79c82uCBijGeCSkX9YAKdztuy?=
=?us-ascii?Q?ZC0rlXqcBP+azIToY2Ff0ntMi+Z9Q7RHLni5YNXbA/hDpCwYXct6PHMvLG61?=
=?us-ascii?Q?KyN9gWAyPj/UOshl4csLGc7dlPF8nRPP9MRCy6KkkZ4wBbru5ku3DHpinN1S?=
=?us-ascii?Q?KUWEZo6FN4fRCO36FjBoguzSj+oacZZ9s58awQkKu9v8i2yPsRDmviLZr62r?=
=?us-ascii?Q?NpDJjJdcOuN29jWfOXLcjeUhmcGjrYpcnHoQZ4ueF/qD5F3haH79G88NyoF7?=
=?us-ascii?Q?kfbv69dHVzLtVnVAeQtlapfEhvlWZ+XvbqiF2qhHGjBzYBkuTtiNiAv9SlLi?=
=?us-ascii?Q?c8Y53mq030v9M+Pc53g9ntZKhLALonB1RtToxZ8VA4QtEDQ1gMgKztt04Pua?=
=?us-ascii?Q?HUoRMlW+wJjZZRHSo1gOeqGtA/AF699xkuRSGY0rG8cotpxeMmkg0UDkOliG?=
=?us-ascii?Q?wVWxgC8vgy5e9tkPxBnLWOnrtPCs5KoWHTX2MPTM4dohYrBt5/KaYONXWxZ/?=
=?us-ascii?Q?OT1C1RQtzMUPZWLysEuHQL2wEqzIdoT2RCPEeHanlmDdjH/vIlBxVAI8wBz3?=
=?us-ascii?Q?4UPpPihBUEoQX2BtIOFgjhspdi3xE4ZQbC7MzXgdsP60J0u2+4w3wzpxGwcK?=
=?us-ascii?Q?MxJIGvIy3DRKb0RHzvEZAuGrIBL7iEyTftvd0wyQJ/SlMpE54tdUwpt4P1X/?=
=?us-ascii?Q?kS0w0vRDMAiMVDx7Avco0pA4O3/n0tHd8kZAKH1NJqG4fhR7pBMOFov2+vHn?=
=?us-ascii?Q?1DvBCLzuTIMN9uZO34cacZPc2vvuEO1nMY8jJBqTdftI0vcT9DmrH1kjJ4zX?=
=?us-ascii?Q?PZXZLmYzrUsUJrfQMAa+KThNQb2zG/ya1o1kjF2KfZFz3uZdJvHIK9kZXd9C?=
=?us-ascii?Q?5t+7OVBlI+jbwxxyVz4TFva12+5Ji9Z/NM2PNaNtb63OE0Tb2Xn90Or5xn1J?=
=?us-ascii?Q?CxDxkPEuWeJX82kY3rLF8Dyga645wcAjRBFHXv8JQTRvfvPqNmGkZsHJDIy1?=
=?us-ascii?Q?20fmvSfnmymIjOEu9FwYGJlssi1L+5iAytUvb+Lkr4zyuQ4tSuGwHv4Sl8NY?=
=?us-ascii?Q?1V851ykMTaNKgdc6cCz9jkL5m7Fcn77o13FMJmKsmzwHC/UKyVeDlflUsXIk?=
=?us-ascii?Q?0uL8jMVqLer70mRoHWMPnZUTp6WAwbTH6B4+03zp1tX3j3dMomRrl6ieNUo/?=
=?us-ascii?Q?x42hP0D5f641VyHtRznzd7iS4j4Zh17gqHCnJ7KVMK2dvqDkTo1rWjNM6EnY?=
=?us-ascii?Q?UJARgwDiHn08X5ubJID1r946MwWbk1JmmsO3RgRlsXXcrJGjGG4UORAoaOZx?=
=?us-ascii?Q?Cn1f7mUH1f2llrAOL10wxKkD5O75uuaBG0rC8DXO6HLOmCAmYgBxmTjQlIzL?=
=?us-ascii?Q?uOePLgqNyQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2075c22a-31c6-4bf2-3509-08da24137396
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 03:51:59.2622 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: PgW+1Ft2SWY3uFP2GCYuzpzHqHev9vjOfuXA66jSHyt3MmaGGg5yVXkIS8OKdnN2
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8515
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Fixing the IV caluclation for zuc based short MAC-I
as per the HW security engine guidelines.
Fixes: 73a24060cd70 ("crypto/dpaa2_sec: add sample PDCP descriptor APIs")
Cc: stable@dpdk.org
Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
---
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 46153b9c29..289ee2a7d5 100644
--- a/drivers/common/dpaax/caamflib/desc/pdcp.h
+++ b/drivers/common/dpaax/caamflib/desc/pdcp.h
@@ -3066,7 +3066,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf,
case PDCP_AUTH_TYPE_ZUC:
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.25.1