patch 'test/crypto: fix capability check for ZUC cipher-auth' has been queued to stable release 21.11.4

[Kevin Traynor]

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/50f94c98a99308e2d9210f618fbc2093e58dca97

Thanks.

Kevin

---
>From 50f94c98a99308e2d9210f618fbc2093e58dca97 Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Fri, 3 Mar 2023 09:38:20 +0000
Subject: [PATCH] test/crypto: fix capability check for ZUC cipher-auth

[ upstream commit dd4d13779d63475aa13d2b9f9de06db145e39c78 ]

The cipher-auth test function for ZUC was not using the improved cipher
and auth capability check functions. This meant the required key and IV
lengths were not being checked, leading to problems with ZUC-256 tests
running, and failing, on devices that only support ZUC-128.

Fixes: 27b787132484 ("test/crypto: check cipher parameters")
Fixes: f93fce6de4aa ("test/crypto: check auth parameters")

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 | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 0b4b216611..a18b15d7c2 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -136,4 +136,15 @@ static int
 dev_configure_and_start(uint64_t ff_disable);
 
+static int
+check_cipher_capability(const struct crypto_testsuite_params *ts_params,
+			const enum rte_crypto_cipher_algorithm cipher_algo,
+			const uint16_t key_size, const uint16_t iv_size);
+
+static int
+check_auth_capability(const struct crypto_testsuite_params *ts_params,
+			const enum rte_crypto_auth_algorithm auth_algo,
+			const uint16_t key_size, const uint16_t iv_size,
+			const uint16_t tag_size);
+
 static struct rte_mbuf *
 setup_test_string(struct rte_mempool *mpool,
@@ -4795,5 +4806,4 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
 
 	struct rte_cryptodev_info dev_info;
-	struct rte_cryptodev_sym_capability_idx cap_idx;
 
 	rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
@@ -4817,17 +4827,12 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
 
 	/* Check if device supports ZUC EEA3 */
-	cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-	cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
-
-	if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-			&cap_idx) == NULL)
+	if (check_cipher_capability(ts_params, RTE_CRYPTO_CIPHER_ZUC_EEA3,
+			tdata->key.len, tdata->cipher_iv.len) < 0)
 		return TEST_SKIPPED;
 
 	/* Check if device supports ZUC EIA3 */
-	cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-	cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
-
-	if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-			&cap_idx) == NULL)
+	if (check_auth_capability(ts_params, RTE_CRYPTO_AUTH_ZUC_EIA3,
+			tdata->key.len, tdata->auth_iv.len,
+			tdata->digest.len) < 0)
 		return TEST_SKIPPED;
 
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-22 10:30:08.079059306 +0000
+++ 0006-test-crypto-fix-capability-check-for-ZUC-cipher-auth.patch	2023-03-22 10:30:07.905866553 +0000
@@ -1 +1 @@
-From dd4d13779d63475aa13d2b9f9de06db145e39c78 Mon Sep 17 00:00:00 2001
+From 50f94c98a99308e2d9210f618fbc2093e58dca97 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dd4d13779d63475aa13d2b9f9de06db145e39c78 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 9447777224..26ae382ad4 100644
+index 0b4b216611..a18b15d7c2 100644
@@ -27 +28 @@
-@@ -137,4 +137,15 @@ static int
+@@ -136,4 +136,15 @@ static int
@@ -43 +44 @@
-@@ -4762,5 +4773,4 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
+@@ -4795,5 +4806,4 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
@@ -49 +50 @@
-@@ -4784,17 +4794,12 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)
+@@ -4817,17 +4827,12 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)