patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Ciara Power <ciara.power@intel.com>
Cc: Brian Dooley <brian.dooley@intel.com>,
	Tejasree Kondoj <ktejasree@marvell.com>,
	Pablo de Lara <pablo.de.lara.guarch@intel.com>,
	dpdk stable <stable@dpdk.org>
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	[thread overview]
Message-ID: <20230322103209.456098-5-ktraynor@redhat.com> (raw)
In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com>

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 <ciara.power@intel.com>
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 <ciara.power@intel.com>
Acked-by: Brian Dooley <brian.dooley@intel.com>
Acked-by: Tejasree Kondoj <ktejasree@marvell.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@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 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,


  parent reply	other threads:[~2023-03-22 10:32 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-22 10:31 patch 'raw/skeleton: fix selftest' " Kevin Traynor
2023-03-22 10:31 ` patch 'reorder: fix sequence number mbuf field register' " Kevin Traynor
2023-03-22 10:31 ` patch 'test: fix segment length in packet generator' " Kevin Traynor
2023-03-22 10:31 ` patch 'test/mbuf: fix test with mbuf debug enabled' " Kevin Traynor
2023-03-22 10:31 ` Kevin Traynor [this message]
2023-03-22 10:31 ` patch 'test/crypto: fix capability check for ZUC cipher-auth' " Kevin Traynor
2023-03-22 10:31 ` patch 'app/compress-perf: fix remaining data for ops' " Kevin Traynor
2023-03-22 10:31 ` patch 'app/bbdev: check statistics failure' " Kevin Traynor
2023-03-22 10:31 ` patch 'net/vhost: add missing newline in logs' " Kevin Traynor
2023-03-22 10:31 ` patch 'net/vhost: fix leak in interrupt handle setup' " Kevin Traynor
2023-03-22 10:31 ` patch 'net/vhost: fix Rx interrupt' " Kevin Traynor
2023-03-22 10:31 ` patch 'net/virtio: remove address width limit for modern devices' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/sfc: invalidate switch port entry on representor unplug' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/i40e: fix AVX512 fast-free path' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/e1000: fix saving of stripped VLAN TCI' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/i40e: fix MAC loopback on X722' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/iavf: fix device stop during reset' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/mlx5: fix hairpin Tx queue reference count' " Kevin Traynor
2023-03-22 10:32 ` patch 'doc: fix LPM support in l3forward guide' " Kevin Traynor
2023-03-22 10:32 ` patch 'bus/ifpga: fix devargs handling' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/ipn3ke: fix thread exit' " Kevin Traynor
2023-03-22 10:32 ` patch 'net/ipn3ke: fix representor name' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230322103209.456098-5-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=brian.dooley@intel.com \
    --cc=ciara.power@intel.com \
    --cc=ktejasree@marvell.com \
    --cc=pablo.de.lara.guarch@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).