patch 'examples/ipsec-secgw: fix auth IV length' 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/20/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/f18e07dad7c766e4f2283a89b51e1d71471aa11d

Thanks.

Kevin

---
>From f18e07dad7c766e4f2283a89b51e1d71471aa11d Mon Sep 17 00:00:00 2001
From: Akhil Goyal <gakhil at marvell.com>
Date: Thu, 16 Feb 2023 19:54:40 +0530
Subject: [PATCH] examples/ipsec-secgw: fix auth IV length

[ upstream commit 56af18587ef8beace28de1054643752922f7a696 ]

Currently, cipher IV length is getting used to set auth
xform IV length. Auth IV is needed for AES-GMAC case,
and in all other cases, auth IV should be 0.
Used a separate auth IV length to separate out cipher and auth cases.

Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional algorithms")

Signed-off-by: Akhil Goyal <gakhil at marvell.com>
Acked-by: Kai Ji <kai.ji at intel.com>
---
 examples/ipsec-secgw/sa.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 2f8b9bce27..49d16f055b 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -1224,4 +1224,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
 	uint32_t i, idx;
 	uint16_t iv_length, aad_length;
+	uint16_t auth_iv_length = 0;
 	int inline_status;
 	int32_t rc;
@@ -1316,5 +1317,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
 			/* AES_GMAC uses salt like AEAD algorithms */
 			if (sa->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC)
-				iv_length = 12;
+				auth_iv_length = 12;
 
 			if (inbound) {
@@ -1340,5 +1341,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
 					RTE_CRYPTO_AUTH_OP_VERIFY;
 				sa_ctx->xf[idx].a.auth.iv.offset = IV_OFFSET;
-				sa_ctx->xf[idx].a.auth.iv.length = iv_length;
+				sa_ctx->xf[idx].a.auth.iv.length = auth_iv_length;
 
 			} else { /* outbound */
@@ -1364,5 +1365,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
 					RTE_CRYPTO_AUTH_OP_GENERATE;
 				sa_ctx->xf[idx].b.auth.iv.offset = IV_OFFSET;
-				sa_ctx->xf[idx].b.auth.iv.length = iv_length;
+				sa_ctx->xf[idx].b.auth.iv.length = auth_iv_length;
 
 			}
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 14:30:20.861200129 +0000
+++ 0010-examples-ipsec-secgw-fix-auth-IV-length.patch	2023-03-15 14:30:20.561123616 +0000
@@ -1 +1 @@
-From 56af18587ef8beace28de1054643752922f7a696 Mon Sep 17 00:00:00 2001
+From f18e07dad7c766e4f2283a89b51e1d71471aa11d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 56af18587ef8beace28de1054643752922f7a696 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 7da9444a7b..001762bea9 100644
+index 2f8b9bce27..49d16f055b 100644
@@ -24 +25 @@
-@@ -1248,4 +1248,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
+@@ -1224,4 +1224,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
@@ -30 +31 @@
-@@ -1341,5 +1342,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
+@@ -1316,5 +1317,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
@@ -37 +38 @@
-@@ -1365,5 +1366,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
+@@ -1340,5 +1341,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
@@ -44 +45 @@
-@@ -1389,5 +1390,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
+@@ -1364,5 +1365,5 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],