* [PATCH] examples/fips_validation: disable iv_gen for decrypt tests
@ 2022-04-21 7:56 Gowrishankar Muthukrishnan
2022-05-19 6:08 ` [PATCH v2] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan
0 siblings, 1 reply; 3+ messages in thread
From: Gowrishankar Muthukrishnan @ 2022-04-21 7:56 UTC (permalink / raw)
To: dev
Cc: Fan Zhang, Brian Dooley, Brandon Lo, Anoob Joseph,
Archana Muniganti, Jerin Jacob, Gowrishankar Muthukrishnan
Disable iv_gen for decrypt tests.
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
---
examples/fips_validation/fips_validation_gcm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/fips_validation/fips_validation_gcm.c b/examples/fips_validation/fips_validation_gcm.c
index 5c72dbf790..6bd974e065 100644
--- a/examples/fips_validation/fips_validation_gcm.c
+++ b/examples/fips_validation/fips_validation_gcm.c
@@ -335,6 +335,7 @@ parse_test_gcm_init(void)
} else if (strcmp(direction_str, OP_DEC_JSON_STR) == 0) {
info.op = FIPS_TEST_DEC_AUTH_VERIF;
info.callbacks = gcm_dec_json_vectors;
+ info.interim_info.gcm_data.gen_iv = 0;
} else {
return -EINVAL;
}
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] examples/fips_validation: reset IV generation in every test group
2022-04-21 7:56 [PATCH] examples/fips_validation: disable iv_gen for decrypt tests Gowrishankar Muthukrishnan
@ 2022-05-19 6:08 ` Gowrishankar Muthukrishnan
0 siblings, 0 replies; 3+ messages in thread
From: Gowrishankar Muthukrishnan @ 2022-05-19 6:08 UTC (permalink / raw)
To: dev
Cc: Fan Zhang, Brian Dooley, lylavoie, Anoob Joseph,
Archana Muniganti, Jerin Jacob, Gowrishankar Muthukrishnan
Reset IV generation in every test group.
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
---
Depends-on: series-22738 ("Add JSON vector set support to fips validation")
---
examples/fips_validation/fips_validation_gcm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/fips_validation/fips_validation_gcm.c b/examples/fips_validation/fips_validation_gcm.c
index 3604b21f13..7e89f2a6b2 100644
--- a/examples/fips_validation/fips_validation_gcm.c
+++ b/examples/fips_validation/fips_validation_gcm.c
@@ -344,6 +344,7 @@ parse_test_gcm_json_init(void)
direction_obj = json_object_get(json_info.json_test_group, DIR_JSON_STR);
direction_str = json_string_value(direction_obj);
+ info.interim_info.gcm_data.gen_iv = 0;
if (strcmp(direction_str, OP_ENC_JSON_STR) == 0) {
json_t *ivGen_obj = json_object_get(json_info.json_test_group, IVGEN_JSON_STR);
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] examples/fips_validation: cleanup bypass tests in response file
@ 2022-04-21 7:55 Gowrishankar Muthukrishnan
2022-05-18 15:39 ` [PATCH v2] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan
0 siblings, 1 reply; 3+ messages in thread
From: Gowrishankar Muthukrishnan @ 2022-04-21 7:55 UTC (permalink / raw)
To: dev
Cc: Fan Zhang, Brian Dooley, Brandon Lo, Anoob Joseph,
Archana Muniganti, Jerin Jacob, Gowrishankar Muthukrishnan
Remove garbage entries for bypassed tests in response file.
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
---
examples/fips_validation/main.c | 74 ++++++++++++++++-----------------
1 file changed, 35 insertions(+), 39 deletions(-)
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 70a389c79b..03dad7eaf9 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -802,7 +802,7 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform)
RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
info.device_name, cipher_xform->key.length,
cipher_xform->iv.length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -850,7 +850,7 @@ prepare_tdes_xform(struct rte_crypto_sym_xform *xform)
RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
info.device_name, cipher_xform->key.length,
cipher_xform->iv.length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -887,7 +887,7 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
info.device_name, auth_xform->key.length,
auth_xform->digest_length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -933,7 +933,7 @@ prepare_gcm_xform(struct rte_crypto_sym_xform *xform)
aead_xform->digest_length,
aead_xform->aad_length,
aead_xform->iv.length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -978,7 +978,7 @@ prepare_gmac_xform(struct rte_crypto_sym_xform *xform)
info.device_name, auth_xform->key.length,
auth_xform->digest_length,
auth_xform->iv.length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -1016,7 +1016,7 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)
RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
info.device_name, auth_xform->key.length,
auth_xform->digest_length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -1062,7 +1062,7 @@ prepare_ccm_xform(struct rte_crypto_sym_xform *xform)
aead_xform->digest_length,
aead_xform->aad_length,
aead_xform->iv.length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -1097,7 +1097,7 @@ prepare_sha_xform(struct rte_crypto_sym_xform *xform)
RTE_LOG(ERR, USER1, "PMD %s key length %u digest length %u\n",
info.device_name, auth_xform->key.length,
auth_xform->digest_length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -1137,7 +1137,7 @@ prepare_xts_xform(struct rte_crypto_sym_xform *xform)
RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
info.device_name, cipher_xform->key.length,
cipher_xform->iv.length);
- return -EPERM;
+ return -ENOTSUP;
}
return 0;
@@ -1252,7 +1252,7 @@ fips_generic_test(void)
ret = fips_run_test();
if (ret < 0) {
- if (ret == -EPERM || ret == -ENOTSUP) {
+ if (ret == -ENOTSUP) {
fprintf(info.fp_wr, "Bypass\n\n");
return 0;
}
@@ -1287,7 +1287,7 @@ fips_generic_test(void)
fprintf(info.fp_wr, "\n");
free(val.val);
- return 0;
+ return 1;
}
static int
@@ -1456,7 +1456,7 @@ fips_mct_tdes_test(void)
free(val.val);
- return 0;
+ return 1;
}
static int
@@ -1535,7 +1535,7 @@ fips_mct_aes_ecb_test(void)
free(val.val);
- return 0;
+ return 1;
}
static int
fips_mct_aes_test(void)
@@ -1643,7 +1643,7 @@ fips_mct_aes_test(void)
free(val.val);
- return 0;
+ return 1;
}
static int
@@ -1729,7 +1729,7 @@ fips_mct_sha_test(void)
free(val.val);
- return 0;
+ return 1;
}
@@ -1844,18 +1844,15 @@ fips_test_one_file(void)
}
ret = fips_test_parse_one_case();
- switch (ret) {
- case 0:
- ret = test_ops.test();
- if (ret == 0)
- break;
- RTE_LOG(ERR, USER1, "Error %i: test block\n",
+ if (ret < 0) {
+ RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
ret);
goto error_one_case;
- case 1:
- break;
- default:
- RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
+ }
+
+ ret = test_ops.test();
+ if (ret < 0) {
+ RTE_LOG(ERR, USER1, "Error %i: test block\n",
ret);
goto error_one_case;
}
@@ -1905,22 +1902,21 @@ fips_test_one_test_case(void)
int ret;
ret = fips_test_parse_one_json_case();
+ if (ret < 0) {
+ RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
+ ret);
+ goto exit;
+ }
- switch (ret) {
- case 0:
- ret = test_ops.test();
- if (ret == 0)
- break;
+ ret = test_ops.test();
+ if (ret < 0) {
RTE_LOG(ERR, USER1, "Error %i: test block\n",
ret);
- break;
- case 1:
- break;
- default:
- RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
- ret);
+ goto exit;
}
- return 0;
+
+exit:
+ return ret;
}
static int
@@ -1958,8 +1954,8 @@ fips_test_one_test_group(void)
tests_size = json_array_size(tests);
for (test_idx = 0; test_idx < tests_size; test_idx++) {
json_info.json_test_case = json_array_get(tests, test_idx);
- fips_test_one_test_case();
- json_array_append_new(write_tests, json_info.json_write_case);
+ if (fips_test_one_test_case() > 0)
+ json_array_append_new(write_tests, json_info.json_write_case);
}
return 0;
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] examples/fips_validation: reset IV generation in every test group
2022-04-21 7:55 [PATCH] examples/fips_validation: cleanup bypass tests in response file Gowrishankar Muthukrishnan
@ 2022-05-18 15:39 ` Gowrishankar Muthukrishnan
0 siblings, 0 replies; 3+ messages in thread
From: Gowrishankar Muthukrishnan @ 2022-05-18 15:39 UTC (permalink / raw)
To: dev
Cc: Fan Zhang, Brian Dooley, Brandon Lo, Anoob Joseph,
Archana Muniganti, Jerin Jacob, Gowrishankar Muthukrishnan
Reset IV generation in every test group.
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
---
v2:
- rebase on latest main.
---
examples/fips_validation/fips_validation_gcm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/fips_validation/fips_validation_gcm.c b/examples/fips_validation/fips_validation_gcm.c
index 3604b21f13..7e89f2a6b2 100644
--- a/examples/fips_validation/fips_validation_gcm.c
+++ b/examples/fips_validation/fips_validation_gcm.c
@@ -344,6 +344,7 @@ parse_test_gcm_json_init(void)
direction_obj = json_object_get(json_info.json_test_group, DIR_JSON_STR);
direction_str = json_string_value(direction_obj);
+ info.interim_info.gcm_data.gen_iv = 0;
if (strcmp(direction_str, OP_ENC_JSON_STR) == 0) {
json_t *ivGen_obj = json_object_get(json_info.json_test_group, IVGEN_JSON_STR);
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-19 6:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-21 7:56 [PATCH] examples/fips_validation: disable iv_gen for decrypt tests Gowrishankar Muthukrishnan
2022-05-19 6:08 ` [PATCH v2] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan
-- strict thread matches above, loose matches on Subject: below --
2022-04-21 7:55 [PATCH] examples/fips_validation: cleanup bypass tests in response file Gowrishankar Muthukrishnan
2022-05-18 15:39 ` [PATCH v2] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan
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).