* Re: [dpdk-dev] [PATCH v2 1/3] examples/fips: fix hmac test failure
@ 2019-04-16 14:49 Akhil Goyal
2019-04-16 14:49 ` Akhil Goyal
0 siblings, 1 reply; 4+ messages in thread
From: Akhil Goyal @ 2019-04-16 14:49 UTC (permalink / raw)
To: Marko Kovacevic, dev; +Cc: john.mcnamara, xinfengx.zhao, damianx.nowak
> Application was failing as the HMAC and
> Plain SHA fips request files are similar in a
> way that they both have SHA- in the top section to
> determine the hash algo and hash sizes. And HMAC having the
> algo in the second line but the Plain SHA in the third
> meant that when the HMAC files was used once it parsed the third
> line Plain SHA was set as the algo and not HMAC.
>
> USER1: Failed to get capability for cdev 0
> USER1: Error -22: test block
> [L=20 SHAAlg=SHA_2]
> USER1: Error -22: Failed test /root/FIPS/HMAC/req/HMAC.req
>
> Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA")
> Cc: damianx.nowak@intel.com
>
> Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
> ---
Series Applied to dpdk-next-crypto
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v2 1/3] examples/fips: fix hmac test failure
2019-04-16 14:49 [dpdk-dev] [PATCH v2 1/3] examples/fips: fix hmac test failure Akhil Goyal
@ 2019-04-16 14:49 ` Akhil Goyal
0 siblings, 0 replies; 4+ messages in thread
From: Akhil Goyal @ 2019-04-16 14:49 UTC (permalink / raw)
To: Marko Kovacevic, dev; +Cc: john.mcnamara, xinfengx.zhao, damianx.nowak
> Application was failing as the HMAC and
> Plain SHA fips request files are similar in a
> way that they both have SHA- in the top section to
> determine the hash algo and hash sizes. And HMAC having the
> algo in the second line but the Plain SHA in the third
> meant that when the HMAC files was used once it parsed the third
> line Plain SHA was set as the algo and not HMAC.
>
> USER1: Failed to get capability for cdev 0
> USER1: Error -22: test block
> [L=20 SHAAlg=SHA_2]
> USER1: Error -22: Failed test /root/FIPS/HMAC/req/HMAC.req
>
> Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA")
> Cc: damianx.nowak@intel.com
>
> Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
> ---
Series Applied to dpdk-next-crypto
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-dev] [PATCH v2 1/3] examples/fips: fix hmac test failure
2019-04-11 14:16 [dpdk-dev] [PATCH v1 " Marko Kovacevic
@ 2019-04-15 15:04 ` Marko Kovacevic
2019-04-15 15:04 ` Marko Kovacevic
0 siblings, 1 reply; 4+ messages in thread
From: Marko Kovacevic @ 2019-04-15 15:04 UTC (permalink / raw)
To: dev
Cc: john.mcnamara, xinfengx.zhao, akhil.goyal, Marko Kovacevic,
damianx.nowak
Application was failing as the HMAC and
Plain SHA fips request files are similar in a
way that they both have SHA- in the top section to
determine the hash algo and hash sizes. And HMAC having the
algo in the second line but the Plain SHA in the third
meant that when the HMAC files was used once it parsed the third
line Plain SHA was set as the algo and not HMAC.
USER1: Failed to get capability for cdev 0
USER1: Error -22: test block
[L=20 SHAAlg=SHA_2]
USER1: Error -22: Failed test /root/FIPS/HMAC/req/HMAC.req
Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA")
Cc: damianx.nowak@intel.com
Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
---
v2:
Fixed checkpatch warning
---
examples/fips_validation/fips_validation.c | 80 +++++++++++++++++-------------
1 file changed, 45 insertions(+), 35 deletions(-)
diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 2f8314fcc..8d43b267e 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -98,6 +98,7 @@ fips_test_parse_header(void)
uint32_t i;
char *tmp;
int ret;
+ int algo_parsed = 0;
time_t t = time(NULL);
struct tm *tm_now = localtime(&t);
@@ -106,41 +107,50 @@ fips_test_parse_header(void)
return ret;
for (i = 0; i < info.nb_vec_lines; i++) {
- if (strstr(info.vec[i], "AESVS")) {
- info.algo = FIPS_TEST_ALGO_AES;
- ret = parse_test_aes_init();
- if (ret < 0)
- return ret;
- } else if (strstr(info.vec[i], "GCM")) {
- info.algo = FIPS_TEST_ALGO_AES_GCM;
- ret = parse_test_gcm_init();
- if (ret < 0)
- return ret;
- } else if (strstr(info.vec[i], "CMAC")) {
- info.algo = FIPS_TEST_ALGO_AES_CMAC;
- ret = parse_test_cmac_init();
- if (ret < 0)
- return 0;
- } else if (strstr(info.vec[i], "CCM")) {
- info.algo = FIPS_TEST_ALGO_AES_CCM;
- ret = parse_test_ccm_init();
- if (ret < 0)
- return 0;
- } else if (strstr(info.vec[i], "HMAC")) {
- info.algo = FIPS_TEST_ALGO_HMAC;
- ret = parse_test_hmac_init();
- if (ret < 0)
- return ret;
- } else if (strstr(info.vec[i], "TDES")) {
- info.algo = FIPS_TEST_ALGO_TDES;
- ret = parse_test_tdes_init();
- if (ret < 0)
- return 0;
- } else if (strstr(info.vec[i], "SHA-")) {
- info.algo = FIPS_TEST_ALGO_SHA;
- ret = parse_test_sha_init();
- if (ret < 0)
- return ret;
+ if (!algo_parsed) {
+ if (strstr(info.vec[i], "AESVS")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES;
+ ret = parse_test_aes_init();
+ if (ret < 0)
+ return ret;
+ } else if (strstr(info.vec[i], "GCM")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES_GCM;
+ ret = parse_test_gcm_init();
+ if (ret < 0)
+ return ret;
+ } else if (strstr(info.vec[i], "CMAC")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES_CMAC;
+ ret = parse_test_cmac_init();
+ if (ret < 0)
+ return 0;
+ } else if (strstr(info.vec[i], "CCM")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES_CCM;
+ ret = parse_test_ccm_init();
+ if (ret < 0)
+ return 0;
+ } else if (strstr(info.vec[i], "HMAC")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_HMAC;
+ ret = parse_test_hmac_init();
+ if (ret < 0)
+ return ret;
+ } else if (strstr(info.vec[i], "TDES")) {
+ 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;
+ ret = parse_test_sha_init();
+ if (ret < 0)
+ return ret;
+ }
}
tmp = strstr(info.vec[i], "# Config info for ");
--
2.13.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-dev] [PATCH v2 1/3] examples/fips: fix hmac test failure
2019-04-15 15:04 ` [dpdk-dev] [PATCH v2 " Marko Kovacevic
@ 2019-04-15 15:04 ` Marko Kovacevic
0 siblings, 0 replies; 4+ messages in thread
From: Marko Kovacevic @ 2019-04-15 15:04 UTC (permalink / raw)
To: dev
Cc: john.mcnamara, xinfengx.zhao, akhil.goyal, Marko Kovacevic,
damianx.nowak
Application was failing as the HMAC and
Plain SHA fips request files are similar in a
way that they both have SHA- in the top section to
determine the hash algo and hash sizes. And HMAC having the
algo in the second line but the Plain SHA in the third
meant that when the HMAC files was used once it parsed the third
line Plain SHA was set as the algo and not HMAC.
USER1: Failed to get capability for cdev 0
USER1: Error -22: test block
[L=20 SHAAlg=SHA_2]
USER1: Error -22: Failed test /root/FIPS/HMAC/req/HMAC.req
Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA")
Cc: damianx.nowak@intel.com
Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
---
v2:
Fixed checkpatch warning
---
examples/fips_validation/fips_validation.c | 80 +++++++++++++++++-------------
1 file changed, 45 insertions(+), 35 deletions(-)
diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 2f8314fcc..8d43b267e 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -98,6 +98,7 @@ fips_test_parse_header(void)
uint32_t i;
char *tmp;
int ret;
+ int algo_parsed = 0;
time_t t = time(NULL);
struct tm *tm_now = localtime(&t);
@@ -106,41 +107,50 @@ fips_test_parse_header(void)
return ret;
for (i = 0; i < info.nb_vec_lines; i++) {
- if (strstr(info.vec[i], "AESVS")) {
- info.algo = FIPS_TEST_ALGO_AES;
- ret = parse_test_aes_init();
- if (ret < 0)
- return ret;
- } else if (strstr(info.vec[i], "GCM")) {
- info.algo = FIPS_TEST_ALGO_AES_GCM;
- ret = parse_test_gcm_init();
- if (ret < 0)
- return ret;
- } else if (strstr(info.vec[i], "CMAC")) {
- info.algo = FIPS_TEST_ALGO_AES_CMAC;
- ret = parse_test_cmac_init();
- if (ret < 0)
- return 0;
- } else if (strstr(info.vec[i], "CCM")) {
- info.algo = FIPS_TEST_ALGO_AES_CCM;
- ret = parse_test_ccm_init();
- if (ret < 0)
- return 0;
- } else if (strstr(info.vec[i], "HMAC")) {
- info.algo = FIPS_TEST_ALGO_HMAC;
- ret = parse_test_hmac_init();
- if (ret < 0)
- return ret;
- } else if (strstr(info.vec[i], "TDES")) {
- info.algo = FIPS_TEST_ALGO_TDES;
- ret = parse_test_tdes_init();
- if (ret < 0)
- return 0;
- } else if (strstr(info.vec[i], "SHA-")) {
- info.algo = FIPS_TEST_ALGO_SHA;
- ret = parse_test_sha_init();
- if (ret < 0)
- return ret;
+ if (!algo_parsed) {
+ if (strstr(info.vec[i], "AESVS")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES;
+ ret = parse_test_aes_init();
+ if (ret < 0)
+ return ret;
+ } else if (strstr(info.vec[i], "GCM")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES_GCM;
+ ret = parse_test_gcm_init();
+ if (ret < 0)
+ return ret;
+ } else if (strstr(info.vec[i], "CMAC")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES_CMAC;
+ ret = parse_test_cmac_init();
+ if (ret < 0)
+ return 0;
+ } else if (strstr(info.vec[i], "CCM")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_AES_CCM;
+ ret = parse_test_ccm_init();
+ if (ret < 0)
+ return 0;
+ } else if (strstr(info.vec[i], "HMAC")) {
+ algo_parsed = 1;
+ info.algo = FIPS_TEST_ALGO_HMAC;
+ ret = parse_test_hmac_init();
+ if (ret < 0)
+ return ret;
+ } else if (strstr(info.vec[i], "TDES")) {
+ 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;
+ ret = parse_test_sha_init();
+ if (ret < 0)
+ return ret;
+ }
}
tmp = strstr(info.vec[i], "# Config info for ");
--
2.13.6
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-16 14:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-16 14:49 [dpdk-dev] [PATCH v2 1/3] examples/fips: fix hmac test failure Akhil Goyal
2019-04-16 14:49 ` Akhil Goyal
-- strict thread matches above, loose matches on Subject: below --
2019-04-11 14:16 [dpdk-dev] [PATCH v1 " Marko Kovacevic
2019-04-15 15:04 ` [dpdk-dev] [PATCH v2 " Marko Kovacevic
2019-04-15 15:04 ` Marko Kovacevic
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).