From: Brandon Lo <blo@iol.unh.edu> To: roy.fan.zhang@intel.com, ciara.power@intel.com Cc: dev@dpdk.org, Brandon Lo <blo@iol.unh.edu> Subject: [PATCH v4 4/8] examples/fips_validation: allow json file as input Date: Fri, 29 Apr 2022 12:15:55 -0400 Message-ID: <20220429161559.415645-5-blo@iol.unh.edu> (raw) In-Reply-To: <20220429161559.415645-1-blo@iol.unh.edu> Added the ability to use the json format as the input and output of the example application. Signed-off-by: Brandon Lo <blo@iol.unh.edu> --- v3: * fix checkpatch warnings v2: * remove use_json variable examples/fips_validation/main.c | 200 +++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 4 deletions(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index e06ae37567..65f736f3cb 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -34,11 +34,17 @@ enum { OPT_CRYPTODEV_BK_ID_NUM, #define OPT_CRYPTODEV_BK_DIR_KEY "broken-test-dir" OPT_CRYPTODEV_BK_DIR_KEY_NUM, +#define OPT_USE_JSON "use-json" + OPT_USE_JSON_NUM, }; struct fips_test_vector vec; struct fips_test_interim_info info; +#ifdef RTE_HAS_JANSSON +struct fips_test_json_info json_info; +#endif /* RTE_HAS_JANSSON */ + struct cryptodev_fips_validate_env { const char *req_path; const char *rsp_path; @@ -166,6 +172,11 @@ cryptodev_fips_validate_app_uninit(void) static int fips_test_one_file(void); +#ifdef RTE_HAS_JANSSON +static int +fips_test_one_json_file(void); +#endif /* RTE_HAS_JANSSON */ + static int parse_cryptodev_arg(char *arg) { @@ -389,6 +400,7 @@ int main(int argc, char *argv[]) { int ret; + char use_json; ret = rte_eal_init(argc, argv); if (ret < 0) { @@ -424,9 +436,17 @@ main(int argc, char *argv[]) ret, env.req_path); goto exit; } - - + use_json = info.file_type == FIPS_TYPE_JSON; + +#ifdef RTE_HAS_JANSSON + ret = info.file_type == FIPS_TYPE_JSON ? + fips_test_one_json_file() : fips_test_one_file(); + if (use_json) + json_decref(json_info.json_root); +#else /* RTE_HAS_JANSSON */ ret = fips_test_one_file(); +#endif /* RTE_HAS_JANSSON */ + if (ret < 0) { RTE_LOG(ERR, USER1, "Error %i: Failed test %s\n", ret, env.req_path); @@ -480,8 +500,19 @@ main(int argc, char *argv[]) ret, req_path); break; } + use_json = info.file_type == FIPS_TYPE_JSON; +#ifdef RTE_HAS_JANSSON + if (use_json) { + ret = fips_test_one_json_file(); + json_decref(json_info.json_root); + } else { + ret = fips_test_one_file(); + } +#else /* RTE_HAS_JANSSON */ ret = fips_test_one_file(); +#endif /* RTE_HAS_JANSSON */ + if (ret < 0) { RTE_LOG(ERR, USER1, "Error %i: Failed test %s\n", ret, req_path); @@ -1219,7 +1250,8 @@ fips_generic_test(void) struct fips_val val = {NULL, 0}; int ret; - fips_test_write_one_case(); + if (info.file_type != FIPS_TYPE_JSON) + fips_test_write_one_case(); ret = fips_run_test(); if (ret < 0) { @@ -1238,6 +1270,7 @@ fips_generic_test(void) switch (info.file_type) { case FIPS_TYPE_REQ: case FIPS_TYPE_RSP: + case FIPS_TYPE_JSON: if (info.parse_writeback == NULL) return -EPERM; ret = info.parse_writeback(&val); @@ -1253,7 +1286,8 @@ fips_generic_test(void) break; } - fprintf(info.fp_wr, "\n"); + if (info.file_type != FIPS_TYPE_JSON) + fprintf(info.fp_wr, "\n"); free(val.val); return 0; @@ -1844,3 +1878,161 @@ fips_test_one_file(void) return ret; } + +#ifdef RTE_HAS_JANSSON +static int +fips_test_json_init_writeback(void) +{ + json_t *session_info, *session_write; + session_info = json_array_get(json_info.json_root, 0); + session_write = json_object(); + json_info.json_write_root = json_array(); + + json_object_set(session_write, "jwt", + json_object_get(session_info, "jwt")); + json_object_set(session_write, "url", + json_object_get(session_info, "url")); + json_object_set(session_write, "isSample", + json_object_get(session_info, "isSample")); + + json_info.is_sample = json_boolean_value( + json_object_get(session_info, "isSample")); + + json_array_append_new(json_info.json_write_root, session_write); + return 0; +} + +static int +fips_test_one_test_case(void) +{ + int ret; + + ret = fips_test_parse_one_json_case(); + + switch (ret) { + case 0: + ret = test_ops.test(); + if (ret == 0) + break; + 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); + } + return 0; +} + +static int +fips_test_one_test_group(void) +{ + int ret; + json_t *tests, *write_tests; + size_t test_idx, tests_size; + + write_tests = json_array(); + json_info.json_write_group = json_object(); + json_object_set(json_info.json_write_group, "tgId", + json_object_get(json_info.json_test_group, "tgId")); + json_object_set_new(json_info.json_write_group, "tests", write_tests); + + switch (info.algo) { + case FIPS_TEST_ALGO_AES_GCM: + ret = parse_test_gcm_init(); + break; + default: + return -EINVAL; + } + if (ret < 0) + return ret; + + ret = fips_test_parse_one_json_group(); + if (ret < 0) + return ret; + + ret = init_test_ops(); + if (ret < 0) + return ret; + + tests = json_object_get(json_info.json_test_group, "tests"); + 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); + } + + return 0; +} + +static int +fips_test_one_vector_set(void) +{ + int ret; + json_t *test_groups, *write_groups, *write_version, *write_set; + size_t group_idx, num_groups; + + test_groups = json_object_get(json_info.json_vector_set, "testGroups"); + num_groups = json_array_size(test_groups); + + json_info.json_write_set = json_array(); + write_version = json_object(); + json_object_set_new(write_version, "acvVersion", json_string(ACVVERSION)); + json_array_append_new(json_info.json_write_set, write_version); + + write_set = json_object(); + json_array_append_new(json_info.json_write_set, write_set); + write_groups = json_array(); + + json_object_set(write_set, "vsId", + json_object_get(json_info.json_vector_set, "vsId")); + json_object_set(write_set, "algorithm", + json_object_get(json_info.json_vector_set, "algorithm")); + json_object_set(write_set, "revision", + json_object_get(json_info.json_vector_set, "revision")); + json_object_set_new(write_set, "isSample", + json_boolean(json_info.is_sample)); + json_object_set_new(write_set, "testGroups", write_groups); + + ret = fips_test_parse_one_json_vector_set(); + if (ret < 0) { + RTE_LOG(ERR, USER1, "Error: Unsupported or invalid vector set algorithm: %s\n", + json_string_value(json_object_get(json_info.json_vector_set, "algorithm"))); + return ret; + } + + for (group_idx = 0; group_idx < num_groups; group_idx++) { + json_info.json_test_group = json_array_get(test_groups, group_idx); + ret = fips_test_one_test_group(); + json_array_append_new(write_groups, json_info.json_write_group); + } + + return 0; +} + +static int +fips_test_one_json_file(void) +{ + size_t vector_set_idx, root_size; + + root_size = json_array_size(json_info.json_root); + fips_test_json_init_writeback(); + + for (vector_set_idx = 1; vector_set_idx < root_size; vector_set_idx++) { + /* Vector set index starts at 1, the 0th index contains test session + * information. + */ + json_info.json_vector_set = json_array_get(json_info.json_root, vector_set_idx); + fips_test_one_vector_set(); + json_array_append_new(json_info.json_write_root, json_info.json_write_set); + } + + json_dumpf(json_info.json_write_root, info.fp_wr, JSON_INDENT(4)); + json_decref(json_info.json_write_root); + + return 0; +} +#endif /* RTE_HAS_JANSSON */ -- 2.25.1
next prev parent reply other threads:[~2022-04-29 16:16 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-27 14:51 [PATCH 0/5] Add JSON vector set support to fips validation Brandon Lo 2022-01-27 14:51 ` [PATCH 1/5] examples/fips_validation: add jansson dependency Brandon Lo 2022-01-27 14:51 ` [PATCH 2/5] examples/fips_validation: add json info to header Brandon Lo 2022-01-27 14:51 ` [PATCH 3/5] examples/fips_validation: add json parsing Brandon Lo 2022-01-27 14:51 ` [PATCH 4/5] examples/fips_validation: allow json file as input Brandon Lo 2022-01-27 14:51 ` [PATCH 5/5] examples/fips_validation: add json to gcm test Brandon Lo 2022-01-29 17:03 ` [PATCH v2 0/5] Add JSON vector set support to fips validation Brandon Lo 2022-01-29 17:03 ` [PATCH v2 1/5] examples/fips_validation: add jansson dependency Brandon Lo 2022-01-29 17:03 ` [PATCH v2 2/5] examples/fips_validation: add json info to header Brandon Lo 2022-01-29 17:03 ` [PATCH v2 3/5] examples/fips_validation: add json parsing Brandon Lo 2022-01-29 17:03 ` [PATCH v2 4/5] examples/fips_validation: allow json file as input Brandon Lo 2022-01-29 17:03 ` [PATCH v2 5/5] examples/fips_validation: add json to gcm test Brandon Lo 2022-01-29 17:55 ` [PATCH v3 0/5] Add JSON vector set support to fips validation Brandon Lo 2022-01-29 17:55 ` [PATCH v3 1/5] examples/fips_validation: add jansson dependency Brandon Lo 2022-01-29 17:55 ` [PATCH v3 2/5] examples/fips_validation: add json info to header Brandon Lo 2022-01-29 17:55 ` [PATCH v3 3/5] examples/fips_validation: add json parsing Brandon Lo 2022-01-29 17:55 ` [PATCH v3 4/5] examples/fips_validation: allow json file as input Brandon Lo 2022-01-29 17:55 ` [PATCH v3 5/5] examples/fips_validation: add json to gcm test Brandon Lo 2022-02-02 15:15 ` [PATCH v3 0/5] Add JSON vector set support to fips validation Brandon Lo [not found] ` <MN2PR11MB382152E7C1DAFD68066264DEE62F9@MN2PR11MB3821.namprd11.prod.outlook.com> [not found] ` <CAOeXdvZFkEUn-e2Reo3xg519qWpGq-UbYFhJqVeEMcXVxK7+YQ@mail.gmail.com> [not found] ` <CAOeXdvZ4nBudX+bMdRASaLp=c955vUHi1Z-geUC6gFvE__2ozg@mail.gmail.com> [not found] ` <CAOeXdvZbwW2tP-vyELRJza_imjjRm-JNYu+c4=-y2VtigqNg5A@mail.gmail.com> 2022-04-14 13:41 ` Brandon Lo 2022-04-21 8:02 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-26 14:30 ` Brandon Lo 2022-02-08 21:48 ` [EXT] " Akhil Goyal 2022-04-29 16:15 ` [PATCH v4 0/8] " Brandon Lo 2022-04-29 16:15 ` [PATCH v4 1/8] examples/fips_validation: add jansson dependency Brandon Lo 2022-05-18 15:44 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-29 16:15 ` [PATCH v4 2/8] examples/fips_validation: add json info to header Brandon Lo 2022-05-18 15:44 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-29 16:15 ` [PATCH v4 3/8] examples/fips_validation: add json parsing Brandon Lo 2022-05-18 15:45 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-29 16:15 ` Brandon Lo [this message] 2022-05-18 15:45 ` [EXT] [PATCH v4 4/8] examples/fips_validation: allow json file as input Gowrishankar Muthukrishnan 2022-05-19 5:30 ` Gowrishankar Muthukrishnan 2022-05-19 9:12 ` Gowrishankar Muthukrishnan 2022-04-29 16:15 ` [PATCH v4 5/8] examples/fips_validation: add json to gcm test Brandon Lo 2022-05-18 15:45 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-29 16:15 ` [PATCH v4 6/8] examples/fips_validation: add json to hmac Brandon Lo 2022-05-18 15:45 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-29 16:15 ` [PATCH v4 7/8] examples/fips_validation: implement json cmac test Brandon Lo 2022-05-18 15:46 ` [EXT] " Gowrishankar Muthukrishnan 2022-04-29 16:15 ` [PATCH v4 8/8] examples/fips_validation: add parsing for cmac Brandon Lo 2022-05-18 15:46 ` [EXT] " Gowrishankar Muthukrishnan 2022-05-19 5:31 ` Gowrishankar Muthukrishnan 2022-05-19 9:11 ` Gowrishankar Muthukrishnan 2022-04-29 16:19 ` [PATCH v4 0/8] Add JSON vector set support to fips validation Brandon Lo 2022-05-25 15:45 ` [v5, 00/11] " Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 01/11] examples/fips_validation: add jansson dependency Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 02/11] examples/fips_validation: add json info to header Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 03/11] examples/fips_validation: add json parsing Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 04/11] examples/fips_validation: allow json file as input Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 05/11] examples/fips_validation: add json to gcm test Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 06/11] examples/fips_validation: add json to hmac Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 07/11] examples/fips_validation: implement json cmac test Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 08/11] examples/fips_validation: add parsing for cmac Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 09/11] examples/fips_validation: cleanup bypass tests in response file Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 10/11] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan 2022-05-25 15:45 ` [v5, 11/11] examples/fips_validation: add parsing for aes_cbc Gowrishankar Muthukrishnan 2022-05-25 17:08 ` [v5,11/11] " Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 00/11] Add JSON vector set support to fips validation Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 01/11] examples/fips_validation: add jansson dependency Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 02/11] examples/fips_validation: add json info to header Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 03/11] examples/fips_validation: add json parsing Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 04/11] examples/fips_validation: allow json file as input Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 05/11] examples/fips_validation: add json to gcm test Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 06/11] examples/fips_validation: add json to hmac Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 07/11] examples/fips_validation: implement json cmac test Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 08/11] examples/fips_validation: add parsing for cmac Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 09/11] examples/fips_validation: cleanup bypass tests in response file Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 10/11] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan 2022-05-25 17:13 ` [v6, 11/11] examples/fips_validation: add parsing for aes_cbc Gowrishankar Muthukrishnan 2022-05-26 6:46 ` [EXT] [v6, 00/11] Add JSON vector set support to fips validation Akhil Goyal 2022-05-26 8:02 ` [v7, " Gowrishankar Muthukrishnan 2022-05-26 8:02 ` [v7, 01/11] examples/fips_validation: add jansson dependency Gowrishankar Muthukrishnan 2022-05-26 9:46 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 02/11] examples/fips_validation: add json info to header Gowrishankar Muthukrishnan 2022-05-26 9:46 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 03/11] examples/fips_validation: add json parsing Gowrishankar Muthukrishnan 2022-05-26 9:47 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 04/11] examples/fips_validation: allow json file as input Gowrishankar Muthukrishnan 2022-05-26 9:48 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 05/11] examples/fips_validation: add json to gcm test Gowrishankar Muthukrishnan 2022-05-26 9:49 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 06/11] examples/fips_validation: add json to hmac Gowrishankar Muthukrishnan 2022-05-26 9:49 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 07/11] examples/fips_validation: implement json cmac test Gowrishankar Muthukrishnan 2022-05-26 9:49 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 08/11] examples/fips_validation: add parsing for cmac Gowrishankar Muthukrishnan 2022-05-26 9:50 ` Zhang, Roy Fan 2022-05-26 8:02 ` [v7, 09/11] examples/fips_validation: cleanup bypass tests in response file Gowrishankar Muthukrishnan 2022-05-26 8:02 ` [v7, 10/11] examples/fips_validation: reset IV generation in every test group Gowrishankar Muthukrishnan 2022-05-26 8:02 ` [v7, 11/11] examples/fips_validation: add parsing for aes_cbc Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 00/10] Add JSON vector set support to fips validation Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 01/10] examples/fips_validation: add jansson dependency Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 02/10] examples/fips_validation: add json info to header Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 03/10] examples/fips_validation: add json parsing Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 04/10] examples/fips_validation: allow json file as input Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 05/10] examples/fips_validation: add json to gcm test Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 06/10] examples/fips_validation: add json to hmac Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 07/10] examples/fips_validation: implement json cmac test Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 08/10] examples/fips_validation: add parsing for cmac Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 09/10] examples/fips_validation: add parsing for aes_cbc Gowrishankar Muthukrishnan 2022-05-30 12:23 ` [v8, 10/10] doc: add notes about acvp validation support Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 00/10] Add JSON vector set support to fips validation Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 01/10] examples/fips_validation: add jansson dependency Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 02/10] examples/fips_validation: add json info to header Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 03/10] examples/fips_validation: add json parsing Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 04/10] examples/fips_validation: allow json file as input Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 05/10] examples/fips_validation: add json to gcm test Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 06/10] examples/fips_validation: add json to hmac Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 07/10] examples/fips_validation: implement json cmac test Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 08/10] examples/fips_validation: add parsing for cmac Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 09/10] examples/fips_validation: add parsing for aes_cbc Gowrishankar Muthukrishnan 2022-05-30 15:52 ` [v9, 10/10] doc: add notes about acvp validation support Gowrishankar Muthukrishnan 2022-05-31 10:17 ` [v9, 00/10] Add JSON vector set support to fips validation Poczatek, Jakub 2022-05-31 12:36 ` Zhang, Roy Fan 2022-05-31 15:23 ` Akhil Goyal 2022-06-07 9:48 ` David Marchand 2022-06-13 11:58 ` David Marchand 2022-06-21 7:28 ` [EXT] " Gowrishankar Muthukrishnan 2022-06-21 7:36 ` David Marchand 2022-06-21 7:40 ` Akhil Goyal 2022-06-21 7:41 ` David Marchand
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=20220429161559.415645-5-blo@iol.unh.edu \ --to=blo@iol.unh.edu \ --cc=ciara.power@intel.com \ --cc=dev@dpdk.org \ --cc=roy.fan.zhang@intel.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
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git