patch 'examples/fips_validation: fix digest length in AES-GCM' has been queued to stable release 20.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.9

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/16/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/9c69847ee4a2326aa11634f133d867c6e0270a88

Thanks.

Luca Boccassi

---
>From 9c69847ee4a2326aa11634f133d867c6e0270a88 Mon Sep 17 00:00:00 2001
From: Samina Arshad <samina.arshad at intel.com>
Date: Wed, 28 Jun 2023 14:38:36 +0000
Subject: [PATCH] examples/fips_validation: fix digest length in AES-GCM

[ upstream commit 94dfc563b620b2f04db7c59b6fdee458a9e1d481 ]

For AES GCM non JSON decrypt test cases the digest length
is being set incorrectly.The digest length is not being
cleared after test cases, causing an issue when running
tests individually without the --path-is-folder flag.
This fix adds the digest length correctly to the decrypt
cases and clears the digest length after each test file.

Fixes: 4aaad2995e13 ("examples/fips_validation: support GCM parsing")

Signed-off-by: Samina Arshad <samina.arshad at intel.com>
Acked-by: Brian Dooley <brian.dooley at intel.com>
Acked-by: Gowrishankar Muthukrishnan <gmuthukrishn at marvell.com>
---
 examples/fips_validation/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index f746812980..6b22a8633c 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -698,7 +698,7 @@ prepare_aead_op(void)
 			RTE_LOG(ERR, USER1, "Not enough memory\n");
 			return -ENOMEM;
 		}
-		env.digest_len = vec.cipher_auth.digest.len;
+		env.digest_len = vec.aead.digest.len;
 
 		sym->aead.data.length = vec.pt.len;
 		sym->aead.digest.data = env.digest;
@@ -707,7 +707,7 @@ prepare_aead_op(void)
 		ret = prepare_data_mbufs(&vec.ct);
 		if (ret < 0)
 			return ret;
-
+		env.digest_len = vec.aead.digest.len;
 		sym->aead.data.length = vec.ct.len;
 		sym->aead.digest.data = vec.aead.digest.val;
 		sym->aead.digest.phys_addr = rte_malloc_virt2iova(
@@ -1835,6 +1835,7 @@ error_one_case:
 	if (env.digest) {
 		rte_free(env.digest);
 		env.digest = NULL;
+		env.digest_len = 0;
 	}
 	if (env.mbuf)
 		rte_pktmbuf_free(env.mbuf);
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-14 23:33:09.183172980 +0100
+++ 0015-examples-fips_validation-fix-digest-length-in-AES-GC.patch	2023-07-14 23:33:08.507305494 +0100
@@ -1 +1 @@
-From 94dfc563b620b2f04db7c59b6fdee458a9e1d481 Mon Sep 17 00:00:00 2001
+From 9c69847ee4a2326aa11634f133d867c6e0270a88 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94dfc563b620b2f04db7c59b6fdee458a9e1d481 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 4237224d9d..6518c959c4 100644
+index f746812980..6b22a8633c 100644
@@ -27 +28 @@
-@@ -834,7 +834,7 @@ prepare_aead_op(void)
+@@ -698,7 +698,7 @@ prepare_aead_op(void)
@@ -36 +37 @@
-@@ -843,7 +843,7 @@ prepare_aead_op(void)
+@@ -707,7 +707,7 @@ prepare_aead_op(void)
@@ -45 +46 @@
-@@ -2618,6 +2618,7 @@ error_one_case:
+@@ -1835,6 +1835,7 @@ error_one_case:
@@ -51,2 +52,2 @@
- 	rte_pktmbuf_free(env.mbuf);
- 
+ 	if (env.mbuf)
+ 		rte_pktmbuf_free(env.mbuf);