DPDK patches and discussions
 help / color / mirror / Atom feed
From: Brian Dooley <brian.dooley@intel.com>
To: Brian Dooley <brian.dooley@intel.com>
Cc: dev@dpdk.org, gmuthukrishn@marvell.com, gakhil@marvell.com
Subject: [PATCH v1] examples/fips_validation: parse block error fix
Date: Mon, 24 Oct 2022 10:36:51 +0000	[thread overview]
Message-ID: <20221024103652.499554-1-brian.dooley@intel.com> (raw)

When parsing request files check for file type. This fix will remove
dependence on command line parameter for using libjansson

Fixes: 0f42f3d6034c ("examples/fips_validation: share callback with multiple keys")
Cc: gmuthukrishn@marvell.com
Signed-off-by: Brian Dooley <brian.dooley@intel.com>
---
 examples/fips_validation/fips_validation.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 363e17a6f3..5a2a5f86e6 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -638,10 +638,11 @@ parse_uint8_hex_str(const char *key, char *src, struct fips_val *val)
 	/*
 	 * Offset not applicable in case of JSON test vectors.
 	 */
-	RTE_SET_USED(key);
-#else
-	src += strlen(key);
+	if (info.file_type == FIPS_TYPE_JSON) {
+		RTE_SET_USED(key);
+	} else
 #endif
+		src += strlen(key);
 
 	len = strlen(src) / 2;
 
@@ -669,18 +670,16 @@ parse_uint8_hex_str(const char *key, char *src, struct fips_val *val)
 	return 0;
 }
 
-#ifdef USE_JANSSON
 int
 parser_read_uint32_val(const char *key, char *src, struct fips_val *val)
 {
-	RTE_SET_USED(key);
+#ifdef USE_JANSSON
+	if (info.file_type == FIPS_TYPE_JSON) {
+		RTE_SET_USED(key);
 
-	return parser_read_uint32(&val->len, src);
-}
-#else
-int
-parser_read_uint32_val(const char *key, char *src, struct fips_val *val)
-{
+		return parser_read_uint32(&val->len, src);
+	}
+# endif
 	char *data = src + strlen(key);
 	size_t data_len = strlen(data);
 	int ret;
@@ -701,7 +700,6 @@ parser_read_uint32_val(const char *key, char *src, struct fips_val *val)
 
 	return ret;
 }
-#endif
 
 int
 parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val)
-- 
2.25.1


             reply	other threads:[~2022-10-24 10:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-24 10:36 Brian Dooley [this message]
2022-10-24 14:06 ` Power, Ciara
2022-10-26  4:26 ` [EXT] " Gowrishankar Muthukrishnan
2022-10-27 10:19   ` 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=20221024103652.499554-1-brian.dooley@intel.com \
    --to=brian.dooley@intel.com \
    --cc=dev@dpdk.org \
    --cc=gakhil@marvell.com \
    --cc=gmuthukrishn@marvell.com \
    /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).