patch 'test/crypto: fix ZUC digest length in comparison' has been queued to stable release 22.11.2

Xueming Li xuemingl at nvidia.com
Sun Apr 9 17:24:51 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.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 04/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/0217458d5e793eb62f8e32ae700b639dd954c39c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0217458d5e793eb62f8e32ae700b639dd954c39c Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Fri, 3 Mar 2023 09:38:18 +0000
Subject: [PATCH] test/crypto: fix ZUC digest length in comparison
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 <ciara.power at intel.com>
Acked-by: Brian Dooley <brian.dooley at intel.com>
Acked-by: Tejasree Kondoj <ktejasree at marvell.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 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 d6ae762df9..a216e9ff58 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -4853,7 +4853,7 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
 	TEST_ASSERT_BUFFERS_ARE_EQUAL(
 			ut_params->digest,
 			tdata->digest.data,
-			4,
+			tdata->digest.len,
 			"ZUC Generated auth tag not as expected");
 	return 0;
 }
@@ -6415,7 +6415,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
 		TEST_ASSERT_BUFFERS_ARE_EQUAL(
 			ut_params->digest,
 			tdata->digest.data,
-			DIGEST_BYTE_LENGTH_KASUMI_F9,
+			tdata->digest.len,
 			"ZUC Generated auth tag not as expected");
 	}
 	return 0;
@@ -6622,7 +6622,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
 		TEST_ASSERT_BUFFERS_ARE_EQUAL(
 			digest,
 			tdata->digest.data,
-			DIGEST_BYTE_LENGTH_KASUMI_F9,
+			tdata->digest.len,
 			"ZUC Generated auth tag not as expected");
 	}
 	return 0;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:41.404623800 +0800
+++ 0103-test-crypto-fix-ZUC-digest-length-in-comparison.patch	2023-04-09 21:45:38.739042200 +0800
@@ -1 +1 @@
-From dc3042ba468196c6f51777b7d41596618b2e47f4 Mon Sep 17 00:00:00 2001
+From 0217458d5e793eb62f8e32ae700b639dd954c39c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit dc3042ba468196c6f51777b7d41596618b2e47f4 ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -27 +29 @@
-index 9b18883547..dea0788b4e 100644
+index d6ae762df9..a216e9ff58 100644
@@ -39 +41 @@
-@@ -6499,7 +6499,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
+@@ -6415,7 +6415,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
@@ -48 +50 @@
-@@ -6706,7 +6706,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
+@@ -6622,7 +6622,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,


More information about the stable mailing list