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 0A5FDA0540 for ; Thu, 7 Jul 2022 09:56:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0550A4282D; Thu, 7 Jul 2022 09:56:04 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 1E21D4282D for ; Thu, 7 Jul 2022 09:56:03 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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-1.canonical.com (Postfix) with ESMTPS id E54203F04C for ; Thu, 7 Jul 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180562; bh=HB/Ynh4r/UyfL3ZB4UAo0VT+4j+fO8GJrhNzAYEUlf8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fDfYAnjhTGkpLEIRWMTx7Eu4+oI9F+uMb8blu2rH10R1Ycux9KEH+UfiYFXVG4cx3 bEytG0NV6LcbVgYNS1jkL+8NoI0zGMRt2I9EoZRBBBmwqur6syo9UZgENdrXwjWp73 hpgZVegWc6/UN9S2u1LNWy80nJdFy7po/h6MRQ5YTFYJV9Cp3PCOEfwbpLo0z4mVUc q0hpkOpfta2jUonkXCzBynJOEHecowQjRKwz3bXiueyFpxuCXqN+HXMQaTI/oDtYM0 +bYkdXd8YCsa/9hO5KK5jFFWeqrtFeeAOcj7domTSOthvAE3EaFEmJlRH/2Ooxd6GP a/iRZrCcnq1AQ== Received: by mail-ed1-f72.google.com with SMTP id m10-20020a056402510a00b0043a93d807ffso1451891edd.12 for ; Thu, 07 Jul 2022 00:56:02 -0700 (PDT) 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=HB/Ynh4r/UyfL3ZB4UAo0VT+4j+fO8GJrhNzAYEUlf8=; b=hg4G45xTRgAyp2yFGizoVFFQFDa25ucuCcrVLvRSQ3QmDrqdNMgg3TNw/vUTJCh46w D26MFzXTOBGJde84dqaFgy/3GPgr+LvO5sMqc6zgW44MzSgfPuWEu3OCmntdxXLD39U9 dn6cO39Owq0gCSawoD0Bib+hZjiEg3z3ZQk9SOTOGssFZD+zBwSbGgjMksylmnQ/ohWK dX2tw8arsgf/3ysOrR383h7ES8YM2YKEWv7zzBPEoUVoWCRBc/VohzCrzPmvA/lbtOOl 4tub+3zxIjDEIP6IUq9KgcHYgp4y0tkSb2BIU+TlZ7UuSBswruIOrb1tXwNDIQMD7lxB HwQA== X-Gm-Message-State: AJIora+OFGOmcIDb6H9Or7E9KqMAjX5EFEcknGYksPmgKX7IAOlCXI7P V3ewxEB/UFD+xcrG6s/lZZNFDOyV9qPfj8MSAIUuGs+yI6Nlf5P1U+CCTI7+lizNB5E+gO6Tm2U NcR/qLQV//pXFB74FpSkW/p2D X-Received: by 2002:a05:6402:405:b0:433:426d:7d59 with SMTP id q5-20020a056402040500b00433426d7d59mr61572213edv.122.1657180562580; Thu, 07 Jul 2022 00:56:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vGFLggH1xyIWZfMKGjJPVwoJEVSQctIkwdMEhOOpSX6JhsR+hOdSdfUhGqPeeZ7A2gUJDfaQ== X-Received: by 2002:a05:6402:405:b0:433:426d:7d59 with SMTP id q5-20020a056402040500b00433426d7d59mr61572202edv.122.1657180562429; Thu, 07 Jul 2022 00:56:02 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id er13-20020a056402448d00b0043a5bcf80a2sm8531080edb.60.2022.07.07.00.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:56:01 -0700 (PDT) From: christian.ehrhardt@canonical.com 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 19.11.13 Date: Thu, 7 Jul 2022 09:54:07 +0200 Message-Id: <20220707075522.194223-12-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-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.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/85d6c18a8260d0ff3bfa4f726fcfedbe8e998cdf Thanks. Christian Ehrhardt --- >From 85d6c18a8260d0ff3bfa4f726fcfedbe8e998cdf 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 bf82bd53c8..595d0e0318 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -3771,7 +3771,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.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.717844906 +0200 +++ 0012-common-dpaax-fix-short-MAC-I-IV-calculation-for-ZUC.patch 2022-07-07 09:54:10.805823629 +0200 @@ -1 +1 @@ -From c54fb3f7f77fa919673966227fd8964dbfbb3781 Mon Sep 17 00:00:00 2001 +From 85d6c18a8260d0ff3bfa4f726fcfedbe8e998cdf 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 bf82bd53c8..595d0e0318 100644 @@ -22,3 +23,3 @@ -@@ -3066,7 +3066,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, - - case PDCP_AUTH_TYPE_ZUC: +@@ -3771,7 +3771,7 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, + return -ENOTSUP; + }