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 81990A0C41 for ; Tue, 30 Nov 2021 17:36:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76686410F7; Tue, 30 Nov 2021 17:36:53 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 471D7410F7 for ; Tue, 30 Nov 2021 17:36:52 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6345E3F1B2 for ; Tue, 30 Nov 2021 16:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290211; bh=H7OM1oexvnqzHpreUBpJj3OTKlwzzfkN8QR+SbaZXY8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OtNXRj874fqOdpITp4QnLr2YCpp37JHfLRIkHpH654R5N6e4soX8ehJEUkexVvx1D e7e28zK5BmLiREwFmxVFpxljXdmHLMn/MVIoCZqr0XrXOUTHBgKX8Gbu5EhfTWbkap eytS+bLkywdtVurLcUf3NDwL/MbkDr79/e0wh5ZG4ZtqROdfVv65+KvrBtoUjPAOFj Q9QcgmmUm9gs9E9UvXXxihJrSrtQi1ENqVjtbEG7lnfWqoIY1qnl2kMyVZGd4XIp0j z0hUhGQPC68UWYLElbSxyxqRlulXNIJgjUsh5kCLC4OBc618K+ScWOdnlWJD7xWM6m Zjtddq5bqi0ng== Received: by mail-ed1-f71.google.com with SMTP id a3-20020a05640213c300b003e7d12bb925so17538441edx.9 for ; Tue, 30 Nov 2021 08:36:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H7OM1oexvnqzHpreUBpJj3OTKlwzzfkN8QR+SbaZXY8=; b=d+McmGuJTlSXGE+Si+GaSFZBbzgrK9E0XQX5pvTngFSvEeivxV1YE0Pq6xCyPFabe1 AwVpEEKbX18VllZVJ1sq+KXM7PkslbDMN12GxGb1AQb2HWvpRhVjZ4VJNUyhFcekfx3b Kh1TE6QvtVJoab5N22AbExdgtsnriVys7sxFPVW9NXVLQ0ToEujeYzn1AifusyR8S9r/ OBRPYcwHLRpXY3Q6iPvycINu+tkgkqCUJHdrWN5wXijWWqmuD4uGN6K7YxaXVd0Sob70 gprBeyKRYvrUVjatcHvL/o5gckT5V2KNZe8KWFCk/VddnNNanJnc7zBf/6PkbDvGfsbe H6+A== X-Gm-Message-State: AOAM533B/8QyY6OUP9AzWdt5Aj4+igqbovWFITnkJL4HTG/U/zMHxh/z mTGR61SFgTp0YJjb8KnBf76D7IBXd3k/XnFAgoBjcaLC44660WHOumyYnL4o2DcJnn1W/ZPtbv/ AtGnl4zkCah8U5TvL9LFpWW/G X-Received: by 2002:a17:906:f748:: with SMTP id jp8mr138621ejb.513.1638290210771; Tue, 30 Nov 2021 08:36:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxqef0uNeqzpXNgrlY5s9ip6yFCjERjej3dkvgwXy25kwtCLt1IuBk59cV5xcjhwUDxT/krw== X-Received: by 2002:a17:906:f748:: with SMTP id jp8mr138608ejb.513.1638290210597; Tue, 30 Nov 2021 08:36:50 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id sg39sm9057251ejc.66.2021.11.30.08.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:36:49 -0800 (PST) From: christian.ehrhardt@canonical.com To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Subject: patch 'common/dpaax/caamflib: fix IV for short MAC-I in SNOW3G' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:37 +0100 Message-Id: <20211130163605.2460997-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/abd1775ebd4ce7ac7e38839b0855020a45eb5ecf Thanks. Christian Ehrhardt --- >From abd1775ebd4ce7ac7e38839b0855020a45eb5ecf Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 8 Sep 2021 12:29:51 +0530 Subject: [PATCH] common/dpaax/caamflib: fix IV for short MAC-I in SNOW3G [ upstream commit c0182d6b752e3fe320f8f8e3db6256cd21234d9a ] The logic was incorrectly doing conditional swap. It need to be bit swap always. 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 476115323c..bf82bd53c8 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. - * Copyright 2019-2020 NXP + * Copyright 2019-2021 NXP */ #ifndef __DESC_PDCP_H__ @@ -3691,9 +3691,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, break; case PDCP_AUTH_TYPE_SNOW: + /* IV calculation based on 3GPP specs. 36331, section:5.3.7.4 */ iv[0] = 0xFFFFFFFF; - iv[1] = swap ? swab32(0x04000000) : 0x04000000; - iv[2] = swap ? swab32(0xF8000000) : 0xF8000000; + iv[1] = swab32(0x04000000); + iv[2] = swab32(0xF8000000); KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, INLINE_KEY(authdata)); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:06.908497498 +0100 +++ 0013-common-dpaax-caamflib-fix-IV-for-short-MAC-I-in-SNOW.patch 2021-11-30 16:50:05.526871592 +0100 @@ -1 +1 @@ -From c0182d6b752e3fe320f8f8e3db6256cd21234d9a Mon Sep 17 00:00:00 2001 +From abd1775ebd4ce7ac7e38839b0855020a45eb5ecf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c0182d6b752e3fe320f8f8e3db6256cd21234d9a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5b3d846099..8e8daf5ba8 100644 +index 476115323c..bf82bd53c8 100644 @@ -30 +31 @@ -@@ -3715,9 +3715,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, +@@ -3691,9 +3691,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf,