[dpdk-stable] patch 'examples/fips_validation: fix string token for CT length' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/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 ea800a57d6442594a91f23c80e829ab0fb6cde09 Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj at marvell.com>
Date: Tue, 18 Feb 2020 16:01:12 +0530
Subject: [PATCH] examples/fips_validation: fix string token for CT length

[ upstream commit b1ea86a07cbce6d5b0a9b05a4e0c0fbbe56ad20d ]

The NIST test vectors use the string 'PTlen' to denote text lengths
in case of encrypt & decrypt operations. So the same string needs to be
used while parsing PT and CT.

Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length parsing")

Signed-off-by: Anoob Joseph <anoobj at marvell.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 examples/fips_validation/fips_validation_gcm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/fips_validation/fips_validation_gcm.c b/examples/fips_validation/fips_validation_gcm.c
index bc2d37dcbf..47576e9a38 100644
--- a/examples/fips_validation/fips_validation_gcm.c
+++ b/examples/fips_validation/fips_validation_gcm.c
@@ -19,7 +19,6 @@
 #define PTLEN_STR	"PTlen = "
 #define AADLEN_STR	"AADlen = "
 #define TAGLEN_STR	"Taglen = "
-#define CTLEN_STR	"CTlen = "
 
 #define COUNT_STR	"Count = "
 #define KEY_STR		"Key = "
@@ -47,7 +46,10 @@ struct fips_test_callback gcm_interim_vectors[] = {
 		{KEYLEN_STR, parser_read_uint32_bit_val, &vec.aead.key},
 		{IVLEN_STR, parser_read_uint32_bit_val, &vec.iv},
 		{PTLEN_STR, parser_read_uint32_bit_val, &vec.pt},
-		{CTLEN_STR, parser_read_uint32_bit_val, &vec.ct},
+		{PTLEN_STR, parser_read_uint32_bit_val, &vec.ct},
+		/**< The NIST test vectors use 'PTlen' to denote input text
+		 *  length in case of decrypt & encrypt operations.
+		 */
 		{AADLEN_STR, parser_read_uint32_bit_val, &vec.aead.aad},
 		{TAGLEN_STR, parser_read_uint32_bit_val,
 				&vec.aead.digest},
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:55.944088518 +0000
+++ 0003-examples-fips_validation-fix-string-token-for-CT-len.patch	2020-02-27 09:31:55.631945112 +0000
@@ -1,8 +1,10 @@
-From b1ea86a07cbce6d5b0a9b05a4e0c0fbbe56ad20d Mon Sep 17 00:00:00 2001
+From ea800a57d6442594a91f23c80e829ab0fb6cde09 Mon Sep 17 00:00:00 2001
 From: Anoob Joseph <anoobj at marvell.com>
 Date: Tue, 18 Feb 2020 16:01:12 +0530
 Subject: [PATCH] examples/fips_validation: fix string token for CT length
 
+[ upstream commit b1ea86a07cbce6d5b0a9b05a4e0c0fbbe56ad20d ]
+
 The NIST test vectors use the string 'PTlen' to denote text lengths
 in case of encrypt & decrypt operations. So the same string needs to be
 used while parsing PT and CT.