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 80490427EF for ; Wed, 22 Mar 2023 11:32:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A66342B7E; Wed, 22 Mar 2023 11:32:30 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C5FA9410EF for ; Wed, 22 Mar 2023 11:32:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481148; 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=Af6MnaAnsxM4CWDOsYQRCWY8BrfCJyTtk3KoyCYEu5E=; b=XZEr4CoglGCrNuj538PiT6v7HqMyZeSb39VOkr+IpjNnVoIAnHIydJc/7XVP+S42aygIrm j0dGY+vXEjSHqNAxKNQbEACCj/1+tXZPGH1zC4WVL8m+GDUrLp1lVeOWIE1zcWcLLRN82A VTsYWPJlkU0g+lThc+4GvVlO79fkg9c= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-8-8aXNmz91M_S-Rf60IA6KFg-1; Wed, 22 Mar 2023 06:32:25 -0400 X-MC-Unique: 8aXNmz91M_S-Rf60IA6KFg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E610D2808E6A; Wed, 22 Mar 2023 10:32:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBA8D492C13; Wed, 22 Mar 2023 10:32:23 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Brian Dooley , Tejasree Kondoj , Pablo de Lara , dpdk stable Subject: patch 'test/crypto: fix ZUC digest length in comparison' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:31:52 +0000 Message-Id: <20230322103209.456098-5-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/23. 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/0872c1aaad584c8592c4d1053be3bee5b675aadf Thanks. Kevin --- >From 0872c1aaad584c8592c4d1053be3bee5b675aadf Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 3 Mar 2023 09:38:18 +0000 Subject: [PATCH] test/crypto: fix ZUC digest length in comparison [ upstream commit dc3042ba468196c6f51777b7d41596618b2e47f4 ] The digest length used in ZUC tests for verifying the digest was hardcoded at 4 bytes, which was suitable for ZUC-128 only. Now that ZUC256 is supported by these test functions, the digest length can vary. Using the test vector digest length directly in these comparisons allows for variable digest length. Fixes: 83397b9f0739 ("test/crypto: add further ZUC test cases") Fixes: fa5bf9345d4e ("test/crypto: add ZUC cases with 256-bit keys") Signed-off-by: Ciara Power Acked-by: Brian Dooley Acked-by: Tejasree Kondoj Acked-by: Pablo de Lara --- app/test/test_cryptodev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index fea06b8628..0b4b216611 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -4887,5 +4887,5 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) ut_params->digest, tdata->digest.data, - 4, + tdata->digest.len, "ZUC Generated auth tag not as expected"); return 0; @@ -6449,5 +6449,5 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, ut_params->digest, tdata->digest.data, - DIGEST_BYTE_LENGTH_KASUMI_F9, + tdata->digest.len, "ZUC Generated auth tag not as expected"); } @@ -6656,5 +6656,5 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, digest, tdata->digest.data, - DIGEST_BYTE_LENGTH_KASUMI_F9, + tdata->digest.len, "ZUC Generated auth tag not as expected"); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.047626742 +0000 +++ 0005-test-crypto-fix-ZUC-digest-length-in-comparison.patch 2023-03-22 10:30:07.895866541 +0000 @@ -1 +1 @@ -From dc3042ba468196c6f51777b7d41596618b2e47f4 Mon Sep 17 00:00:00 2001 +From 0872c1aaad584c8592c4d1053be3bee5b675aadf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc3042ba468196c6f51777b7d41596618b2e47f4 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 9b18883547..dea0788b4e 100644 +index fea06b8628..0b4b216611 100644 @@ -30 +31 @@ -@@ -4854,5 +4854,5 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) +@@ -4887,5 +4887,5 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) @@ -37 +38 @@ -@@ -6500,5 +6500,5 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, +@@ -6449,5 +6449,5 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, @@ -44 +45 @@ -@@ -6707,5 +6707,5 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, +@@ -6656,5 +6656,5 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,