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 E23E4A0543 for ; Thu, 7 Jul 2022 09:58:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB52E4282D; Thu, 7 Jul 2022 09:58:21 +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 F34D94282D for ; Thu, 7 Jul 2022 09:58:20 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 BEE52402B9 for ; Thu, 7 Jul 2022 07:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180700; bh=VKHy+EzvkgBiVUitkWdwEAYTxCJ29IkHQXSHu+fHihY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aSPJc2ztKNdg6NjAvlhpc2y9uXd4I3Yqj++XDjZirbfknnoL4E/IwoCxHBIIdOhCf zRMi/oU/ZgHkGvsKhFprliouoc9SaCUBsvANU4PnHKclLCLZYvKl9VOf4GVzP0xfSC 5Dw1iOdcwEm8pF+uZSUkU8WZYbvcO+Pexb1ZQTefXav04Z0+aMFQmKJKK7hMYcIC1s 358eo+qfK/EZzUv4gEogDOslj1CDdSfjmgdiMQGwZbiHpGqBgB8CxYg3VsLYERCM0T JXQ2tcYLASRUB+BIRLab9lfBES2obZPpjge6mo1aecyAjoNAsBI9VBzCt0VLMKGcEY 5m+FIbZJi9n8w== Received: by mail-ej1-f70.google.com with SMTP id sh39-20020a1709076ea700b0072aa3156a68so3252792ejc.19 for ; Thu, 07 Jul 2022 00:58:20 -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=VKHy+EzvkgBiVUitkWdwEAYTxCJ29IkHQXSHu+fHihY=; b=OERBoSQ9RGe6ep26gKaeyfUsQu+LzSamRVwIHYEoBYeMTMD7ULpRLu0BVvyRCm5sgJ VARJLuaFpEVuemgAshqWJUEBPEDvWKrAWHiNzCeXdgvgUPMiN1u+8iCZDmhH+/r0g7+0 Z8P+0HUP6Odo7my+NFiNVA2c/LTamFcJKVxkH7AG9vAXHPsj0l1g2OTJzLHvkHWqEVUT q4byhnfqfN1uUkTbuNAIHzwJeb8mLTAiMuf6A15m4U1aTbLd0wfzlUEPKfEWLaa7gTtN fQ8cY/coMDU8Bfgi8+bADku3Ps4DwHTKCK4fu0/CkQbXF8yDEcuklJWE/GZRrYusmdWX Ylsw== X-Gm-Message-State: AJIora/TRAbi9V/ye7S9davG2c3mnMV8dMbWp+zzbtTVuJd0x2+3EEah bFnPWF/BV2c3PUjNN1cZbqCt0J4KJaF3sD2pug2eJGsma9iyJ0XjPngcX96zqsNEr+EQY1wM6sp BRj1m37qutm/icC8Hc3RyrwVa X-Received: by 2002:a17:906:72cd:b0:722:d84b:30e3 with SMTP id m13-20020a17090672cd00b00722d84b30e3mr44622323ejl.726.1657180700262; Thu, 07 Jul 2022 00:58:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tXGMfWhJXgu4TrgwJ52GnnfFpsh/Jx5SVZlwNd1ov5/qSYYiq7MonPls2KvD76VW6DChUhjA== X-Received: by 2002:a17:906:72cd:b0:722:d84b:30e3 with SMTP id m13-20020a17090672cd00b00722d84b30e3mr44622310ejl.726.1657180700056; Thu, 07 Jul 2022 00:58:20 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id kv10-20020a17090778ca00b006f3ef214ddesm547277ejc.68.2022.07.07.00.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:19 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Ciara Power Cc: Kai Ji , dpdk stable Subject: patch 'test/crypto: fix cipher offset for ZUC' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:54 +0200 Message-Id: <20220707075522.194223-59-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/d0fff9500afbd5ad34b6624e96107ec3b313de6f Thanks. Christian Ehrhardt --- >From d0fff9500afbd5ad34b6624e96107ec3b313de6f Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 21 Jun 2022 11:41:32 +0000 Subject: [PATCH] test/crypto: fix cipher offset for ZUC [ upstream commit 7a0f8fe76bd03dc8b61965040a66409996afa717 ] The cipher offset in bits was not being used in ZUC encryption test functions when creating the operation, it was hardcoded to 0. This is fixed to use the offset from the test vector as intended. Fixes: fd01a9be38d5 ("test/crypto: move IV to crypto op private data") Signed-off-by: Ciara Power Acked-by: Kai Ji --- app/test/test_cryptodev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 7ecfe8fac0..580702d6e3 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -5455,7 +5455,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->plaintext.len, - 0); + tdata->validCipherOffsetInBits.len); if (retval < 0) return retval; @@ -5542,7 +5542,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata) /* Create ZUC operation */ retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->plaintext.len, - 0); + tdata->validCipherOffsetInBits.len); if (retval < 0) return retval; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.635056752 +0200 +++ 0059-test-crypto-fix-cipher-offset-for-ZUC.patch 2022-07-07 09:54:10.965824617 +0200 @@ -1 +1 @@ -From 7a0f8fe76bd03dc8b61965040a66409996afa717 Mon Sep 17 00:00:00 2001 +From d0fff9500afbd5ad34b6624e96107ec3b313de6f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7a0f8fe76bd03dc8b61965040a66409996afa717 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 15df53a1f0..1cac76a64a 100644 +index 7ecfe8fac0..580702d6e3 100644 @@ -23 +24 @@ -@@ -6033,7 +6033,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) +@@ -5455,7 +5455,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) @@ -32 +33 @@ -@@ -6128,7 +6128,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata) +@@ -5542,7 +5542,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)