dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: <michaelsh@marvell.com>
To: <akhil.goyal@nxp.com>
Cc: <stable@dpdk.org>, <dev@dpdk.org>, <marko.kovacevic@intel.com>,
	<lironh@marvell.com>, <michaelsh@marvell.com>
Subject: [dpdk-dev] [PATCH 6/8] examples/fips_validation: fix overwrite of KEY line in TDES
Date: Thu, 19 Sep 2019 15:12:30 +0300	[thread overview]
Message-ID: <20190919121232.4864-7-michaelsh@marvell.com> (raw)
In-Reply-To: <20190919121232.4864-1-michaelsh@marvell.com>

From: Michael Shamis <michaelsh@marvell.com>

Fix for TCBCMonte2, TCBCMonte3 and TECBMonte2: application
overwrites key1 line in output file so comparision
with sample files failed

Signed-off-by: Michael Shamis <michaelsh@marvell.com>
---
 examples/fips_validation/fips_validation.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 80fd482a1..9aa423b0f 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -11,6 +11,10 @@
 
 #include "fips_validation.h"
 
+#define COUNT0_STR	"COUNT = 0  "
+#define KEY_STR		"KEY"
+#define NK_STR		"NumKey"
+
 #define skip_white_spaces(pos)			\
 ({						\
 	__typeof__(pos) _p = (pos);		\
@@ -68,6 +72,22 @@ fips_test_fetch_one_block(void)
 		if (size == 0)
 			break;
 
+		/* if first line is KEY-line then insert COUNT-line */
+		if (i == 0) {
+			if (strstr(info.one_line_text, KEY_STR)) {
+				info.vec[0] = calloc(1, sizeof(COUNT0_STR));
+				strlcpy(info.vec[0],
+						COUNT0_STR,
+						sizeof(COUNT0_STR));
+				i = 1;
+				info.nb_vec_lines = 1;
+			}
+		}
+
+		/* don't copy NumKey-line */
+		if (strstr(info.one_line_text, NK_STR))
+			break;
+
 		info.vec[i] = calloc(1, size + 5);
 		if (info.vec[i] == NULL)
 			goto error_exit;
-- 
2.23.0


  parent reply	other threads:[~2019-09-19 11:55 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-19 12:12 [dpdk-dev] [PATCH 0/8] Fips validation fixes michaelsh
2019-09-19 12:12 ` [dpdk-dev] [PATCH 1/8] examples/fips_validation: separation between HMAC-SHA and SHA michaelsh
2019-09-19 12:12 ` [dpdk-dev] [PATCH 2/8] examples/fips_validation: fix structs used for AES-GCM michaelsh
2019-09-19 12:12 ` [dpdk-dev] [PATCH 3/8] examples/fips_validation: initialize IV " michaelsh
2019-09-19 12:12 ` [dpdk-dev] [PATCH 4/8] examples/fips_validation: move digest after cipher text michaelsh
2019-09-19 12:12 ` [dpdk-dev] [PATCH 5/8] examples/fips_validation: fix AES-GCM decryption vector michaelsh
2019-09-19 12:12 ` michaelsh [this message]
2019-09-19 12:12 ` [dpdk-dev] [PATCH 7/8] examples/fips_validation: improve algo parsing logic michaelsh
2019-09-19 12:12 ` [dpdk-dev] [PATCH 8/8] examples/fips_validation: fix plain text overwrite michaelsh
2019-09-19 13:15 ` [dpdk-dev] [PATCH 0/8] Fips validation fixes Akhil Goyal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190919121232.4864-7-michaelsh@marvell.com \
    --to=michaelsh@marvell.com \
    --cc=akhil.goyal@nxp.com \
    --cc=dev@dpdk.org \
    --cc=lironh@marvell.com \
    --cc=marko.kovacevic@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).