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 2/8] examples/fips_validation: add json info to header Date: Fri, 29 Apr 2022 12:15:53 -0400 Message-ID: <20220429161559.415645-3-blo@iol.unh.edu> (raw) In-Reply-To: <20220429161559.415645-1-blo@iol.unh.edu> Added json-specific functions and other information needed to test the new FIPS test vectors. Signed-off-by: Brandon Lo <blo@iol.unh.edu> --- v2: * fix type of prefix to suffix examples/fips_validation/fips_validation.h | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h index aaadf01ba8..e2789df93a 100644 --- a/examples/fips_validation/fips_validation.h +++ b/examples/fips_validation/fips_validation.h @@ -5,6 +5,10 @@ #ifndef _FIPS_VALIDATION_H_ #define _FIPS_VALIDATION_H_ +#ifdef RTE_HAS_JANSSON +#include <jansson.h> +#endif /* RTE_HAS_JANSSON */ + #define FIPS_PARSE_ERR(fmt, args) \ RTE_LOG(ERR, USER1, "FIPS parse error" ## fmt ## "\n", ## args) @@ -24,6 +28,9 @@ #define REQ_FILE_PERFIX "req" #define RSP_FILE_PERFIX "rsp" #define FAX_FILE_PERFIX "fax" +#define JSON_FILE_PERFIX "json" + +#define ACVVERSION "1.0" enum fips_test_algorithms { FIPS_TEST_ALGO_AES = 0, @@ -40,7 +47,8 @@ enum fips_test_algorithms { enum file_types { FIPS_TYPE_REQ = 1, FIPS_TYPE_FAX, - FIPS_TYPE_RSP + FIPS_TYPE_RSP, + FIPS_TYPE_JSON, }; enum fips_test_op { @@ -161,6 +169,23 @@ struct gcm_interim_data { uint8_t gen_iv; }; +#ifdef RTE_HAS_JANSSON +struct fips_test_json_info { + /* Information used for reading from json */ + json_t *json_root; + json_t *json_vector_set; + json_t *json_test_group; + json_t *json_test_case; + /* Location of json write output */ + json_t *json_write_root; + json_t *json_write_group; + json_t *json_write_set; + json_t *json_write_case; + /* Other info */ + uint8_t is_sample; +}; +#endif /* RTE_HAS_JANSSON */ + struct fips_test_interim_info { FILE *fp_rd; FILE *fp_wr; @@ -196,6 +221,10 @@ struct fips_test_interim_info { extern struct fips_test_vector vec; extern struct fips_test_interim_info info; +#ifdef RTE_HAS_JANSSON +extern struct fips_test_json_info json_info; +#endif /* RTE_HAS_JANSSON */ + int fips_test_init(const char *req_file_path, const char *rsp_file_path, const char *device_name); @@ -212,6 +241,17 @@ fips_test_parse_one_case(void); void fips_test_write_one_case(void); +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set(void); + +int +fips_test_parse_one_json_group(void); + +int +fips_test_parse_one_json_case(void); +#endif /* RTE_HAS_JANSSON */ + int parse_test_aes_init(void); -- 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 ` Brandon Lo [this message] 2022-05-18 15:44 ` [EXT] [PATCH v4 2/8] examples/fips_validation: add json info to header 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 ` [PATCH v4 4/8] examples/fips_validation: allow json file as input Brandon Lo 2022-05-18 15:45 ` [EXT] " 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-3-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