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 214A8A0093 for ; Tue, 10 May 2022 14:31:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BCE04069D; Tue, 10 May 2022 14:31:07 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7550E4069D for ; Tue, 10 May 2022 14:31:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8vjbX8OkY4xn8A7wcjKxW46YhI/jyUCJrFXOJHSEknw=; b=HQi8/dD+X3za8jBxNcQS+72Ztk122WscNoVnEjlDPFAkd6adBSLlUVhJ4QUujxsAqko0Pg J/8Lm5CluTHudlVeh45yd3hu/A7r0T0VSUCXapwJv1iClrPO+egTZEr2nzM57IK4DwLG/A JqGuLNInkKwbtMgpMpk/3IpqaNSJMrs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-161-D5CDHS5cOamEN2EbNbDkrA-1; Tue, 10 May 2022 08:31:03 -0400 X-MC-Unique: D5CDHS5cOamEN2EbNbDkrA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD28180B90C; Tue, 10 May 2022 12:31:02 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id A14CB40CFD06; Tue, 10 May 2022 12:31:01 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Tue, 10 May 2022 13:30:09 +0100 Message-Id: <20220510123010.159523-32-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 05/15/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/aeca5959dde58d307e6c0016b651222638cd041c Thanks. Kevin --- >From aeca5959dde58d307e6c0016b651222638cd041c 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 [ 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 8e8daf5ba8..2c9c631cfd 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -3796,5 +3796,5 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, } iv[0] = 0xFFFFFFFF; - iv[1] = swap ? swab32(0xFC000000) : 0xFC000000; + iv[1] = swab32(0xFC000000); iv[2] = 0x00000000; /* unused */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:22.404926814 +0100 +++ 0032-common-dpaax-fix-short-MAC-I-IV-calculation-for-ZUC.patch 2022-05-10 13:24:21.630646394 +0100 @@ -1 +1 @@ -From c54fb3f7f77fa919673966227fd8964dbfbb3781 Mon Sep 17 00:00:00 2001 +From aeca5959dde58d307e6c0016b651222638cd041c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c54fb3f7f77fa919673966227fd8964dbfbb3781 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 46153b9c29..289ee2a7d5 100644 +index 8e8daf5ba8..2c9c631cfd 100644 @@ -22,2 +23,2 @@ -@@ -3067,5 +3067,5 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, - case PDCP_AUTH_TYPE_ZUC: +@@ -3796,5 +3796,5 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, + }