[dpdk-stable] patch 'examples/fips_validation: fix parsing of algorithms' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. 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.

Thanks.

Luca Boccassi

---
>From b64337ffa33f3afb40026230ad19484e58196640 Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana at marvell.com>
Date: Fri, 17 Apr 2020 20:38:40 +0530
Subject: [PATCH] examples/fips_validation: fix parsing of algorithms

[ upstream commit 90ecace4f6d741c944243dda3ae88c882d4ac12d ]

Few of the NIST TDES test files don't contain TDES string.
Added indicators to identify such files. These indicators
are part of only NIST TDES test vector files.

Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing")

Signed-off-by: Archana Muniganti <marchana at marvell.com>
Signed-off-by: Ayuj Verma <ayverma at marvell.com>
Acked-by: Anoob Joseph <anoobj at marvell.com>
---
 examples/fips_validation/fips_validation.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 07ffa62e9e..b79a095aca 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -144,6 +144,24 @@ fips_test_parse_header(void)
 				ret = parse_test_tdes_init();
 				if (ret < 0)
 					return 0;
+			} else if (strstr(info.vec[i], "PERMUTATION")) {
+				algo_parsed = 1;
+				info.algo = FIPS_TEST_ALGO_TDES;
+				ret = parse_test_tdes_init();
+				if (ret < 0)
+					return 0;
+			} else if (strstr(info.vec[i], "VARIABLE")) {
+				algo_parsed = 1;
+				info.algo = FIPS_TEST_ALGO_TDES;
+				ret = parse_test_tdes_init();
+				if (ret < 0)
+					return 0;
+			} else if (strstr(info.vec[i], "SUBSTITUTION")) {
+				algo_parsed = 1;
+				info.algo = FIPS_TEST_ALGO_TDES;
+				ret = parse_test_tdes_init();
+				if (ret < 0)
+					return 0;
 			} else if (strstr(info.vec[i], "SHA-")) {
 				algo_parsed = 1;
 				info.algo = FIPS_TEST_ALGO_SHA;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:51.787690209 +0100
+++ 0178-examples-fips_validation-fix-parsing-of-algorithms.patch	2020-05-19 14:04:44.520653884 +0100
@@ -1,14 +1,15 @@
-From 90ecace4f6d741c944243dda3ae88c882d4ac12d Mon Sep 17 00:00:00 2001
+From b64337ffa33f3afb40026230ad19484e58196640 Mon Sep 17 00:00:00 2001
 From: Archana Muniganti <marchana at marvell.com>
 Date: Fri, 17 Apr 2020 20:38:40 +0530
 Subject: [PATCH] examples/fips_validation: fix parsing of algorithms
 
+[ upstream commit 90ecace4f6d741c944243dda3ae88c882d4ac12d ]
+
 Few of the NIST TDES test files don't contain TDES string.
 Added indicators to identify such files. These indicators
 are part of only NIST TDES test vector files.
 
 Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing")
-Cc: stable at dpdk.org
 
 Signed-off-by: Archana Muniganti <marchana at marvell.com>
 Signed-off-by: Ayuj Verma <ayverma at marvell.com>
@@ -18,7 +19,7 @@
  1 file changed, 18 insertions(+)
 
 diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
-index ef24b72037..a34e34d25a 100644
+index 07ffa62e9e..b79a095aca 100644
 --- a/examples/fips_validation/fips_validation.c
 +++ b/examples/fips_validation/fips_validation.c
 @@ -144,6 +144,24 @@ fips_test_parse_header(void)