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 7/8] examples/fips_validation: improve algo parsing logic
Date: Thu, 19 Sep 2019 15:12:31 +0300	[thread overview]
Message-ID: <20190919121232.4864-8-michaelsh@marvell.com> (raw)
In-Reply-To: <20190919121232.4864-1-michaelsh@marvell.com>

From: Michael Shamis <michaelsh@marvell.com>

The fix allows to find algorithm by folder name if
the algorithm was not found from the test file header.

In order to find algorithm used the folder name if it is
not defined within the file.

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

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 9aa423b0f..4dde482e5 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -248,6 +248,48 @@ fips_test_parse_header(void)
 		fprintf(info.fp_wr, "%s\n", info.vec[i]);
 	}
 
+	/* use folder name if algorithm is not found yet*/
+	if (info.algo == FIPS_TEST_ALGO_MAX) {
+		if (strstr(info.file_name, "AESVS")) {
+			info.algo = FIPS_TEST_ALGO_AES;
+			ret = parse_test_aes_init();
+			if (ret < 0)
+				return ret;
+		} else if (strstr(info.file_name, "GCM")) {
+			info.algo = FIPS_TEST_ALGO_AES_GCM;
+			ret = parse_test_gcm_init();
+			if (ret < 0)
+				return ret;
+		} else if (strstr(info.file_name, "CMAC")) {
+			info.algo = FIPS_TEST_ALGO_AES_CMAC;
+			ret = parse_test_cmac_init();
+			if (ret < 0)
+				return ret;
+		} else if (strstr(info.file_name, "CCM")) {
+			info.algo = FIPS_TEST_ALGO_AES_CCM;
+			ret = parse_test_ccm_init();
+			if (ret < 0)
+				return ret;
+		} else if (strstr(info.file_name, "HMAC")) {
+			info.algo = FIPS_TEST_ALGO_HMAC;
+			ret = parse_test_hmac_init();
+			if (ret < 0)
+				return ret;
+		} else if (strstr(info.file_name, "TDES")) {
+			info.algo = FIPS_TEST_ALGO_TDES;
+			ret = parse_test_tdes_init();
+			if (ret < 0)
+				return ret;
+		} else if (strstr(info.file_name, "SHA-")) {
+			if (info.algo != FIPS_TEST_ALGO_HMAC) {
+				info.algo = FIPS_TEST_ALGO_SHA;
+				ret = parse_test_sha_init();
+				if (ret < 0)
+					return ret;
+			}
+		}
+	}
+
 	return 0;
 }
 
-- 
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 ` [dpdk-dev] [PATCH 6/8] examples/fips_validation: fix overwrite of KEY line in TDES michaelsh
2019-09-19 12:12 ` michaelsh [this message]
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-8-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).