Add JSON vector set support to fips validation
cover Add JSON vector set support to fips validation
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Brandon Lo (5):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test
examples/fips_validation/fips_validation.c | 84 ++++++++ examples/fips_validation/fips_validation.h | 42 +++- .../fips_validation/fips_validation_gcm.c | 149 ++++++++++++++ examples/fips_validation/main.c | 192 +++++++++++++++++- examples/fips_validation/meson.build | 4 + 5 files changed, 467 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 examples/fips_validation: add jansson dependency
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH 2/5 examples/fips_validation: add json info to header
In reply to Brandon LoAdded json-specific functions and other information needed to test the new FIPS test vectors.
--- examples/fips_validation/fips_validation.h | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
examples/fips_validation/fips_validation.h +41 -1
@@ -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 );
Signature · 1 line
2.25.1
PATCH 3/5 examples/fips_validation: add json parsing
In reply to Brandon LoAdded functions to parse the required information from a vector set given in the new json format.
--- examples/fips_validation/fips_validation.c | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+)
examples/fips_validation/fips_validation.c +84 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PERFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PERFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,8 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON )return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -429,6 +448,71 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +else return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (int i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { +json_t *param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); +json_int_t val =json_integer_value (param); +sprintf (json_value,"%lld" , val); +/* First argument is blank because the key +is not included in the string being parsed. */ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { +json_t *param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +const char *json_string =json_string_value (param); +strcpy (info.one_line_text, json_string); +/* First argument is blank because the key +is not included in the string being parsed. */ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
Signature · 1 line
2.25.1
PATCH 4/5 examples/fips_validation: allow json file as input
In reply to Brandon LoAdded the ability to use the json format as the input and output of the example application.
--- examples/fips_validation/main.c | 192 +++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +189 -3
@@ -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;
@@ -169,6 +175,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) {
@@ -392,6 +403,7 @@ int main(int argc, char *argv[]) { int ret; +char use_json; ret =rte_eal_init (argc, argv);if (ret <0 ) {
@@ -427,9 +439,16 @@ 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);
@@ -483,8 +502,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);
@@ -1226,7 +1256,7 @@ 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 ) {
@@ -1245,6 +1275,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);
@@ -1260,7 +1291,7 @@ 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 ;
@@ -1856,3 +1887,158 @@ 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 */
Signature · 1 line
2.25.1
PATCH 5/5 examples/fips_validation: add json to gcm test
In reply to Brandon LoAdds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
--- .../fips_validation/fips_validation_gcm.c | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+)
examples/fips_validation/fips_validation_gcm.c +149 -0
@@ -6,6 +6,10 @@#include <time.h> #include <stdio.h> +#ifdef RTE_HAS_JANSSON +#include <jansson.h> +#endif /* RTE_HAS_JANSSON */ +#include <rte_cryptodev.h> #include <rte_malloc.h>
@@ -37,6 +41,27 @@#define OP_ENC_EXT_STR "ExtIV"#define OP_ENC_INT_STR "IntIV" +#define KEYLEN_JSON_STR "keyLen" +#define IVLEN_JSON_STR "ivLen" +#define PAYLOADLEN_JSON_STR "payloadLen" +#define AADLEN_JSON_STR "aadLen" +#define TAGLEN_JSON_STR "tagLen" + +#define KEY_JSON_STR "key" +#define IV_JSON_STR "iv" +#define PT_JSON_STR "pt" +#define CT_JSON_STR "ct" +#define AAD_JSON_STR "aad" +#define TAG_JSON_STR "tag" +#define DIR_JSON_STR "direction" + +#define OP_ENC_JSON_STR "encrypt" +#define OP_DEC_JSON_STR "decrypt" + +#define IVGEN_JSON_STR "ivGen" +#define OP_ENC_EXT_JSON_STR "external" +#define OP_ENC_INT_JSON_STR "internal" +#define NEG_TEST_STR "FAIL"/**
@@ -136,6 +161,40 @@ struct fips_test_callback gcm_enc_vectors[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef RTE_HAS_JANSSON +struct fips_test_callback gcm_dec_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {CT_JSON_STR , parse_gcm_pt_ct_str, &vec.ct}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {TAG_JSON_STR , parse_uint8_known_len_hex_str, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; + +struct fips_test_callback gcm_interim_json_vectors[] = { + {KEYLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.key}, + {IVLEN_JSON_STR , parser_read_uint32_bit_val, &vec.iv}, + {PAYLOADLEN_JSON_STR , parser_read_gcm_pt_len, &vec.pt}, + {PAYLOADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.ct}, +/**< The NIST json test vectors use 'payloadLen' to denote input text +* length in case of decrypt & encrypt operations. +*/ + {AADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.aad}, + {TAGLEN_JSON_STR , parser_read_uint32_bit_val, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; + +struct fips_test_callback gcm_enc_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {PT_JSON_STR , parse_gcm_pt_ct_str, &vec.pt}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; +#endif /* RTE_HAS_JANSSON */ +static int parse_test_gcm_writeback (struct fips_val *val) {
@@ -188,12 +247,102 @@ parse_test_gcm_writeback(struct fips_val *val)return 0 ; } +#ifdef RTE_HAS_JANSSON +static int +parse_test_gcm_json_writeback (struct fips_val *val) +{ +struct fips_val tmp_val; +json_t *tcId, *tag; + + tcId =json_object_get (json_info.json_test_case,"tcId" ); + + json_info.json_write_case =json_object (); +json_object_set (json_info.json_write_case,"tcId" , tcId); + +if (info.op ==FIPS_TEST_ENC_AUTH_GEN ) { +json_t *ct; + + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + ct =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,CT_JSON_STR , ct); + +if (info.interim_info.gcm_data.gen_iv) { +json_t *iv; + tmp_val.val = vec.iv.val; + tmp_val.len = vec.iv.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + iv =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,IV_JSON_STR , iv); + +rte_free (vec.iv.val); + vec.iv.val =NULL ; + } + + tmp_val.val = val->val + vec.pt.len; + tmp_val.len = val->len - vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + tag =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,TAG_JSON_STR , tag); + }else { +if (vec.status ==RTE_CRYPTO_OP_STATUS_SUCCESS ) { +if (!info.interim_info.gcm_data.is_gmac) { + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); +json_object_set_new (json_info.json_write_case,PT_JSON_STR , +json_string (info.one_line_text)); + } + }else { +json_object_set_new (json_info.json_write_case,"testPassed" ,json_false ()); + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +int parse_test_gcm_init (void ) {char *tmp;uint32_t i; +#ifdef RTE_HAS_JANSSON +if (json_info.json_test_group) { +json_t *direction_obj; +const char *direction_str; + + direction_obj =json_object_get (json_info.json_test_group,DIR_JSON_STR ); + direction_str =json_string_value (direction_obj); + +if (strcmp (direction_str,OP_ENC_JSON_STR ) ==0 ) { +json_t *ivGen_obj =json_object_get (json_info.json_test_group,IVGEN_JSON_STR ); +const char *ivGen_str =json_string_value (ivGen_obj); + + info.op =FIPS_TEST_ENC_AUTH_GEN ; + info.callbacks = gcm_enc_json_vectors; + +if (strcmp (ivGen_str,OP_ENC_INT_JSON_STR ) ==0 ) { + info.interim_info.gcm_data.gen_iv =1 ; + } + }else if (strcmp (direction_str,OP_DEC_JSON_STR ) ==0 ) { + info.op =FIPS_TEST_DEC_AUTH_VERIF ; + info.callbacks = gcm_dec_json_vectors; + }else { +return -EINVAL ; + } + info.interim_callbacks = gcm_interim_json_vectors; + info.parse_writeback = parse_test_gcm_json_writeback; + +return 0 ; + } +#endif /* RTE_HAS_JANSSON */ for (i =0 ; i < info.nb_vec_lines; i++) {char *line = info.vec[i];
Signature · 1 line
2.25.1
v2 cover Add JSON vector set support to fips validation
In reply to Brandon LoAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Brandon Lo (5):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test
examples/fips_validation/fips_validation.c | 90 ++++++++- examples/fips_validation/fips_validation.h | 48 ++++- .../fips_validation/fips_validation_gcm.c | 149 ++++++++++++++ examples/fips_validation/main.c | 190 +++++++++++++++++- examples/fips_validation/meson.build | 4 + 5 files changed, 471 insertions(+), 10 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/5 examples/fips_validation: add jansson dependency
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH v2 2/5 examples/fips_validation: add json info to header
In reply to Brandon LoAdded json-specific functions and other information needed to test the new FIPS test vectors.
---
v2:
* fix type of prefix to suffix
examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-)
examples/fips_validation/fips_validation.h +44 -4
@@ -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)
@@ -21,9 +25,12 @@#define POSITIVE_TEST 0#define NEGATIVE_TEST -1 -#define REQ_FILE_PERFIX "req" -#define RSP_FILE_PERFIX "rsp" -#define FAX_FILE_PERFIX "fax" +#define REQ_FILE_SUFFIX "req" +#define RSP_FILE_SUFFIX "rsp" +#define FAX_FILE_SUFFIX "fax" +#define JSON_FILE_SUFFIX "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 );
Signature · 1 line
2.25.1
PATCH v2 3/5 examples/fips_validation: add json parsing
In reply to Brandon LoAdded functions to parse the required information from a vector set given in the new json format.
---
v2:
* fix for loop initialization
examples/fips_validation/fips_validation.c | 90 +++++++++++++++++++++- 1 file changed, 87 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +87 -3
@@ -270,12 +270,14 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_SUFFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_SUFFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_SUFFIX )) info.file_type =FIPS_TYPE_FAX ; +else if (strstr (path,JSON_FILE_SUFFIX )) + info.file_type =FIPS_TYPE_JSON ;else return -EINVAL ;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,8 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON )return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -429,6 +448,71 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +else return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { +json_t *param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); +json_int_t val =json_integer_value (param); +sprintf (json_value,"%lld" , val); +/* First argument is blank because the key +is not included in the string being parsed. */ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { +json_t *param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +const char *json_string =json_string_value (param); +strcpy (info.one_line_text, json_string); +/* First argument is blank because the key +is not included in the string being parsed. */ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
Signature · 1 line
2.25.1
PATCH v2 4/5 examples/fips_validation: allow json file as input
In reply to Brandon LoAdded the ability to use the json format as the input and output of the example application.
---
v2:
* remove use_json variable
examples/fips_validation/main.c | 190 +++++++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +187 -3
@@ -39,6 +39,10 @@ enum {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;
@@ -169,6 +173,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) {
@@ -428,8 +437,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -484,7 +502,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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);
@@ -1226,7 +1254,7 @@ 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 ) {
@@ -1245,6 +1273,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);
@@ -1260,7 +1289,7 @@ 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 ;
@@ -1856,3 +1885,158 @@ 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 */
Signature · 1 line
2.25.1
PATCH v2 5/5 examples/fips_validation: add json to gcm test
In reply to Brandon LoAdds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
--- .../fips_validation/fips_validation_gcm.c | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+)
examples/fips_validation/fips_validation_gcm.c +149 -0
@@ -6,6 +6,10 @@#include <time.h> #include <stdio.h> +#ifdef RTE_HAS_JANSSON +#include <jansson.h> +#endif /* RTE_HAS_JANSSON */ +#include <rte_cryptodev.h> #include <rte_malloc.h>
@@ -37,6 +41,27 @@#define OP_ENC_EXT_STR "ExtIV"#define OP_ENC_INT_STR "IntIV" +#define KEYLEN_JSON_STR "keyLen" +#define IVLEN_JSON_STR "ivLen" +#define PAYLOADLEN_JSON_STR "payloadLen" +#define AADLEN_JSON_STR "aadLen" +#define TAGLEN_JSON_STR "tagLen" + +#define KEY_JSON_STR "key" +#define IV_JSON_STR "iv" +#define PT_JSON_STR "pt" +#define CT_JSON_STR "ct" +#define AAD_JSON_STR "aad" +#define TAG_JSON_STR "tag" +#define DIR_JSON_STR "direction" + +#define OP_ENC_JSON_STR "encrypt" +#define OP_DEC_JSON_STR "decrypt" + +#define IVGEN_JSON_STR "ivGen" +#define OP_ENC_EXT_JSON_STR "external" +#define OP_ENC_INT_JSON_STR "internal" +#define NEG_TEST_STR "FAIL"/**
@@ -136,6 +161,40 @@ struct fips_test_callback gcm_enc_vectors[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef RTE_HAS_JANSSON +struct fips_test_callback gcm_dec_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {CT_JSON_STR , parse_gcm_pt_ct_str, &vec.ct}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {TAG_JSON_STR , parse_uint8_known_len_hex_str, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; + +struct fips_test_callback gcm_interim_json_vectors[] = { + {KEYLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.key}, + {IVLEN_JSON_STR , parser_read_uint32_bit_val, &vec.iv}, + {PAYLOADLEN_JSON_STR , parser_read_gcm_pt_len, &vec.pt}, + {PAYLOADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.ct}, +/**< The NIST json test vectors use 'payloadLen' to denote input text +* length in case of decrypt & encrypt operations. +*/ + {AADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.aad}, + {TAGLEN_JSON_STR , parser_read_uint32_bit_val, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; + +struct fips_test_callback gcm_enc_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {PT_JSON_STR , parse_gcm_pt_ct_str, &vec.pt}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; +#endif /* RTE_HAS_JANSSON */ +static int parse_test_gcm_writeback (struct fips_val *val) {
@@ -188,12 +247,102 @@ parse_test_gcm_writeback(struct fips_val *val)return 0 ; } +#ifdef RTE_HAS_JANSSON +static int +parse_test_gcm_json_writeback (struct fips_val *val) +{ +struct fips_val tmp_val; +json_t *tcId, *tag; + + tcId =json_object_get (json_info.json_test_case,"tcId" ); + + json_info.json_write_case =json_object (); +json_object_set (json_info.json_write_case,"tcId" , tcId); + +if (info.op ==FIPS_TEST_ENC_AUTH_GEN ) { +json_t *ct; + + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + ct =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,CT_JSON_STR , ct); + +if (info.interim_info.gcm_data.gen_iv) { +json_t *iv; + tmp_val.val = vec.iv.val; + tmp_val.len = vec.iv.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + iv =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,IV_JSON_STR , iv); + +rte_free (vec.iv.val); + vec.iv.val =NULL ; + } + + tmp_val.val = val->val + vec.pt.len; + tmp_val.len = val->len - vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + tag =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,TAG_JSON_STR , tag); + }else { +if (vec.status ==RTE_CRYPTO_OP_STATUS_SUCCESS ) { +if (!info.interim_info.gcm_data.is_gmac) { + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); +json_object_set_new (json_info.json_write_case,PT_JSON_STR , +json_string (info.one_line_text)); + } + }else { +json_object_set_new (json_info.json_write_case,"testPassed" ,json_false ()); + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +int parse_test_gcm_init (void ) {char *tmp;uint32_t i; +#ifdef RTE_HAS_JANSSON +if (json_info.json_test_group) { +json_t *direction_obj; +const char *direction_str; + + direction_obj =json_object_get (json_info.json_test_group,DIR_JSON_STR ); + direction_str =json_string_value (direction_obj); + +if (strcmp (direction_str,OP_ENC_JSON_STR ) ==0 ) { +json_t *ivGen_obj =json_object_get (json_info.json_test_group,IVGEN_JSON_STR ); +const char *ivGen_str =json_string_value (ivGen_obj); + + info.op =FIPS_TEST_ENC_AUTH_GEN ; + info.callbacks = gcm_enc_json_vectors; + +if (strcmp (ivGen_str,OP_ENC_INT_JSON_STR ) ==0 ) { + info.interim_info.gcm_data.gen_iv =1 ; + } + }else if (strcmp (direction_str,OP_DEC_JSON_STR ) ==0 ) { + info.op =FIPS_TEST_DEC_AUTH_VERIF ; + info.callbacks = gcm_dec_json_vectors; + }else { +return -EINVAL ; + } + info.interim_callbacks = gcm_interim_json_vectors; + info.parse_writeback = parse_test_gcm_json_writeback; + +return 0 ; + } +#endif /* RTE_HAS_JANSSON */ for (i =0 ; i < info.nb_vec_lines; i++) {char *line = info.vec[i];
Signature · 1 line
2.25.1
v3 cover Add JSON vector set support to fips validation
In reply to Brandon LoAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Brandon Lo (5):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test
examples/fips_validation/fips_validation.c | 96 ++++++++- examples/fips_validation/fips_validation.h | 48 ++++- .../fips_validation/fips_validation_gcm.c | 150 ++++++++++++++ examples/fips_validation/main.c | 195 +++++++++++++++++- examples/fips_validation/meson.build | 4 + 5 files changed, 483 insertions(+), 10 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/5 examples/fips_validation: add jansson dependency
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH v3 2/5 examples/fips_validation: add json info to header
In reply to Brandon LoAdded json-specific functions and other information needed to test the new FIPS test vectors.
---
v2:
* fix type of prefix to suffix
examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-)
examples/fips_validation/fips_validation.h +44 -4
@@ -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)
@@ -21,9 +25,12 @@#define POSITIVE_TEST 0#define NEGATIVE_TEST -1 -#define REQ_FILE_PERFIX "req" -#define RSP_FILE_PERFIX "rsp" -#define FAX_FILE_PERFIX "fax" +#define REQ_FILE_SUFFIX "req" +#define RSP_FILE_SUFFIX "rsp" +#define FAX_FILE_SUFFIX "fax" +#define JSON_FILE_SUFFIX "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 );
Signature · 1 line
2.25.1
PATCH v3 3/5 examples/fips_validation: add json parsing
In reply to Brandon LoAdded functions to parse the required information from a vector set given in the new json format.
---
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
examples/fips_validation/fips_validation.c | 96 +++++++++++++++++++++- 1 file changed, 93 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +93 -3
@@ -270,12 +270,14 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_SUFFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_SUFFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_SUFFIX )) info.file_type =FIPS_TYPE_FAX ; +else if (strstr (path,JSON_FILE_SUFFIX )) + info.file_type =FIPS_TYPE_JSON ;else return -EINVAL ;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -429,6 +449,76 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { +json_t *param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); +json_int_t val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { +json_t *param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +const char *json_string =json_string_value (param); +strcpy (info.one_line_text, json_string); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
Signature · 1 line
2.25.1
PATCH v3 4/5 examples/fips_validation: allow json file as input
In reply to Brandon LoAdded the ability to use the json format as the input and output of the example application.
---
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
examples/fips_validation/main.c | 195 +++++++++++++++++++++++++++++++- 1 file changed, 192 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +192 -3
@@ -39,6 +39,10 @@ enum {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;
@@ -169,6 +173,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) {
@@ -428,8 +437,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -484,7 +502,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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);
@@ -1226,7 +1254,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 ) {
@@ -1245,6 +1274,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);
@@ -1260,7 +1290,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 ;
@@ -1856,3 +1887,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 */
Signature · 1 line
2.25.1
PATCH v3 5/5 examples/fips_validation: add json to gcm test
In reply to Brandon LoAdds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v3:
* fix checkpatch warnings
.../fips_validation/fips_validation_gcm.c | 150 ++++++++++++++++++ 1 file changed, 150 insertions(+)
examples/fips_validation/fips_validation_gcm.c +150 -0
@@ -6,6 +6,10 @@#include <time.h> #include <stdio.h> +#ifdef RTE_HAS_JANSSON +#include <jansson.h> +#endif /* RTE_HAS_JANSSON */ +#include <rte_cryptodev.h> #include <rte_malloc.h>
@@ -37,6 +41,27 @@#define OP_ENC_EXT_STR "ExtIV"#define OP_ENC_INT_STR "IntIV" +#define KEYLEN_JSON_STR "keyLen" +#define IVLEN_JSON_STR "ivLen" +#define PAYLOADLEN_JSON_STR "payloadLen" +#define AADLEN_JSON_STR "aadLen" +#define TAGLEN_JSON_STR "tagLen" + +#define KEY_JSON_STR "key" +#define IV_JSON_STR "iv" +#define PT_JSON_STR "pt" +#define CT_JSON_STR "ct" +#define AAD_JSON_STR "aad" +#define TAG_JSON_STR "tag" +#define DIR_JSON_STR "direction" + +#define OP_ENC_JSON_STR "encrypt" +#define OP_DEC_JSON_STR "decrypt" + +#define IVGEN_JSON_STR "ivGen" +#define OP_ENC_EXT_JSON_STR "external" +#define OP_ENC_INT_JSON_STR "internal" +#define NEG_TEST_STR "FAIL"/**
@@ -136,6 +161,40 @@ struct fips_test_callback gcm_enc_vectors[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef RTE_HAS_JANSSON +struct fips_test_callback gcm_dec_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {CT_JSON_STR , parse_gcm_pt_ct_str, &vec.ct}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {TAG_JSON_STR , parse_uint8_known_len_hex_str, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; + +struct fips_test_callback gcm_interim_json_vectors[] = { + {KEYLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.key}, + {IVLEN_JSON_STR , parser_read_uint32_bit_val, &vec.iv}, + {PAYLOADLEN_JSON_STR , parser_read_gcm_pt_len, &vec.pt}, + {PAYLOADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.ct}, +/**< The NIST json test vectors use 'payloadLen' to denote input text +* length in case of decrypt & encrypt operations. +*/ + {AADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.aad}, + {TAGLEN_JSON_STR , parser_read_uint32_bit_val, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; + +struct fips_test_callback gcm_enc_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {PT_JSON_STR , parse_gcm_pt_ct_str, &vec.pt}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {NULL ,NULL ,NULL }/**< end pointer */ +}; +#endif /* RTE_HAS_JANSSON */ +static int parse_test_gcm_writeback (struct fips_val *val) {
@@ -188,12 +247,103 @@ parse_test_gcm_writeback(struct fips_val *val)return 0 ; } +#ifdef RTE_HAS_JANSSON +static int +parse_test_gcm_json_writeback (struct fips_val *val) +{ +struct fips_val tmp_val; +json_t *tcId, *tag; + + tcId =json_object_get (json_info.json_test_case,"tcId" ); + + json_info.json_write_case =json_object (); +json_object_set (json_info.json_write_case,"tcId" , tcId); + +if (info.op ==FIPS_TEST_ENC_AUTH_GEN ) { +json_t *ct; + + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + ct =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,CT_JSON_STR , ct); + +if (info.interim_info.gcm_data.gen_iv) { +json_t *iv; + tmp_val.val = vec.iv.val; + tmp_val.len = vec.iv.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + iv =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,IV_JSON_STR , iv); + +rte_free (vec.iv.val); + vec.iv.val =NULL ; + } + + tmp_val.val = val->val + vec.pt.len; + tmp_val.len = val->len - vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + tag =json_string (info.one_line_text); +json_object_set_new (json_info.json_write_case,TAG_JSON_STR , tag); + }else { +if (vec.status ==RTE_CRYPTO_OP_STATUS_SUCCESS ) { +if (!info.interim_info.gcm_data.is_gmac) { + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); +json_object_set_new (json_info.json_write_case,PT_JSON_STR , +json_string (info.one_line_text)); + } + }else { +json_object_set_new (json_info.json_write_case,"testPassed" ,json_false ()); + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +int parse_test_gcm_init (void ) {char *tmp;uint32_t i; +#ifdef RTE_HAS_JANSSON +if (json_info.json_test_group) { +json_t *direction_obj; +const char *direction_str; + + direction_obj =json_object_get (json_info.json_test_group,DIR_JSON_STR ); + direction_str =json_string_value (direction_obj); + +if (strcmp (direction_str,OP_ENC_JSON_STR ) ==0 ) { +json_t *ivGen_obj; +const char *ivGen_str; + + ivGen_obj =json_object_get (json_info.json_test_group,IVGEN_JSON_STR ); + ivGen_str =json_string_value (ivGen_obj); + info.op =FIPS_TEST_ENC_AUTH_GEN ; + info.callbacks = gcm_enc_json_vectors; + +if (strcmp (ivGen_str,OP_ENC_INT_JSON_STR ) ==0 ) + info.interim_info.gcm_data.gen_iv =1 ; + }else if (strcmp (direction_str,OP_DEC_JSON_STR ) ==0 ) { + info.op =FIPS_TEST_DEC_AUTH_VERIF ; + info.callbacks = gcm_dec_json_vectors; + }else { +return -EINVAL ; + } + info.interim_callbacks = gcm_interim_json_vectors; + info.parse_writeback = parse_test_gcm_json_writeback; + +return 0 ; + } +#endif /* RTE_HAS_JANSSON */ for (i =0 ; i < info.nb_vec_lines; i++) {char *line = info.vec[i];
Signature · 1 line
2.25.1
Hi Fan and Ciara,
Could you please review this patch set?
Not sure who the maintainer of the fips_validation example is (I think Marko Kovacevic stopped working on the FIPS validation example).
Thanks,
Brandon
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824
[email protected]
www.iol.unh.edu
A message that is not in the archive (sent off-list or not yet received): MN2PR11MB382152E7C1DAFD68066264DEE62F9@MN2PR11MB3821.namprd11.prod.outlook.com
A message that is not in the archive (sent off-list or not yet received): CAOeXdvZFkEUn-e2Reo3xg519qWpGq-UbYFhJqVeEMcXVxK7+YQ@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAOeXdvZ4nBudX+bMdRASaLp=c955vUHi1Z-geUC6gFvE__2ozg@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAOeXdvZbwW2tP-vyELRJza_imjjRm-JNYu+c4=-y2VtigqNg5A@mail.gmail.com
Adding the dev mailing list back into this discussion.
Quoted 55 lines · Brandon Lo
Hi guys,
Lincoln and I would like to know if we can get this patch set looked at and merged before submitting the rest of the algorithms. So far, I've worked on implementing the HMAC and CMAC tests, but I keep getting pulled away by some requests from the community. This patchset does not seem to break backward compatibility, so merging it will only lead to more coverage from the UNH lab. It may also be easier to review since it isn't going to be one huge patchset that needs to be looked at in the future.
Quoted 27 lines · Brandon Lo
Quoted 10 lines · Brandon Lo
I only have the AES-GCM algorithm implemented because the current implementations of the other algorithms require some extra information than what comes with the JSON format in the API.
For example, I couldn't find the JSON counterpart for things like fips_validation_sha.c's "MD =" or "Seed =" as well as fips_validation_ccm.c's extra test types like CCM-DVPT, CCM-VADT, etc. just to name a few.
This could very well be due to my inexperience with the FIPS validation, and I definitely plan to take another look at it again.Quoted 4 lines
My assumption is that the JSON version of FIPS validation files isn't used as much as the old CAVP format, so I am more aiming towards getting something working in the lab first and then expanding on it later.
Hi all,
Could I get someone to look at this patch set?
The UNH lab is ready to deploy FIPS testing on patches that affect the crypto portion of DPDK.Thanks,
BrandonQuoted 6 lines
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824
[email protected]
www.iol.unh.edu--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824
[email protected]
www.iol.unh.edu
Signature · 5 lines
Brandon Lo UNH InterOperability Laboratory 21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected] www.iol.unh.edu
Hi Brandon,
Following some cleanup patches I have posted against examples/fips, I would like to take enabling AES_CBC in fips validation. Please let me know if you/anyone have already have WIP for the same, before I proceed.
Thanks,
Gowrishankar
Quoted 95 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Thursday, April 14, 2022 7:12 PM
To: dev <[email protected]>; Zhang, Roy Fan <[email protected]>; Power, Ciara <[email protected]>
Subject: [EXT] Re: [PATCH v3 0/5] Add JSON vector set support to fips validationExternal Email
----------------------------------------------------------------------
Adding the dev mailing list back into this discussion.Quoted 12 lines · Brandon Lo
Hi guys,
Lincoln and I would like to know if we can get this patch set looked at and merged before submitting the rest of the algorithms. So far, I've worked on implementing the HMAC and CMAC tests, but I keep getting pulled away by some requests from the community. This patchset does not seem to break backward compatibility, so merging it will only lead to more coverage from the UNH lab. It may also be easier to review since it isn't going to be one huge patchset that needs to be looked at in the future.
Quoted 9 lines
Quoted 8 lines · Brandon Lo
Quoted 6 lines · Brandon Lo
I only have the AES-GCM algorithm implemented because the current implementations of the other algorithms require some extra information than what comes with the JSON format in the API. For example, I couldn't find the JSON counterpart for things like fips_validation_sha.c's "MD =" or "Seed =" as well as fips_validation_ccm.c's extra test types like CCM-DVPT, CCM-VADT,
etc.
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
just to name a few.
This could very well be due to my inexperience with the FIPS validation, and I definitely plan to take another look at it again.My assumption is that the JSON version of FIPS validation files isn't used as much as the old CAVP format, so I am more aiming towards getting something working in the lab first and then expanding on it later.
Hi all,
Could I get someone to look at this patch set?
The UNH lab is ready to deploy FIPS testing on patches that affect the crypto portion of DPDK.Thanks,
BrandonQuoted 5 lines
Quoted 5 lines
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-3A__www.iol.unh.edu&
Quoted 1 line
Quoted 1 line
d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=EAtr-
g7yUFhtOio8r2Rtm13Aqe4WVp_SQuoted 1 line
Quoted 1 line
_gHpcu6KFVo&m=35t4n1T3FnlAkNla3EmGLgWSAhIknbuvLgguNAXKjN0xCMs cV7HXyJ
Quoted 1 line
Quoted 1 line
95BftFMJJJ&s=GVCZy3E9sE9H23TSCEcLyQoT4zxNQ4pyameEW76PZno&e=
Quoted 8 lines
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-3A__www.iol.unh.edu&d=
Quoted 1 line
DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=EAtr-
g7yUFhtOio8r2Rtm13Aqe4WVp_S_gHpQuoted 1 line
cu6KFVo&m=35t4n1T3FnlAkNla3EmGLgWSAhIknbuvLgguNAXKjN0xCMscV7H XyJ95BftF
Quoted 1 line
MJJJ&s=GVCZy3E9sE9H23TSCEcLyQoT4zxNQ4pyameEW76PZno&e=
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-
3A__www.iol.unh.edu&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=EAtr- g7yUFhtOio8r2Rtm13Aqe4WVp_S_gHpcu6KFVo&m=35t4n1T3FnlAkNla3EmG LgWSAhIknbuvLgguNAXKjN0xCMscV7HXyJ95BftFMJJJ&s=GVCZy3E9sE9H23T SCEcLyQoT4zxNQ4pyameEW76PZno&e=
Hi Gowrishankar,
I apologize for the late response. I have not worked on the AES-CBC implementation, so you are free to go ahead.
Please let me know if you run into any issues that I can help with.
Thanks,
Brandon
Quoted 103 lines · Gowrishankar Muthukrishnan
Hi Brandon,
Following some cleanup patches I have posted against examples/fips, I would like to take enablingAES_CBCin fips validation. Please let me know if you/anyone have already have WIP for the same, before I proceed.Thanks,
GowrishankarQuoted 95 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Thursday, April 14, 2022 7:12 PM
To: dev <[email protected]>; Zhang, Roy Fan <[email protected]>; Power, Ciara <[email protected]>
Subject: [EXT] Re: [PATCH v3 0/5] Add JSON vector set support to fips validationExternal Email
----------------------------------------------------------------------
Adding the dev mailing list back into this discussion.Quoted 12 lines · Brandon Lo
Hi guys,
Lincoln and I would like to know if we can get this patch set looked at and merged before submitting the rest of the algorithms. So far, I've worked on implementing the HMAC and CMAC tests, but I keep getting pulled away by some requests from the community. This patchset does not seem to break backward compatibility, so merging it will only lead to more coverage from the UNH lab. It may also be easier to review since it isn't going to be one huge patchset that needs to be looked at in the future.
Quoted 9 lines
Quoted 8 lines · Brandon Lo
Quoted 6 lines · Brandon Lo
I only have the AES-GCM algorithm implemented because the current implementations of the other algorithms require some extra information than what comes with the JSON format in the API. For example, I couldn't find the JSON counterpart for things like fips_validation_sha.c's "MD =" or "Seed =" as well as fips_validation_ccm.c's extra test types like CCM-DVPT, CCM-VADT,
etc.
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
just to name a few.
This could very well be due to my inexperience with the FIPS validation, and I definitely plan to take another look at it again.My assumption is that the JSON version of FIPS validation files isn't used as much as the old CAVP format, so I am more aiming towards getting something working in the lab first and then expanding on it later.
Hi all,
Could I get someone to look at this patch set?
The UNH lab is ready to deploy FIPS testing on patches that affect the crypto portion of DPDK.Thanks,
BrandonQuoted 5 lines
Quoted 5 lines
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-3A__www.iol.unh.edu&
Quoted 1 line
Quoted 1 line
d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=EAtr-
g7yUFhtOio8r2Rtm13Aqe4WVp_SQuoted 1 line
Quoted 1 line
_gHpcu6KFVo&m=35t4n1T3FnlAkNla3EmGLgWSAhIknbuvLgguNAXKjN0xCMs cV7HXyJ
Quoted 1 line
Quoted 1 line
95BftFMJJJ&s=GVCZy3E9sE9H23TSCEcLyQoT4zxNQ4pyameEW76PZno&e=
Quoted 8 lines
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-3A__www.iol.unh.edu&d=
Quoted 1 line
DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=EAtr-
g7yUFhtOio8r2Rtm13Aqe4WVp_S_gHpQuoted 1 line
cu6KFVo&m=35t4n1T3FnlAkNla3EmGLgWSAhIknbuvLgguNAXKjN0xCMscV7H XyJ95BftF
Quoted 1 line
MJJJ&s=GVCZy3E9sE9H23TSCEcLyQoT4zxNQ4pyameEW76PZno&e=
--
Brandon Lo
UNH InterOperability Laboratory
21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-
3A__www.iol.unh.edu&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=EAtr- g7yUFhtOio8r2Rtm13Aqe4WVp_S_gHpcu6KFVo&m=35t4n1T3FnlAkNla3EmG LgWSAhIknbuvLgguNAXKjN0xCMscV7HXyJ95BftFMJJJ&s=GVCZy3E9sE9H23T SCEcLyQoT4zxNQ4pyameEW76PZno&e=
Signature · 5 lines
Brandon Lo UNH InterOperability Laboratory 21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected] www.iol.unh.edu
Hi Marko/Fan,
Please review this series.
Quoted 22 lines
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Brandon Lo (5):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm testexamples/fips_validation/fips_validation.c | 96 ++++++++- examples/fips_validation/fips_validation.h | 48 ++++- .../fips_validation/fips_validation_gcm.c | 150 ++++++++++++++ examples/fips_validation/main.c | 195 +++++++++++++++++- examples/fips_validation/meson.build | 4 + 5 files changed, 483 insertions(+), 10 deletions(-)--
2.25.1
v4 cover Add JSON vector set support to fips validation
In reply to Brandon LoAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
examples/fips_validation/fips_validation.c | 119 ++++++++++ examples/fips_validation/fips_validation.h | 57 ++++- .../fips_validation/fips_validation_cmac.c | 68 ++++++ .../fips_validation/fips_validation_gcm.c | 151 ++++++++++++- .../fips_validation/fips_validation_hmac.c | 93 ++++++++ examples/fips_validation/main.c | 207 +++++++++++++++++- examples/fips_validation/meson.build | 4 + 7 files changed, 693 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
PATCH v4 1/8 examples/fips_validation: add jansson dependency
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 1/8] examples/fips_validation: add jansson dependency
Verified the functionality changes and looks good to me.
Thanks.
Quoted 34 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 1/8] examples/fips_validation: add jansson dependencyExternal Email
----------------------------------------------------------------------
Added a check forRTE_HAS_JANSSONinto the meson configuration file for JSON support.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)examples/fips_validation/meson.build +4
-1@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif --2.25.1
PATCH v4 2/8 examples/fips_validation: add json info to header
In reply to Brandon LoAdded json-specific functions and other information needed to test the new FIPS test vectors.
---
v2:
* fix type of prefix to suffix
examples/fips_validation/fips_validation.h | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
examples/fips_validation/fips_validation.h +41 -1
@@ -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 );
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 2/8] examples/fips_validation: add json info to header
Verified the functionality changes and looks good to me.
Thanks.
Quoted 110 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 2/8] examples/fips_validation: add json info to headerExternal Email
----------------------------------------------------------------------
Added json-specific functions and other information needed to test the new FIPS test vectors.Signed-off-by Brandon Lo <[email protected]>---
v2:
* fix type of prefix to suffixexamples/fips_validation/fips_validation.h | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)examples/fips_validation/fips_validation.h +41
-2@@ -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 structfips_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); voidfips_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
PATCH v4 3/8 examples/fips_validation: add json parsing
In reply to Brandon LoAdded functions to parse the required information from a vector set given in the new json format.
---
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
examples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+)
examples/fips_validation/fips_validation.c +92 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PERFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PERFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +strcpy (info.one_line_text,json_string_value (param)); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 3/8] examples/fips_validation: add json parsing
Verified the functionality changes and looks good to me.
Thanks.
Quoted 157 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 3/8] examples/fips_validation: add json parsingExternal Email
----------------------------------------------------------------------
Added functions to parse the required information from a vector set given in the new json format.Signed-off-by Brandon Lo <[email protected]>---
v3:
* fix checkpatch warningsv2:
* fix for loop initializationexamples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+)examples/fips_validation/fips_validation.c +16
-0@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PERFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PERFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path, return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) {#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { + RTE_LOG(ERR, USER1, "Cannot parse json file %s (line %d, column %d)\n", + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) { RTE_LOG(ERR, USER1, "Cannot open file %s\n",
rsp_file_path); @@ -329,6 +346,9 @@ fips_test_init(const char*req_file_path, const char*rsp_file_path,examples/fips_validation/fips_validation.c +57
-0return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param = json_object_get(json_info.json_test_case,info.callbacks[i].key);
examples/fips_validation/fips_validation.c +2
-0+if (param) { + strcpy(info.one_line_text,
json_string_value(param));examples/fips_validation/fips_validation.c +16
-1+/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) + return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) { --2.25.1
PATCH v4 4/8 examples/fips_validation: allow json file as input
In reply to Brandon LoAdded the ability to use the json format as the input and output of the example application.
---
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
examples/fips_validation/main.c | 200 +++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 4 deletions(-)
examples/fips_validation/main.c +196 -4
@@ -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 */
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 4/8] examples/fips_validation: allow json file as input
Verified the functionality changes and looks good to me.
Thanks.
Quoted 316 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 4/8] examples/fips_validation: allow json file as inputExternal Email
----------------------------------------------------------------------
Added the ability to use the json format as the input and output of the example application.Signed-off-by Brandon Lo <[email protected]>---
v3:
* fix checkpatch warningsv2:
* removeuse_jsonvariableexamples/fips_validation/main.c | 200 +++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/examples/fips_validation/main.cindexe06ae37567..65f736f3cb100644examples/fips_validation/main.c +33
-2@@ -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",examples/fips_validation/main.c +26
-2ret, 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);examples/fips_validation/main.c +39
-0+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);examples/fips_validation/main.c +25
-0+ +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);
examples/fips_validation/main.c +13
-0+ } + +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");
examples/fips_validation/main.c +5
-0+ 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));examples/fips_validation/main.c +19
-0+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 vectorset algorithm: %s\n",
+
json_string_value(json_object_get(json_info.json_vector_set,
"algorithm")));examples/fips_validation/main.c +5
-0+return ret; + } + +for (group_idx =0 ; group_idx < num_groups; group_idx++) { + json_info.json_test_group = json_array_get(test_groups,
group_idx);examples/fips_validation/main.c +2
-0+ ret =fips_test_one_test_group (); + json_array_append_new(write_groups,json_info.json_write_group);
examples/fips_validation/main.c +14
-0+ } + +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++) {
examples/fips_validation/main.c +1
-0+/* Vector set index starts at 1, the 0th index contains test session
examples/fips_validation/main.c +3
-0+* information. +*/ + json_info.json_vector_set =
json_array_get(json_info.json_root, vector_set_idx);examples/fips_validation/main.c +2
-0+fips_test_one_vector_set (); + json_array_append_new(json_info.json_write_root,json_info.json_write_set);
examples/fips_validation/main.c +3
-0+ } + + json_dumpf(json_info.json_write_root, info.fp_wr,
JSON_INDENT(4));examples/fips_validation/main.c +5
-1+json_decref (json_info.json_write_root); + + return 0; +} +#endif /* RTE_HAS_JANSSON */ --2.25.1
RE: [EXT] [PATCH v4 4/8] examples/fips_validation: allow json file as input
In reply to Brandon LoPlease find comments inline from CI point of view.
Quoted 1 line
-----Original Message-----
....
....
Quoted 8 lines
main(int argc, char *argv[])
{examples/fips_validation/main.c +1
-0int ret; +char use_json; ret =rte_eal_init (argc, argv);if (ret <0 ) {
examples/fips_validation/main.c main(int argc, char *argv[]) · line 439
Quoted 6 lines
examples/fips_validation/main.c +1
-2@@ -424,9 +436,17 @@ main(int argc, char *argv[]) ret, env.req_path); goto exit; } - - + use_json = info.file_type ==FIPS_TYPE_JSON ;
use_json is not required apart from setting info.file_type. Some CI build fails for unused use_json (when !RTE_HAS_JANSSON). Can this be removed ?.
Thanks,
Gowrishankar
RE: [EXT] [PATCH v4 4/8] examples/fips_validation: allow json file as input
Quoted 34 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan
Sent: Thursday, May 19, 2022 11:00 AM
To: Brandon Lo <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: RE: [EXT] [PATCH v4 4/8] examples/fips_validation: allow json file as inputPlease find comments inline from CI point of view.
Quoted 1 line
-----Original Message-----
....
....Quoted 8 lines
main(int argc, char *argv[])
{examples/fips_validation/main.c +1
-0int ret; +char use_json; ret =rte_eal_init (argc, argv);if (ret <0 ) {examples/fips_validation/main.c main(int argc, char *argv[]) · line 439
Quoted 6 lines
examples/fips_validation/main.c +1
-2@@ -424,9 +436,17 @@ main(int argc, char *argv[]) ret, env.req_path); goto exit; } - - + use_json = info.file_type ==FIPS_TYPE_JSON ;
use_jsonis not required apart from setting info.file_type. Some CI build fails for unuseduse_json(when !RTE_HAS_JANSSON). Can this be removed ?.Thanks,
Gowrishankar
PATCH v4 5/8 examples/fips_validation: add json to gcm test
In reply to Brandon LoAdds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v3:
* fix checkpatch warnings
examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 151 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 155 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.h +3 -0
@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_gcm.c +150 -1
178 lines not on this page · raw message
examples/fips_validation/main.c +2 -1
@@ -1941,11 +1941,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret;
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 5/8] examples/fips_validation: add json to gcm test
Verified the functionality changes and looks good to me.
Thanks.
Quoted 257 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 5/8] examples/fips_validation: add json to gcm testExternal Email
----------------------------------------------------------------------
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.Signed-off-by Brandon Lo <[email protected]>---
v3:
* fix checkpatch warningsexamples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 151 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 155 insertions(+), 2 deletions(-)examples/fips_validation/fips_validation.h +3
-0@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int examples/fips_validation/fips_validation_gcm.c +41
-0@@ -6,6 +6,10 @@#include <time.h> #include <stdio.h> +#ifdef RTE_HAS_JANSSON +#include <jansson.h> +#endif /* RTE_HAS_JANSSON */ +#include <rte_cryptodev.h> #include <rte_malloc.h> @@ -37,6 +41,27 @@#define OP_ENC_EXT_STR "ExtIV"#define OP_ENC_INT_STR "IntIV" +#define KEYLEN_JSON_STR "keyLen" +#define IVLEN_JSON_STR "ivLen" +#define PAYLOADLEN_JSON_STR "payloadLen" +#define AADLEN_JSON_STR "aadLen" +#define TAGLEN_JSON_STR "tagLen" + +#define KEY_JSON_STR "key" +#define IV_JSON_STR "iv" +#define PT_JSON_STR "pt" +#define CT_JSON_STR "ct" +#define AAD_JSON_STR "aad" +#define TAG_JSON_STR "tag" +#define DIR_JSON_STR "direction" + +#define OP_ENC_JSON_STR "encrypt" +#define OP_DEC_JSON_STR "decrypt" + +#define IVGEN_JSON_STR "ivGen" +#define OP_ENC_EXT_JSON_STR "external" +#define OP_ENC_INT_JSON_STR "internal" +#define NEG_TEST_STR "FAIL"/** @@ -136,6 +161,40 @@ struct fips_test_callback gcm_enc_vectors[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef RTE_HAS_JANSSON +struct fips_test_callback gcm_dec_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str, &vec.aead.key}, + {IV_JSON_STR , parse_uint8_known_len_hex_str, &vec.iv}, + {CT_JSON_STR , parse_gcm_pt_ct_str, &vec.ct}, + {AAD_JSON_STR , parse_gcm_aad_str, &vec.aead.aad}, + {TAG_JSON_STR , parse_uint8_known_len_hex_str, + &vec.aead.digest}, + {NULL ,NULL ,NULL }/**< end pointer */ }; + +struct fips_test_callback gcm_interim_json_vectors[] = { + {KEYLEN_JSON_STR , parser_read_uint32_bit_val, &vec.aead.key}, + {IVLEN_JSON_STR , parser_read_uint32_bit_val, &vec.iv}, + {PAYLOADLEN_JSON_STR , parser_read_gcm_pt_len, &vec.pt}, + {PAYLOADLEN_JSON_STR , parser_read_uint32_bit_val, &vec.ct}, +/**< The NIST json test vectors use 'payloadLen' to denote input text
examples/fips_validation/fips_validation_gcm.c +3
-0+* length in case of decrypt & encrypt operations. +*/ + {AADLEN_JSON_STR, parser_read_uint32_bit_val,&vec.aead.aad},
examples/fips_validation/fips_validation_gcm.c +6
-0+ {TAGLEN_JSON_STR , parser_read_uint32_bit_val, + &vec.aead.digest}, + {NULL, NULL, NULL} /**< end pointer */ }; + +struct fips_test_callback gcm_enc_json_vectors[] = { + {KEY_JSON_STR , parse_uint8_known_len_hex_str,&vec.aead.key},
examples/fips_validation/fips_validation_gcm.c +4
-0+ {IV_JSON_STR, parse_uint8_known_len_hex_str, &vec.iv}, + {PT_JSON_STR, parse_gcm_pt_ct_str, &vec.pt}, + {AAD_JSON_STR, parse_gcm_aad_str, &vec.aead.aad}, + {NULL, NULL, NULL} /**< end pointer */ }; #endif /*
RTE_HAS_JANSSONexamples/fips_validation/fips_validation_gcm.c +2
-0+*/ +static int parse_test_gcm_writeback(struct fips_val *val) { @@ -194,7 +253,6 @@
parse_test_gcm_init(void)examples/fips_validation/fips_validation_gcm.c +21
-1char *tmp;uint32_t i; -for (i =0 ; i < info.nb_vec_lines; i++) {char *line = info.vec[i];@@ -218,3 +276,94 @@ parse_test_gcm_init(void)return 0 ; } + +#ifdef RTE_HAS_JANSSON +static int +parse_test_gcm_json_writeback (struct fips_val *val) { +struct fips_val tmp_val; +json_t *tcId, *tag; + + tcId =json_object_get (json_info.json_test_case,"tcId" ); + + json_info.json_write_case =json_object (); +json_object_set (json_info.json_write_case,"tcId" , tcId); + +if (info.op ==FIPS_TEST_ENC_AUTH_GEN ) { +json_t *ct; + + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + ct =json_string (info.one_line_text); + json_object_set_new(json_info.json_write_case,
CT_JSON_STR, ct);examples/fips_validation/fips_validation_gcm.c +7
-0+ +if (info.interim_info.gcm_data.gen_iv) { +json_t *iv; + tmp_val.val = vec.iv.val; + tmp_val.len = vec.iv.len; + + writeback_hex_str("", info.one_line_text,
&tmp_val);examples/fips_validation/fips_validation_gcm.c +2
-0+ iv =json_string (info.one_line_text); + json_object_set_new(json_info.json_write_case,
IV_JSON_STR, iv);examples/fips_validation/fips_validation_gcm.c +11
-0+ +rte_free (vec.iv.val); + vec.iv.val =NULL ; + } + + tmp_val.val = val->val + vec.pt.len; + tmp_val.len = val->len - vec.pt.len; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + tag =json_string (info.one_line_text); + json_object_set_new(json_info.json_write_case,
TAG_JSON_STR, tag);examples/fips_validation/fips_validation_gcm.c +7
-0+ }else { +if (vec.status ==RTE_CRYPTO_OP_STATUS_SUCCESS ) { +if (!info.interim_info.gcm_data.is_gmac) { + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + + writeback_hex_str("", info.one_line_text,
&tmp_val);
+
json_object_set_new(json_info.json_write_case,PT_JSON_STR,examples/fips_validation/fips_validation_gcm.c +4
-0+ json_string(info.one_line_text)); + } + }else { + json_object_set_new(json_info.json_write_case,"testPassed",
json_false());examples/fips_validation/fips_validation_gcm.c +13
-0+ } + } + +return 0 ; +} + +int +parse_test_gcm_json_init (void ) +{ +json_t *direction_obj; +const char *direction_str; + + direction_obj = json_object_get(json_info.json_test_group,
DIR_JSON_STR);examples/fips_validation/fips_validation_gcm.c +4
-0+ direction_str =json_string_value (direction_obj); + +if (strcmp (direction_str,OP_ENC_JSON_STR ) ==0 ) { + json_t *ivGen_obj =
json_object_get(json_info.json_test_group, IVGEN_JSON_STR);examples/fips_validation/fips_validation_gcm.c +20
-0+const char *ivGen_str =json_string_value (ivGen_obj); + + info.op =FIPS_TEST_ENC_AUTH_GEN ; + info.callbacks = gcm_enc_json_vectors; + +if (strcmp (ivGen_str,OP_ENC_INT_JSON_STR ) ==0 ) + info.interim_info.gcm_data.gen_iv = 1; + }else if (strcmp (direction_str,OP_DEC_JSON_STR ) ==0 ) { + info.op =FIPS_TEST_DEC_AUTH_VERIF ; + info.callbacks = gcm_dec_json_vectors; + }else { +return -EINVAL ; + } + info.interim_callbacks = gcm_interim_json_vectors; + info.parse_writeback = parse_test_gcm_json_writeback; + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +(quoted diff) +0
-0
b/examples/fips_validation/main.cindex65f736f3cb..a1d8a1d758100644examples/fips_validation/main.c +2
-2@@ -1941,11 +1941,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret; --2.25.1
PATCH v4 6/8 examples/fips_validation: add json to hmac
In reply to Brandon LoAdds JSON support for the HMAC algorithm.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)
examples/fips_validation/fips_validation.c +2 -0
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +6 -0
@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_hmac.c +93 -0
108 lines not on this page · raw message
examples/fips_validation/main.c +3 -0
@@ -1943,6 +1943,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 6/8] examples/fips_validation: add json to hmac
Verified the functionality changes and looks good to me.
Thanks.
Quoted 188 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 6/8] examples/fips_validation: add json to hmacExternal Email
----------------------------------------------------------------------
Adds JSON support for the HMAC algorithm.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)examples/fips_validation/fips_validation.c +2
-0@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;examples/fips_validation/fips_validation.h +6
-0@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int examples/fips_validation/fips_validation_hmac.c +26
-0@@ -19,6 +19,15 @@#define PT_STR "Msg = "#define TAG_STR "Mac = " +#define ALGO_JSON_STR "algorithm" + +#define KEYLEN_JSON_STR "keyLen" +#define TAGLEN_JSON_STR "macLen" + +#define KEY_JSON_STR "key" +#define PT_JSON_STR "msg" +#define TAG_JSON_STR "mac" +struct hash_size_conversion {const char *str;enum rte_crypto_auth_algorithm algo;@@ -65,6 +74,29 @@ struct fips_test_callback hmac_tests_interim_vectors[] = { {NULL ,NULL ,NULL }/**< end pointer */ }; +#ifdef RTE_HAS_JANSSON +struct hash_size_conversion json_algorithms[] = { + {"HMAC-SHA-1", RTE_CRYPTO_AUTH_SHA1_HMAC}, + {"HMAC-SHA2-224", RTE_CRYPTO_AUTH_SHA224_HMAC}, + {"HMAC-SHA2-256", RTE_CRYPTO_AUTH_SHA256_HMAC}, + {"HMAC-SHA2-384", RTE_CRYPTO_AUTH_SHA384_HMAC}, + {"HMAC-SHA2-512", RTE_CRYPTO_AUTH_SHA512_HMAC}, }; + +struct fips_test_callback hmac_tests_json_vectors[] = { + {KEY_JSON_STR, parse_uint8_hex_str, &vec.cipher_auth.key}, + {PT_JSON_STR, parse_uint8_hex_str, &vec.pt}, + {TAG_JSON_STR, parse_uint8_hex_str, &vec.cipher_auth.digest}, + {NULL, NULL, NULL} /**< end pointer */ }; + +struct fips_test_callback hmac_tests_interim_json_vectors[] = { + {KEYLEN_JSON_STR, parser_read_uint32_val, &vec.cipher_auth.key}, + {TAGLEN_JSON_STR, parser_read_uint32_bit_val,&vec.cipher_auth.digest},
examples/fips_validation/fips_validation_hmac.c +1
-0+ {NULL, NULL, NULL} /**< end pointer */ }; #endif /*
RTE_HAS_JANSSONexamples/fips_validation/fips_validation_hmac.c +2
-0+*/ +static int parse_test_hmac_writeback(struct fips_val *val) { @@ -103,3 +135,64 @@
parse_test_hmac_init(void)examples/fips_validation/fips_validation_hmac.c +20
-0return 0 ; } + +#ifdef RTE_HAS_JANSSON +static int +parse_test_hmac_json_writeback (struct fips_val *val) { +struct fips_val val_local; +json_t *tcId, *mac; + + tcId =json_object_get (json_info.json_test_case,"tcId" ); + + json_info.json_write_case =json_object (); +json_object_set (json_info.json_write_case,"tcId" , tcId); + + + val_local.val = val->val + vec.pt.len; + val_local.len = vec.cipher_auth.digest.len; + +writeback_hex_str ("" , info.one_line_text, &val_local); + + mac =json_string (info.one_line_text); + json_object_set_new(json_info.json_write_case, TAG_JSON_STR,mac);
examples/fips_validation/fips_validation_hmac.c +12
-0+ +return 0 ; +} + +int +parse_test_hmac_json_algorithm (void ) +{ +json_t *algorithm_object; +const char *algorithm_str; +uint32_t i; + + algorithm_object = json_object_get(json_info.json_vector_set,"algorithm");
examples/fips_validation/fips_validation_hmac.c +5
-0+ algorithm_str =json_string_value (algorithm_object); + +for (i =0 ; i <RTE_DIM (json_algorithms); i++) { +if (strstr (algorithm_str, json_algorithms[i].str)) { + info.interim_info.hmac_data.algo =json_algorithms[i].algo;
examples/fips_validation/fips_validation_hmac.c +23
-0+ return 0; + } + } + +return -1 ; +} + +int +parse_test_hmac_json_init (void ) +{ + info.op =FIPS_TEST_ENC_AUTH_GEN ; + info.parse_writeback = parse_test_hmac_json_writeback; + info.callbacks = hmac_tests_json_vectors; + info.writeback_callbacks =NULL ; + info.kat_check = rsp_test_hmac_check; + info.interim_callbacks = hmac_tests_interim_json_vectors; + +if (parse_test_hmac_json_algorithm () <0 ) +return -1 ; + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ (quoted diff) +0
-0
b/examples/fips_validation/main.cindexa1d8a1d758..de6dedaf75100644examples/fips_validation/main.c +3
-1@@ -1943,6 +1943,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; } --2.25.1
PATCH v4 7/8 examples/fips_validation: implement json cmac test
In reply to Brandon LoImplemented JSON support for the CMAC test.
--- examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_cmac.c | 68 +++++++++++++++++++ 2 files changed, 74 insertions(+)
examples/fips_validation/fips_validation.h +6 -0
@@ -259,6 +259,12 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void ); + +int +parser_read_cmac_direction_str (const char *key,char *src,struct fips_val *val);#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_cmac.c +68 -0
80 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 7/8] examples/fips_validation: implement json cmac test
Verified the functionality changes and looks good to me.
Thanks.
Quoted 131 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 7/8] examples/fips_validation: implement json cmac testExternal Email
----------------------------------------------------------------------
Implemented JSON support for the CMAC test.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_cmac.c | 68 +++++++++++++++++++ 2 files changed, 74 insertions(+)examples/fips_validation/fips_validation.h +7
-0@@ -259,6 +259,12 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void ); + +int +parser_read_cmac_direction_str (const char *key,char *src,struct +fips_val *val);#endif /* RTE_HAS_JANSSON */ int examples/fips_validation/fips_validation_cmac.c +22
-0@@ -32,6 +32,18 @@#define PASS_STR "P"#define FAIL_STR "F" +#define KLEN_JSON_STR "keyLen" +#define PTLEN_JSON_STR "msgLen" +#define TAGLEN_JSON_STR "macLen" +#define KEY_JSON_STR "key" +#define PT_JSON_STR "message" +#define TAG_JSON_STR "mac" +#define DIRECTION_JSON_STR "direction" +#define POS_NEG_JSON_STR "testPassed" + +#define GEN_JSON_STR "gen" +#define VERIF_JSON_STR "ver" +struct hash_algo_conversion {const char *str;enum fips_test_algorithms algo;@@ -39,6 +51,62 @@ struct hash_algo_conversion { {"AES", FIPS_TEST_ALGO_AES_CMAC}, }; +#ifdef RTE_HAS_JANSSON +struct fips_test_callback cmac_tests_interim_json_vectors[] = { + {KLEN_JSON_STR, parser_read_uint32_bit_val, &vec.cipher_auth.key}, + {PTLEN_JSON_STR, parser_read_uint32_bit_val, &vec.pt}, + {TAGLEN_JSON_STR, parser_read_uint32_bit_val, &vec.cipher_auth.digest}, + {DIRECTION_JSON_STR, parser_read_cmac_direction_str, NULL}, + {NULL, NULL, NULL} /**< end pointer */ }; + +struct fips_test_callback cmac_tests_json_vectors[] = { + {KEY_JSON_STR, parse_uint8_hex_str,&vec.cipher_auth.key},
examples/fips_validation/fips_validation_cmac.c +17
-0+ {PT_JSON_STR, parse_uint8_known_len_hex_str, &vec.pt}, + {TAG_JSON_STR, parse_uint8_known_len_hex_str, + &vec.cipher_auth.digest}, + {NULL, NULL, NULL} /**< end pointer */ }; + +static int +parse_test_cmac_json_writeback (struct fips_val *val) { + json_info.json_write_case =json_object (); +json_object_set (json_info.json_write_case,"tcId" , +json_object_get (json_info.json_test_case,"tcId" )); + +if (info.op ==FIPS_TEST_ENC_AUTH_GEN ) { +struct fips_val tmp_val = {val->val + vec.pt.len, + vec.cipher_auth.digest.len}; + +writeback_hex_str ("" , info.one_line_text, &tmp_val); + json_object_set_new(json_info.json_write_case,
TAG_JSON_STR,examples/fips_validation/fips_validation_cmac.c +4
-0+ json_string(info.one_line_text)); + }else { +if (vec.status ==RTE_CRYPTO_OP_STATUS_SUCCESS ) + json_object_set_new(json_info.json_write_case,
POS_NEG_JSON_STR,examples/fips_validation/fips_validation_cmac.c +2
-0+ json_boolean(true)); + else if (vec.status ==
RTE_CRYPTO_OP_STATUS_AUTH_FAILED)examples/fips_validation/fips_validation_cmac.c +1
-0+ json_object_set_new(json_info.json_write_case,
POS_NEG_JSON_STR,examples/fips_validation/fips_validation_cmac.c +19
-1+ json_boolean(false)); + } + +return 0 ; +} + +int +parse_test_cmac_json_init (void ) +{ + info.algo =FIPS_TEST_ALGO_AES_CMAC ; + + info.parse_writeback = parse_test_cmac_json_writeback; + info.callbacks = cmac_tests_json_vectors; + info.interim_callbacks = cmac_tests_interim_json_vectors; + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parse_test_cmac_writeback (struct fips_val *val) { --2.25.1
PATCH v4 8/8 examples/fips_validation: add parsing for cmac
In reply to Brandon LoAdded function to parse algorithm for CMAC test.
--- examples/fips_validation/fips_validation.c | 31 +++++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 31 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +28 -3
@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;
@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {
@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , +json_integer_value (param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */
@@ -673,6 +686,18 @@ parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val)return 0 ; } +int +parser_read_cmac_direction_str(__rte_unused const char *key, char *src, + __rte_unused struct fips_val *val) +{ +if (strcmp (src,"gen" ) ==0 ) + info.op =FIPS_TEST_ENC_AUTH_GEN ; +else if (strcmp (src,"ver" ) ==0 ) + info.op =FIPS_TEST_DEC_AUTH_VERIF ; + +return 0 ; +} +int writeback_hex_str (const char *key,char *dst,struct fips_val *val) {
examples/fips_validation/main.c +3 -0
@@ -1946,6 +1946,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
RE: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing for cmac
Verified the functionality changes and looks good to me.
Thanks.
Quoted 102 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing for cmacExternal Email
----------------------------------------------------------------------
Added function to parse algorithm for CMAC test.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/fips_validation.c | 31 +++++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 31 insertions(+), 3 deletions(-)examples/fips_validation/fips_validation.c +9
-3@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 , "%"JSON_INTEGER_FORMAT, val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : + snprintf(json_value, 255,"%"JSON_INTEGER_FORMAT,
examples/fips_validation/fips_validation.c +19
-0+ json_integer_value(param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */ @@ -673,6 +686,18 @@ parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val)return 0 ; } +int +parser_read_cmac_direction_str(__rte_unused const char *key, char *src, + __rte_unused struct fips_val *val) +{ +if (strcmp (src,"gen" ) ==0 ) + info.op =FIPS_TEST_ENC_AUTH_GEN ; +else if (strcmp (src,"ver" ) ==0 ) + info.op =FIPS_TEST_DEC_AUTH_VERIF ; + +return 0 ; +} +int writeback_hex_str(const char *key, char *dst, struct fips_val *val) { diff --git
a/examples/fips_validation/main.cb/examples/fips_validation/main.cindexde6dedaf75..aa8034c29f100644examples/fips_validation/main.c +3
-1@@ -1946,6 +1946,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; } --2.25.1
RE: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing for cmac
In reply to Brandon LoPlease find comments inline from CI point of view.
Quoted 25 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing for cmacExternal Email
----------------------------------------------------------------------
Added function to parse algorithm for CMAC test.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/fips_validation.c | 31 +++++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 31 insertions(+), 3 deletions(-)examples/fips_validation/fips_validation.c +0
-0@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;
......
......
examples/fips_validation/fips_validation.c parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val) · line 691
Quoted 4 lines
examples/fips_validation/fips_validation.c +3
-0+int +parser_read_cmac_direction_str(__rte_unused const char *key, char *src, + __rte_unused struct fips_val *val)
Can this function be static in fips_validation_cmac.c which is more appropriate also ?.
Thanks,
Gowrishankar
RE: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing for cmac
Quoted 50 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan
Sent: Thursday, May 19, 2022 11:01 AM
To: Brandon Lo <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: RE: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing for cmacPlease find comments inline from CI point of view.
Quoted 6 lines
-----Original Message-----
From: Brandon Lo <[email protected]>
Sent: Friday, April 29, 2022 9:46 PM
To: [email protected]; [email protected]
Cc: [email protected]; Brandon Lo <[email protected]>
Subject: [EXT] [PATCH v4 8/8] examples/fips_validation: add parsing forcmac
Quoted 19 lines
External Email
----------------------------------------------------------------------
Added function to parse algorithm for CMAC test.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/fips_validation.c | 31 +++++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 31 insertions(+), 3 deletions(-)examples/fips_validation/fips_validation.c +0
-0@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;......
......examples/fips_validation/fips_validation.c
Quoted 3 lines
examples/fips_validation/fips_validation.c +2
-0+int +parser_read_cmac_direction_str(__rte_unused const char *key, char*src,
examples/fips_validation/fips_validation.c parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val) · line 691
Quoted 1 line
examples/fips_validation/fips_validation.c +1
-0+ __rte_unused struct fips_val *val)Can this function be static in
fips_validation_cmac.cwhich is more appropriate also ?.Thanks,
Gowrishankar
Hi everyone,
I'm going to be leaving the UNH IOL, so I've submitted the work that will be continued by other members of the lab.
Thanks,
Brandon
Quoted 29 lines · Brandon Lo
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmacexamples/fips_validation/fips_validation.c | 119 ++++++++++ examples/fips_validation/fips_validation.h | 57 ++++- .../fips_validation/fips_validation_cmac.c | 68 ++++++ .../fips_validation/fips_validation_gcm.c | 151 ++++++++++++- .../fips_validation/fips_validation_hmac.c | 93 ++++++++ examples/fips_validation/main.c | 207 +++++++++++++++++- examples/fips_validation/meson.build | 4 + 7 files changed, 693 insertions(+), 6 deletions(-)--
2.25.1
Signature · 5 lines
Brandon Lo UNH InterOperability Laboratory 21 Madbury Rd, Suite 100, Durham, NH 03824 [email protected] www.iol.unh.edu
v5 cover Add JSON vector set support to fips validation
In reply to Brandon LoAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v5:
* AES_CBC support appended in series.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
Gowrishankar Muthukrishnan (3):
examples/fips_validation: cleanup bypass tests in response file examples/fips_validation: reset IV generation in every test group examples/fips_validation: add parsing for aes_cbc
examples/fips_validation/fips_validation.c | 117 ++++++- examples/fips_validation/fips_validation.h | 64 +++- .../fips_validation/fips_validation_aes.c | 223 ++++++++++++ .../fips_validation/fips_validation_cmac.c | 80 +++++ .../fips_validation/fips_validation_gcm.c | 152 ++++++++- .../fips_validation/fips_validation_hmac.c | 93 +++++ examples/fips_validation/main.c | 323 +++++++++++++++--- examples/fips_validation/meson.build | 4 + 8 files changed, 995 insertions(+), 61 deletions(-)
--
2.25.1
PATCH v5 1/11 examples/fips_validation: add jansson dependency
From: Brandon Lo <[email protected]>
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH v5 2/11 examples/fips_validation: add json info to header
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added json-specific functions and other information needed to test the new FIPS test vectors.
---
v5:
* fix typo in macro name for prefixes.
v2:
* fix type of prefix to suffix
--- examples/fips_validation/fips_validation.c | 6 +-- examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- 2 files changed, 47 insertions(+), 7 deletions(-)
examples/fips_validation/fips_validation.c +3 -3
@@ -270,11 +270,11 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_PREFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_PREFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_PREFIX )) info.file_type =FIPS_TYPE_FAX ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +44 -4
84 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 3/11 examples/fips_validation: add json parsing
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added functions to parse the required information from a vector set given in the new json format.
---
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
--- examples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+)
examples/fips_validation/fips_validation.c +92 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PREFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PREFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +strcpy (info.one_line_text,json_string_value (param)); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
Signature · 1 line
2.25.1
PATCH v5 4/11 examples/fips_validation: allow json file as input
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added the ability to use the json format as the input and output of the example application.
--
v5:
* fix to check info.file_type in json file type as well.
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
--- examples/fips_validation/main.c | 197 +++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +194 -3
@@ -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) {
@@ -425,8 +436,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -481,7 +501,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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 +1249,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 +1269,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 +1285,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 +1877,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 */
Signature · 1 line
2.25.1
PATCH v5 5/11 examples/fips_validation: add json to gcm test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v3:
* fix checkpatch warnings
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 151 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 155 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.h +3 -0
@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_gcm.c +150 -1
178 lines not on this page · raw message
examples/fips_validation/main.c +2 -1
@@ -1940,11 +1940,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret;
Signature · 1 line
2.25.1
PATCH v5 6/11 examples/fips_validation: add json to hmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds JSON support for the HMAC algorithm.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)
examples/fips_validation/fips_validation.c +2 -0
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +6 -0
@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_hmac.c +93 -0
108 lines not on this page · raw message
examples/fips_validation/main.c +3 -0
@@ -1942,6 +1942,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v5 7/11 examples/fips_validation: implement json cmac test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Implemented JSON support for the CMAC test.
--
v5:
* parser_read_cmac_direction_str is static.
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_cmac.c | 80 +++++++++++++++++++ 2 files changed, 83 insertions(+)
examples/fips_validation/fips_validation.h +3 -0
@@ -259,6 +259,9 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_cmac.c +80 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 8/11 examples/fips_validation: add parsing for cmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added function to parse algorithm for CMAC test.
--
v5:
* parser_read_cmac_direction_str implementation moved to static.
--- examples/fips_validation/fips_validation.c | 19 ++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +16 -3
@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;
@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {
@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , +json_integer_value (param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */
examples/fips_validation/main.c +3 -0
@@ -1945,6 +1945,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v5 9/11 examples/fips_validation: cleanup bypass tests in response file
In reply to Gowrishankar MuthukrishnanRemove garbage entries for bypassed tests in response file.
--- examples/fips_validation/main.c | 74 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 39 deletions(-)
examples/fips_validation/main.c +35 -39
@@ -804,7 +804,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 ;
@@ -852,7 +852,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 ;
@@ -889,7 +889,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 ;
@@ -935,7 +935,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 ;
@@ -980,7 +980,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 ;
@@ -1018,7 +1018,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 ;
@@ -1064,7 +1064,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 ;
@@ -1099,7 +1099,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 ;
@@ -1139,7 +1139,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 ;
@@ -1254,7 +1254,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 ; }
@@ -1289,7 +1289,7 @@ fips_generic_test(void)fprintf (info.fp_wr,"\n" );free (val.val); -return 0 ; +return 1 ; } static int
@@ -1458,7 +1458,7 @@ fips_mct_tdes_test(void)free (val.val); -return 0 ; +return 1 ; } static int
@@ -1537,7 +1537,7 @@ fips_mct_aes_ecb_test(void)free (val.val); -return 0 ; +return 1 ; }static int fips_mct_aes_test (void )
@@ -1645,7 +1645,7 @@ fips_mct_aes_test(void)free (val.val); -return 0 ; +return 1 ; } static int
@@ -1731,7 +1731,7 @@ fips_mct_sha_test(void)free (val.val); -return 0 ; +return 1 ; }
@@ -1846,18 +1846,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; }
@@ -1907,22 +1904,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
@@ -1967,8 +1963,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 ;
Signature · 1 line
2.25.1
PATCH v5 10/11 examples/fips_validation: reset IV generation in every test group
In reply to Gowrishankar MuthukrishnanReset IV generation in every test group.
--- examples/fips_validation/fips_validation_gcm.c | 1 + 1 file changed, 1 insertion(+)
examples/fips_validation/fips_validation_gcm.c +1 -0
@@ -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 );
Signature · 1 line
2.25.1
PATCH v5 11/11 examples/fips_validation: add parsing for aes_cbc
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES_CBC test.
--- examples/fips_validation/fips_validation.c | 8 +- examples/fips_validation/fips_validation.h | 4 + .../fips_validation/fips_validation_aes.c | 223 ++++++++++++++++++ examples/fips_validation/main.c | 73 ++++-- 4 files changed, 281 insertions(+), 27 deletions(-)
examples/fips_validation/fips_validation.c +5 -3
@@ -120,7 +120,7 @@ fips_test_parse_header(void)for (i =0 ; i < info.nb_vec_lines; i++) {if (!algo_parsed) { -if (strstr (info.vec[i],"AESVS" )) { +if (strstr (info.vec[i],"AES" )) { algo_parsed =1 ; info.algo =FIPS_TEST_ALGO_AES ; ret =parse_test_aes_init ();
@@ -458,10 +458,12 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; -if (strstr (algo_str,"HMAC" )) +else if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; -if (strstr (algo_str,"CMAC" )) +else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ; +else if (strstr (algo_str,"AES-CBC" )) + info.algo =FIPS_TEST_ALGO_AES ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +4 -0
@@ -103,6 +103,7 @@ enum fips_aesavs_test_types {AESAVS_TYPE_VARTXT ,AESAVS_TYPE_MMT ,AESAVS_TYPE_MCT , + AESAVS_TYPE_AFT, }; enum fips_tdes_test_types {
@@ -262,6 +263,9 @@ parse_test_hmac_json_algorithm(void);int parse_test_cmac_json_init (void ); + +int +parse_test_aes_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_aes.c +223 -0
247 lines not on this page · raw message
examples/fips_validation/main.c +49 -24
146 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 11/11 examples/fips_validation: add parsing for aes_cbc
Added function to parse algorithm for AES_CBC test.
--- examples/fips_validation/fips_validation.c | 8 +- examples/fips_validation/fips_validation.h | 4 + .../fips_validation/fips_validation_aes.c | 223 ++++++++++++++++++ examples/fips_validation/main.c | 76 ++++-- 4 files changed, 284 insertions(+), 27 deletions(-)
examples/fips_validation/fips_validation.c +5 -3
@@ -120,7 +120,7 @@ fips_test_parse_header(void)for (i =0 ; i < info.nb_vec_lines; i++) {if (!algo_parsed) { -if (strstr (info.vec[i],"AESVS" )) { +if (strstr (info.vec[i],"AES" )) { algo_parsed =1 ; info.algo =FIPS_TEST_ALGO_AES ; ret =parse_test_aes_init ();
@@ -458,10 +458,12 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; -if (strstr (algo_str,"HMAC" )) +else if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; -if (strstr (algo_str,"CMAC" )) +else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ; +else if (strstr (algo_str,"AES-CBC" )) + info.algo =FIPS_TEST_ALGO_AES ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +4 -0
@@ -103,6 +103,7 @@ enum fips_aesavs_test_types {AESAVS_TYPE_VARTXT ,AESAVS_TYPE_MMT ,AESAVS_TYPE_MCT , + AESAVS_TYPE_AFT, }; enum fips_tdes_test_types {
@@ -262,6 +263,9 @@ parse_test_hmac_json_algorithm(void);int parse_test_cmac_json_init (void ); + +int +parse_test_aes_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_aes.c +223 -0
247 lines not on this page · raw message
examples/fips_validation/main.c +52 -24
150 lines not on this page · raw message
Signature · 1 line
2.25.1
v6 cover Add JSON vector set support to fips validation
In reply to Gowrishankar MuthukrishnanAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v6:
* CI centos platform fix.
v5:
* AES_CBC support appended in series.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
Gowrishankar Muthukrishnan (3):
examples/fips_validation: cleanup bypass tests in response file examples/fips_validation: reset IV generation in every test group examples/fips_validation: add parsing for aes_cbc
examples/fips_validation/fips_validation.c | 117 ++++++- examples/fips_validation/fips_validation.h | 64 +++- .../fips_validation/fips_validation_aes.c | 223 ++++++++++++ .../fips_validation/fips_validation_cmac.c | 80 +++++ .../fips_validation/fips_validation_gcm.c | 152 +++++++- .../fips_validation/fips_validation_hmac.c | 93 +++++ examples/fips_validation/main.c | 326 +++++++++++++++--- examples/fips_validation/meson.build | 4 + 8 files changed, 998 insertions(+), 61 deletions(-)
Signature · 1 line
2.25.1
PATCH v6 1/11 examples/fips_validation: add jansson dependency
From: Brandon Lo <[email protected]>
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH v6 2/11 examples/fips_validation: add json info to header
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added json-specific functions and other information needed to test the new FIPS test vectors.
---
v5:
* fix typo in macro name for prefixes.
v2:
* fix type of prefix to suffix
--- examples/fips_validation/fips_validation.c | 6 +-- examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- 2 files changed, 47 insertions(+), 7 deletions(-)
examples/fips_validation/fips_validation.c +3 -3
@@ -270,11 +270,11 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_PREFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_PREFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_PREFIX )) info.file_type =FIPS_TYPE_FAX ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +44 -4
84 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v6 3/11 examples/fips_validation: add json parsing
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added functions to parse the required information from a vector set given in the new json format.
---
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
--- examples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+)
examples/fips_validation/fips_validation.c +92 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PREFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PREFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +strcpy (info.one_line_text,json_string_value (param)); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
Signature · 1 line
2.25.1
PATCH v6 4/11 examples/fips_validation: allow json file as input
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added the ability to use the json format as the input and output of the example application.
--
v5:
* fix to check info.file_type in json file type as well.
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
--- examples/fips_validation/main.c | 197 +++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +194 -3
@@ -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) {
@@ -425,8 +436,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -481,7 +501,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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 +1249,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 +1269,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 +1285,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 +1877,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 */
Signature · 1 line
2.25.1
PATCH v6 5/11 examples/fips_validation: add json to gcm test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v3:
* fix checkpatch warnings
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 151 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 155 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.h +3 -0
@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_gcm.c +150 -1
178 lines not on this page · raw message
examples/fips_validation/main.c +2 -1
@@ -1940,11 +1940,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret;
Signature · 1 line
2.25.1
PATCH v6 6/11 examples/fips_validation: add json to hmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds JSON support for the HMAC algorithm.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)
examples/fips_validation/fips_validation.c +2 -0
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +6 -0
@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_hmac.c +93 -0
108 lines not on this page · raw message
examples/fips_validation/main.c +3 -0
@@ -1942,6 +1942,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v6 7/11 examples/fips_validation: implement json cmac test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Implemented JSON support for the CMAC test.
--
v5:
* parser_read_cmac_direction_str is static.
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_cmac.c | 80 +++++++++++++++++++ 2 files changed, 83 insertions(+)
examples/fips_validation/fips_validation.h +3 -0
@@ -259,6 +259,9 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_cmac.c +80 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v6 8/11 examples/fips_validation: add parsing for cmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added function to parse algorithm for CMAC test.
--
v5:
* parser_read_cmac_direction_str implementation moved to static.
--- examples/fips_validation/fips_validation.c | 19 ++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +16 -3
@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;
@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {
@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , +json_integer_value (param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */
examples/fips_validation/main.c +3 -0
@@ -1945,6 +1945,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v6 9/11 examples/fips_validation: cleanup bypass tests in response file
In reply to Gowrishankar MuthukrishnanRemove garbage entries for bypassed tests in response file.
--- examples/fips_validation/main.c | 74 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 39 deletions(-)
examples/fips_validation/main.c +35 -39
@@ -804,7 +804,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 ;
@@ -852,7 +852,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 ;
@@ -889,7 +889,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 ;
@@ -935,7 +935,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 ;
@@ -980,7 +980,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 ;
@@ -1018,7 +1018,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 ;
@@ -1064,7 +1064,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 ;
@@ -1099,7 +1099,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 ;
@@ -1139,7 +1139,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 ;
@@ -1254,7 +1254,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 ; }
@@ -1289,7 +1289,7 @@ fips_generic_test(void)fprintf (info.fp_wr,"\n" );free (val.val); -return 0 ; +return 1 ; } static int
@@ -1458,7 +1458,7 @@ fips_mct_tdes_test(void)free (val.val); -return 0 ; +return 1 ; } static int
@@ -1537,7 +1537,7 @@ fips_mct_aes_ecb_test(void)free (val.val); -return 0 ; +return 1 ; }static int fips_mct_aes_test (void )
@@ -1645,7 +1645,7 @@ fips_mct_aes_test(void)free (val.val); -return 0 ; +return 1 ; } static int
@@ -1731,7 +1731,7 @@ fips_mct_sha_test(void)free (val.val); -return 0 ; +return 1 ; }
@@ -1846,18 +1846,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; }
@@ -1907,22 +1904,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
@@ -1967,8 +1963,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 ;
Signature · 1 line
2.25.1
PATCH v6 10/11 examples/fips_validation: reset IV generation in every test group
In reply to Gowrishankar MuthukrishnanReset IV generation in every test group.
--- examples/fips_validation/fips_validation_gcm.c | 1 + 1 file changed, 1 insertion(+)
examples/fips_validation/fips_validation_gcm.c +1 -0
@@ -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 );
Signature · 1 line
2.25.1
PATCH v6 11/11 examples/fips_validation: add parsing for aes_cbc
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES_CBC test.
--
v6:
* fixed local variable initialization in fips_mct_aes_test.
--- examples/fips_validation/fips_validation.c | 8 +- examples/fips_validation/fips_validation.h | 4 + .../fips_validation/fips_validation_aes.c | 223 ++++++++++++++++++ examples/fips_validation/main.c | 76 ++++-- 4 files changed, 284 insertions(+), 27 deletions(-)
examples/fips_validation/fips_validation.c +5 -3
@@ -120,7 +120,7 @@ fips_test_parse_header(void)for (i =0 ; i < info.nb_vec_lines; i++) {if (!algo_parsed) { -if (strstr (info.vec[i],"AESVS" )) { +if (strstr (info.vec[i],"AES" )) { algo_parsed =1 ; info.algo =FIPS_TEST_ALGO_AES ; ret =parse_test_aes_init ();
@@ -458,10 +458,12 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; -if (strstr (algo_str,"HMAC" )) +else if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; -if (strstr (algo_str,"CMAC" )) +else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ; +else if (strstr (algo_str,"AES-CBC" )) + info.algo =FIPS_TEST_ALGO_AES ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +4 -0
@@ -103,6 +103,7 @@ enum fips_aesavs_test_types {AESAVS_TYPE_VARTXT ,AESAVS_TYPE_MMT ,AESAVS_TYPE_MCT , + AESAVS_TYPE_AFT, }; enum fips_tdes_test_types {
@@ -262,6 +263,9 @@ parse_test_hmac_json_algorithm(void);int parse_test_cmac_json_init (void ); + +int +parse_test_aes_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_aes.c +223 -0
247 lines not on this page · raw message
examples/fips_validation/main.c +52 -24
150 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 8 lines
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v6:
* CI centos platform fix.
Series Acked-by: Akhil Goyal <[email protected]>
v7 cover Add JSON vector set support to fips validation
In reply to Gowrishankar MuthukrishnanAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v7:
* Fixed individual patches to build correctly.
v6:
* CI centos platform fix.
v5:
* AES_CBC support appended in series.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
Gowrishankar Muthukrishnan (3):
examples/fips_validation: cleanup bypass tests in response file examples/fips_validation: reset IV generation in every test group examples/fips_validation: add parsing for aes_cbc
examples/fips_validation/fips_validation.c | 117 ++++++- examples/fips_validation/fips_validation.h | 64 +++- .../fips_validation/fips_validation_aes.c | 223 ++++++++++++ .../fips_validation/fips_validation_cmac.c | 80 +++++ .../fips_validation/fips_validation_gcm.c | 152 +++++++- .../fips_validation/fips_validation_hmac.c | 93 +++++ examples/fips_validation/main.c | 328 +++++++++++++++--- examples/fips_validation/meson.build | 4 + 8 files changed, 1000 insertions(+), 61 deletions(-)
Signature · 1 line
2.25.1
PATCH v7 1/11 examples/fips_validation: add jansson dependency
From: Brandon Lo <[email protected]>
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
RE: [v7, 01/11] examples/fips_validation: add jansson dependency
Quoted 34 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>
Subject: [v7, 01/11] examples/fips_validation: add jansson dependencyFrom: Brandon Lo <[email protected]>
Added a check for
RTE_HAS_JANSSONinto the meson
configuration file for JSON support.Signed-off-by Brandon Lo <[email protected]>--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)examples/fips_validation/meson.build +4
-1@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif --
Quoted 1 line
2.25.1
PATCH v7 2/11 examples/fips_validation: add json info to header
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added json-specific functions and other information needed to test the new FIPS test vectors.
---
v7:
* fix switch clause for info.file_type.
v5:
* fix typo in macro name for prefixes.
v2:
* fix type of prefix to suffix
--- examples/fips_validation/fips_validation.c | 6 +-- examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- examples/fips_validation/main.c | 2 + 3 files changed, 49 insertions(+), 7 deletions(-)
examples/fips_validation/fips_validation.c +3 -3
@@ -270,11 +270,11 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_PREFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_PREFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_PREFIX )) info.file_type =FIPS_TYPE_FAX ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +44 -4
84 lines not on this page · raw message
examples/fips_validation/main.c +2 -0
@@ -1251,6 +1251,8 @@ fips_generic_test(void)if (ret <0 )return ret;break ; +default : +break ; }fprintf (info.fp_wr,"\n" );
Signature · 1 line
2.25.1
RE: [v7, 02/11] examples/fips_validation: add json info to header
Quoted 11 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>; Gowrishankar Muthukrishnan <[email protected]>
Subject: [v7, 02/11] examples/fips_validation: add json info to header
Quoted 8 lines
From: Brandon Lo <[email protected]>
Added json-specific functions and other information needed to test the new FIPS test vectors.
Signed-off-by Brandon Lo <[email protected]>Signed-off-by Gowrishankar Muthukrishnan <[email protected]>---
PATCH v7 3/11 examples/fips_validation: add json parsing
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added functions to parse the required information from a vector set given in the new json format.
---
v7:
* pulled json_info define from next patch.
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
--- examples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ examples/fips_validation/main.c | 4 + 2 files changed, 96 insertions(+)
examples/fips_validation/fips_validation.c +92 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PREFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PREFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +strcpy (info.one_line_text,json_string_value (param)); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
examples/fips_validation/main.c +4 -0
@@ -39,6 +39,10 @@ enum {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;
Signature · 1 line
2.25.1
RE: [v7, 03/11] examples/fips_validation: add json parsing
Quoted 10 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>
Subject: [v7, 03/11] examples/fips_validation: add json parsing
Quoted 7 lines
From: Brandon Lo <[email protected]>
Added functions to parse the required information from a vector set given in the new json format.
Signed-off-by Brandon Lo <[email protected]>---
PATCH v7 4/11 examples/fips_validation: allow json file as input
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added the ability to use the json format as the input and output of the example application.
--
v5:
* fix to check info.file_type in json file type as well.
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
--- examples/fips_validation/main.c | 193 +++++++++++++++++++++++++++++++- 1 file changed, 190 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +190 -3
@@ -34,6 +34,8 @@ 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;
@@ -170,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) {
@@ -429,8 +436,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -485,7 +501,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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);
@@ -1223,7 +1249,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 ) {
@@ -1242,6 +1269,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);
@@ -1259,7 +1287,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 ;
@@ -1850,3 +1879,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 */
Signature · 1 line
2.25.1
RE: [v7, 04/11] examples/fips_validation: allow json file as input
Quoted 11 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>; Gowrishankar Muthukrishnan <[email protected]>
Subject: [v7, 04/11] examples/fips_validation: allow json file as input
Quoted 8 lines
From: Brandon Lo <[email protected]>
Added the ability to use the json format as the input and output of the example application.
Signed-off-by Brandon Lo <[email protected]>Signed-off-by Gowrishankar Muthukrishnan <[email protected]>--
PATCH v7 5/11 examples/fips_validation: add json to gcm test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v3:
* fix checkpatch warnings
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 151 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 155 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.h +3 -0
@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_gcm.c +150 -1
178 lines not on this page · raw message
examples/fips_validation/main.c +2 -1
@@ -1942,11 +1942,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret;
Signature · 1 line
2.25.1
RE: [v7, 05/11] examples/fips_validation: add json to gcm test
Quoted 10 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>
Subject: [v7, 05/11] examples/fips_validation: add json to gcm test
Quoted 7 lines
From: Brandon Lo <[email protected]>
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
Signed-off-by Brandon Lo <[email protected]>---
PATCH v7 6/11 examples/fips_validation: add json to hmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds JSON support for the HMAC algorithm.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)
examples/fips_validation/fips_validation.c +2 -0
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +6 -0
@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_hmac.c +93 -0
108 lines not on this page · raw message
examples/fips_validation/main.c +3 -0
@@ -1944,6 +1944,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
RE: [v7, 06/11] examples/fips_validation: add json to hmac
Quoted 10 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>
Subject: [v7, 06/11] examples/fips_validation: add json to hmac
Quoted 6 lines
From: Brandon Lo <[email protected]>
Adds JSON support for the HMAC algorithm.
Signed-off-by Brandon Lo <[email protected]>---
PATCH v7 7/11 examples/fips_validation: implement json cmac test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Implemented JSON support for the CMAC test.
--
v5:
* parser_read_cmac_direction_str is static.
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_cmac.c | 80 +++++++++++++++++++ 2 files changed, 83 insertions(+)
examples/fips_validation/fips_validation.h +3 -0
@@ -259,6 +259,9 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_cmac.c +80 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [v7, 07/11] examples/fips_validation: implement json cmac test
Quoted 10 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>
Subject: [v7, 07/11] examples/fips_validation: implement json cmac test
Quoted 6 lines
From: Brandon Lo <[email protected]>
Implemented JSON support for the CMAC test.
Signed-off-by Brandon Lo <[email protected]>--
PATCH v7 8/11 examples/fips_validation: add parsing for cmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added function to parse algorithm for CMAC test.
--
v5:
* parser_read_cmac_direction_str implementation moved to static.
--- examples/fips_validation/fips_validation.c | 19 ++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +16 -3
@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;
@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {
@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , +json_integer_value (param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */
examples/fips_validation/main.c +3 -0
@@ -1947,6 +1947,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
RE: [v7, 08/11] examples/fips_validation: add parsing for cmac
Quoted 11 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Thursday, May 26, 2022 9:02 AM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Brandon Lo <[email protected]>; Gowrishankar Muthukrishnan <[email protected]>
Subject: [v7, 08/11] examples/fips_validation: add parsing for cmac
Quoted 7 lines
From: Brandon Lo <[email protected]>
Added function to parse algorithm for CMAC test.
Signed-off-by Brandon Lo <[email protected]>Signed-off-by Gowrishankar Muthukrishnan <[email protected]>--
PATCH v7 9/11 examples/fips_validation: cleanup bypass tests in response file
In reply to Gowrishankar MuthukrishnanRemove garbage entries for bypassed tests in response file.
--- examples/fips_validation/main.c | 74 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 39 deletions(-)
examples/fips_validation/main.c +35 -39
@@ -804,7 +804,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 ;
@@ -852,7 +852,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 ;
@@ -889,7 +889,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 ;
@@ -935,7 +935,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 ;
@@ -980,7 +980,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 ;
@@ -1018,7 +1018,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 ;
@@ -1064,7 +1064,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 ;
@@ -1099,7 +1099,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 ;
@@ -1139,7 +1139,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 ;
@@ -1254,7 +1254,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 ; }
@@ -1291,7 +1291,7 @@ fips_generic_test(void)fprintf (info.fp_wr,"\n" );free (val.val); -return 0 ; +return 1 ; } static int
@@ -1460,7 +1460,7 @@ fips_mct_tdes_test(void)free (val.val); -return 0 ; +return 1 ; } static int
@@ -1539,7 +1539,7 @@ fips_mct_aes_ecb_test(void)free (val.val); -return 0 ; +return 1 ; }static int fips_mct_aes_test (void )
@@ -1647,7 +1647,7 @@ fips_mct_aes_test(void)free (val.val); -return 0 ; +return 1 ; } static int
@@ -1733,7 +1733,7 @@ fips_mct_sha_test(void)free (val.val); -return 0 ; +return 1 ; }
@@ -1848,18 +1848,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; }
@@ -1909,22 +1906,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
@@ -1969,8 +1965,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 ;
Signature · 1 line
2.25.1
PATCH v7 10/11 examples/fips_validation: reset IV generation in every test group
In reply to Gowrishankar MuthukrishnanReset IV generation in every test group.
--- examples/fips_validation/fips_validation_gcm.c | 1 + 1 file changed, 1 insertion(+)
examples/fips_validation/fips_validation_gcm.c +1 -0
@@ -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 );
Signature · 1 line
2.25.1
PATCH v7 11/11 examples/fips_validation: add parsing for aes_cbc
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES_CBC test.
--
v6:
* fixed local variable initialization in fips_mct_aes_test.
--- examples/fips_validation/fips_validation.c | 8 +- examples/fips_validation/fips_validation.h | 4 + .../fips_validation/fips_validation_aes.c | 223 ++++++++++++++++++ examples/fips_validation/main.c | 76 ++++-- 4 files changed, 284 insertions(+), 27 deletions(-)
examples/fips_validation/fips_validation.c +5 -3
@@ -120,7 +120,7 @@ fips_test_parse_header(void)for (i =0 ; i < info.nb_vec_lines; i++) {if (!algo_parsed) { -if (strstr (info.vec[i],"AESVS" )) { +if (strstr (info.vec[i],"AES" )) { algo_parsed =1 ; info.algo =FIPS_TEST_ALGO_AES ; ret =parse_test_aes_init ();
@@ -458,10 +458,12 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; -if (strstr (algo_str,"HMAC" )) +else if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; -if (strstr (algo_str,"CMAC" )) +else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ; +else if (strstr (algo_str,"AES-CBC" )) + info.algo =FIPS_TEST_ALGO_AES ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +4 -0
@@ -103,6 +103,7 @@ enum fips_aesavs_test_types {AESAVS_TYPE_VARTXT ,AESAVS_TYPE_MMT ,AESAVS_TYPE_MCT , + AESAVS_TYPE_AFT, }; enum fips_tdes_test_types {
@@ -262,6 +263,9 @@ parse_test_hmac_json_algorithm(void);int parse_test_cmac_json_init (void ); + +int +parse_test_aes_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_aes.c +223 -0
247 lines not on this page · raw message
examples/fips_validation/main.c +52 -24
150 lines not on this page · raw message
Signature · 1 line
2.25.1
v8 cover Add JSON vector set support to fips validation
In reply to Gowrishankar MuthukrishnanAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v8:
* Fixed overlapped places for FIPS 140-2 test vectors.
v7:
* Fixed individual patches to build correctly.
v6:
* CI centos platform fix.
v5:
* AES_CBC support appended in series.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
Gowrishankar Muthukrishnan (2):
examples/fips_validation: add parsing for aes_cbc
doc: add notes about acvp validation support
doc/guides/sample_app_ug/fips_validation.rst | 30 +- examples/fips_validation/fips_validation.c | 117 ++++++- examples/fips_validation/fips_validation.h | 64 +++- .../fips_validation/fips_validation_aes.c | 223 +++++++++++++ .../fips_validation/fips_validation_cmac.c | 80 +++++ .../fips_validation/fips_validation_gcm.c | 152 ++++++++- .../fips_validation/fips_validation_hmac.c | 93 ++++++ examples/fips_validation/main.c | 295 ++++++++++++++++-- examples/fips_validation/meson.build | 4 + 9 files changed, 1015 insertions(+), 43 deletions(-)
Signature · 1 line
2.25.1
PATCH v8 1/10 examples/fips_validation: add jansson dependency
From: Brandon Lo <[email protected]>
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH v8 2/10 examples/fips_validation: add json info to header
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added json-specific functions and other information needed to test the new FIPS test vectors.
---
v7:
* fix switch clause for info.file_type.
v5:
* fix typo in macro name for prefixes.
v2:
* fix type of prefix to suffix
--- examples/fips_validation/fips_validation.c | 6 +-- examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- examples/fips_validation/main.c | 2 + 3 files changed, 49 insertions(+), 7 deletions(-)
examples/fips_validation/fips_validation.c +3 -3
@@ -270,11 +270,11 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_PREFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_PREFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_PREFIX )) info.file_type =FIPS_TYPE_FAX ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +44 -4
84 lines not on this page · raw message
examples/fips_validation/main.c +2 -0
@@ -1251,6 +1251,8 @@ fips_generic_test(void)if (ret <0 )return ret;break ; +default : +break ; }fprintf (info.fp_wr,"\n" );
Signature · 1 line
2.25.1
PATCH v8 3/10 examples/fips_validation: add json parsing
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added functions to parse the required information from a vector set given in the new json format.
---
v7:
* pulled json_info define from next patch.
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
--- examples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ examples/fips_validation/main.c | 4 + 2 files changed, 96 insertions(+)
examples/fips_validation/fips_validation.c +92 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PREFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PREFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +strcpy (info.one_line_text,json_string_value (param)); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
examples/fips_validation/main.c +4 -0
@@ -39,6 +39,10 @@ enum {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;
Signature · 1 line
2.25.1
PATCH v8 4/10 examples/fips_validation: allow json file as input
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added the ability to use the json format as the input and output of the example application.
--
v8:
* dont steal refcount on write_set using _new as latter is updated subsequently in same function.
* fix fips_test_one_test_case to handle error code hence avoid incorrect test data in response file since a test run for json req file.
* Do not show bypass string in response for json file test.
v5:
* fix to check info.file_type in json file type as well.
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
--- examples/fips_validation/main.c | 206 +++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +203 -3
@@ -34,6 +34,8 @@ 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;
@@ -170,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) {
@@ -429,8 +436,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -485,7 +501,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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);
@@ -1223,11 +1249,15 @@ 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 ) {if (ret == -EPERM || ret == -ENOTSUP ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n\n" );return 0 ; }
@@ -1242,6 +1272,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);
@@ -1259,7 +1290,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 ;
@@ -1294,6 +1326,9 @@ fips_mct_tdes_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n" );return 0 ; }
@@ -1455,6 +1490,9 @@ fips_mct_aes_ecb_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n" );return 0 ; }
@@ -1537,6 +1575,9 @@ fips_mct_aes_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n" );return 0 ; }
@@ -1667,6 +1708,9 @@ fips_mct_sha_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM || ret == -ENOTSUP ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n\n" );return 0 ; }
@@ -1850,3 +1894,159 @@ 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 ) || (ret == -EPERM || ret == -ENOTSUP )) +break ; +RTE_LOG (ERR ,USER1 ,"Error %i: test block\n" , + ret); +break ; +default : +RTE_LOG (ERR ,USER1 ,"Error %i: Parse block\n" , + ret); + } +return ret; +} + +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); +if (fips_test_one_test_case () ==0 ) +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 (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 */
Signature · 1 line
2.25.1
PATCH v8 5/10 examples/fips_validation: add json to gcm test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v8:
* reset IV generation var in every test group as initialization.
v3:
* fix checkpatch warnings
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 152 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 156 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.h +3 -0
@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_gcm.c +151 -1
179 lines not on this page · raw message
examples/fips_validation/main.c +2 -1
@@ -1955,11 +1955,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret;
Signature · 1 line
2.25.1
PATCH v8 6/10 examples/fips_validation: add json to hmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds JSON support for the HMAC algorithm.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)
examples/fips_validation/fips_validation.c +2 -0
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +6 -0
@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_hmac.c +93 -0
108 lines not on this page · raw message
examples/fips_validation/main.c +3 -0
@@ -1957,6 +1957,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v8 7/10 examples/fips_validation: implement json cmac test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Implemented JSON support for the CMAC test.
---
v5:
* parser_read_cmac_direction_str is static.
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_cmac.c | 80 +++++++++++++++++++ 2 files changed, 83 insertions(+)
examples/fips_validation/fips_validation.h +3 -0
@@ -259,6 +259,9 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_cmac.c +80 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v8 8/10 examples/fips_validation: add parsing for cmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added function to parse algorithm for CMAC test.
--
v5:
* parser_read_cmac_direction_str implementation moved to static.
--- examples/fips_validation/fips_validation.c | 19 ++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +16 -3
@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;
@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {
@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , +json_integer_value (param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */
examples/fips_validation/main.c +3 -0
@@ -1960,6 +1960,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v8 9/10 examples/fips_validation: add parsing for aes_cbc
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES_CBC test.
--
v6:
* fixed local variable initialization in fips_mct_aes_test.
--- examples/fips_validation/fips_validation.c | 8 +- examples/fips_validation/fips_validation.h | 4 + .../fips_validation/fips_validation_aes.c | 223 ++++++++++++++++++ examples/fips_validation/main.c | 76 ++++-- 4 files changed, 284 insertions(+), 27 deletions(-)
examples/fips_validation/fips_validation.c +5 -3
@@ -120,7 +120,7 @@ fips_test_parse_header(void)for (i =0 ; i < info.nb_vec_lines; i++) {if (!algo_parsed) { -if (strstr (info.vec[i],"AESVS" )) { +if (strstr (info.vec[i],"AES" )) { algo_parsed =1 ; info.algo =FIPS_TEST_ALGO_AES ; ret =parse_test_aes_init ();
@@ -458,10 +458,12 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; -if (strstr (algo_str,"HMAC" )) +else if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; -if (strstr (algo_str,"CMAC" )) +else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ; +else if (strstr (algo_str,"AES-CBC" )) + info.algo =FIPS_TEST_ALGO_AES ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +4 -0
@@ -103,6 +103,7 @@ enum fips_aesavs_test_types {AESAVS_TYPE_VARTXT ,AESAVS_TYPE_MMT ,AESAVS_TYPE_MCT , + AESAVS_TYPE_AFT, }; enum fips_tdes_test_types {
@@ -262,6 +263,9 @@ parse_test_hmac_json_algorithm(void);int parse_test_cmac_json_init (void ); + +int +parse_test_aes_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_aes.c +223 -0
247 lines not on this page · raw message
examples/fips_validation/main.c +52 -24
150 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v8 10/10 doc: add notes about acvp validation support
In reply to Gowrishankar MuthukrishnanAdd notes on algorithms supported for ACVP validation.
--- doc/guides/sample_app_ug/fips_validation.rst | 30 +++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-)
doc/guides/sample_app_ug/fips_validation.rst +23 -7
@@ -12,19 +12,22 @@ developed by the United States federal government for use in computer systems by non-military government agencies and government contractors. This application is used to parse and perform symmetric cryptography -computation to the NIST Cryptographic Algorithm Validation Program (CAVP) test -vectors. +computation to the NIST Cryptographic Algorithm Validation Program (CAVP) and +Automated Crypto Validation Protocol (ACVP) test vectors. For an algorithm implementation to be listed on a cryptographic module validation certificate as an Approved security function, the algorithm -implementation must meet all the requirements of FIPS 140-2 and must -successfully complete the cryptographic algorithm validation process. +implementation must meet all the requirements of FIPS 140-2 (in case of CAVP) +and FIPS 140-3 (in case of ACVP) and must successfully complete the +cryptographic algorithm validation process. Limitations ----------- -* Only NIST CAVP request files are parsed by this application. -* The version of request file supported is ``CAVS 21.0`` +CAVP +---- + +* The version of request file supported is ``CAVS 21.0``. * If the header comment in a ``.req`` file does not contain a Algo tag i.e ``AES,TDES,GCM`` you need to manually add it into the header comment for example::
@@ -32,7 +35,7 @@ Limitations # VARIABLE KEY - KAT for CBC / # TDES VARIABLE KEY - KAT for CBC * The application does not supply the test vectors. The user is expected to - obtain the test vector files from `NIST + obtain the test vector files from `NIST ACVP <https://csrc.nist.gov/projects/cryptographic-algorithm-validation- program/block-ciphers>`_ website. To obtain the ``.req`` files you need to email a person from the NIST website and pay for the ``.req`` files.
@@ -48,6 +51,19 @@ Limitations * TDES-CBC (1 Key, 2 Keys, 3 Keys) - MMT, Monte, Permop, Subkey, Varkey, VarText +ACVP +---- + +* The application does not supply the test vectors. The user is expected to + obtain the test vector files from `NIST ACVP <https://pages.nist.gov/ACVP>`_ + website. +* Supported test vectors + * AES-CBC (128,192,256) - AFT, MCT + * AES-GCM (128,192,256) - AFT + * AES-CMAC (128,192,256) - AFT + * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512) + + Application Information -----------------------
Signature · 1 line
2.25.1
v9 cover Add JSON vector set support to fips validation
In reply to Gowrishankar MuthukrishnanAdds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v9:
* doc update.
v8:
* Fixed overlapped places for FIPS 140-2 test vectors.
v7:
* Fixed individual patches to build correctly.
v6:
* CI centos platform fix.
v5:
* AES_CBC support appended in series.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
Gowrishankar Muthukrishnan (2):
examples/fips_validation: add parsing for aes_cbc
doc: add notes about acvp validation support
doc/guides/sample_app_ug/fips_validation.rst | 30 +- examples/fips_validation/fips_validation.c | 117 ++++++- examples/fips_validation/fips_validation.h | 64 +++- .../fips_validation/fips_validation_aes.c | 223 +++++++++++++ .../fips_validation/fips_validation_cmac.c | 80 +++++ .../fips_validation/fips_validation_gcm.c | 152 ++++++++- .../fips_validation/fips_validation_hmac.c | 93 ++++++ examples/fips_validation/main.c | 295 ++++++++++++++++-- examples/fips_validation/meson.build | 4 + 9 files changed, 1015 insertions(+), 43 deletions(-)
Signature · 1 line
2.25.1
PATCH v9 1/10 examples/fips_validation: add jansson dependency
From: Brandon Lo <[email protected]>
Added a check for RTE_HAS_JANSSON into the meson
configuration file for JSON support.
--- examples/fips_validation/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
examples/fips_validation/meson.build +4 -0
@@ -21,3 +21,7 @@ sources = files( 'fips_dev_self_test.c', 'main.c', ) + +if dpdk_conf.has('RTE_HAS_JANSSON') + ext_deps += jansson_dep +endif
Signature · 1 line
2.25.1
PATCH v9 2/10 examples/fips_validation: add json info to header
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added json-specific functions and other information needed to test the new FIPS test vectors.
---
v7:
* fix switch clause for info.file_type.
v5:
* fix typo in macro name for prefixes.
v2:
* fix type of prefix to suffix
--- examples/fips_validation/fips_validation.c | 6 +-- examples/fips_validation/fips_validation.h | 48 ++++++++++++++++++++-- examples/fips_validation/main.c | 2 + 3 files changed, 49 insertions(+), 7 deletions(-)
examples/fips_validation/fips_validation.c +3 -3
@@ -270,11 +270,11 @@ parse_file_type(const char *path) {const char *tmp = path +strlen (path) -3 ; -if (strstr (tmp,REQ_FILE_PERFIX )) +if (strstr (tmp,REQ_FILE_PREFIX )) info.file_type =FIPS_TYPE_REQ ; -else if (strstr (tmp,RSP_FILE_PERFIX )) +else if (strstr (tmp,RSP_FILE_PREFIX )) info.file_type =FIPS_TYPE_RSP ; -else if (strstr (path,FAX_FILE_PERFIX )) +else if (strstr (path,FAX_FILE_PREFIX )) info.file_type =FIPS_TYPE_FAX ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +44 -4
84 lines not on this page · raw message
examples/fips_validation/main.c +2 -0
@@ -1251,6 +1251,8 @@ fips_generic_test(void)if (ret <0 )return ret;break ; +default : +break ; }fprintf (info.fp_wr,"\n" );
Signature · 1 line
2.25.1
PATCH v9 3/10 examples/fips_validation: add json parsing
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added functions to parse the required information from a vector set given in the new json format.
---
v7:
* pulled json_info define from next patch.
v3:
* fix checkpatch warnings
v2:
* fix for loop initialization
--- examples/fips_validation/fips_validation.c | 92 ++++++++++++++++++++++ examples/fips_validation/main.c | 4 + 2 files changed, 96 insertions(+)
examples/fips_validation/fips_validation.c +92 -0
@@ -276,6 +276,8 @@ parse_file_type(const char *path) info.file_type =FIPS_TYPE_RSP ; else if (strstr(path, FAX_FILE_PREFIX)) info.file_type = FIPS_TYPE_FAX; + else if (strstr(path, JSON_FILE_PREFIX)) + info.file_type = FIPS_TYPE_JSON; else return -EINVAL;
@@ -311,6 +313,21 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) { +#ifdef RTE_HAS_JANSSON +json_error_t error; + json_info.json_root =json_loadf (info.fp_rd,0 , &error); +if (!json_info.json_root) { +RTE_LOG (ERR ,USER1 ,"Cannot parse json file %s (line %d, column %d)\n" , + req_file_path, error.line, error.column); +return -EINVAL ; + } +#else /* RTE_HAS_JANSSON */ +RTE_LOG (ERR ,USER1 ,"No json library configured.\n" ); +return -EINVAL ; +#endif /* RTE_HAS_JANSSON */ + } + info.fp_wr =fopen (rsp_file_path,"w" );if (!info.fp_wr) {RTE_LOG (ERR ,USER1 ,"Cannot open file %s\n" , rsp_file_path);
@@ -329,6 +346,9 @@ fips_test_init(const char *req_file_path, const char *rsp_file_path,return -EINVAL ; } +if (info.file_type ==FIPS_TYPE_JSON ) +return 0 ; +if (fips_test_parse_header () <0 ) {RTE_LOG (ERR ,USER1 ,"Failed parsing header\n" );return -1 ;
@@ -428,6 +448,78 @@ fips_test_write_one_case(void)fprintf (info.fp_wr,"%s\n" , info.vec[i]); } +#ifdef RTE_HAS_JANSSON +int +fips_test_parse_one_json_vector_set (void ) +{ +json_t *algo_obj =json_object_get (json_info.json_vector_set,"algorithm" ); +const char *algo_str =json_string_value (algo_obj); + +/* Vector sets contain the algorithm type, and nothing else we need. */ +if (strstr (algo_str,"AES-GCM" )) + info.algo =FIPS_TEST_ALGO_AES_GCM ; +else +return -EINVAL ; + +return 0 ; +} + +int +fips_test_parse_one_json_group (void ) +{ +int ret, i; +json_int_t val; +json_t *param; + +if (info.interim_callbacks) { +char json_value[256 ]; +for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_group, + info.interim_callbacks[i].key); + val =json_integer_value (param); +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.interim_callbacks[i].cb ( +"" , json_value, + info.interim_callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} + +int +fips_test_parse_one_json_case (void ) +{ +uint32_t i; +int ret =0 ; +json_t *param; + +for (i =0 ; info.callbacks[i].key !=NULL ; i++) { + param =json_object_get (json_info.json_test_case, info.callbacks[i].key); +if (param) { +strcpy (info.one_line_text,json_string_value (param)); +/* First argument is blank because the key +* is not included in the string being parsed. +*/ + ret = info.callbacks[i].cb ( +"" , info.one_line_text, + info.callbacks[i].val + ); +if (ret <0 ) +return ret; + } + } + +return 0 ; +} +#endif /* RTE_HAS_JANSSON */ +static int parser_read_uint64_hex (uint64_t *value,const char *p) {
examples/fips_validation/main.c +4 -0
@@ -39,6 +39,10 @@ enum {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;
Signature · 1 line
2.25.1
PATCH v9 4/10 examples/fips_validation: allow json file as input
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added the ability to use the json format as the input and output of the example application.
--
v8:
* dont steal refcount on write_set using _new as latter is updated subsequently in same function.
* fix fips_test_one_test_case to handle error code hence avoid incorrect test data in response file since a test run for json req file.
* Do not show bypass string in response for json file test.
v5:
* fix to check info.file_type in json file type as well.
v3:
* fix checkpatch warnings
v2:
* remove use_json variable
--- examples/fips_validation/main.c | 206 +++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 3 deletions(-)
examples/fips_validation/main.c +203 -3
@@ -34,6 +34,8 @@ 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;
@@ -170,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) {
@@ -429,8 +436,17 @@ main(int argc, char *argv[]) goto exit; } - +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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, env.req_path);
@@ -485,7 +501,17 @@ main(int argc, char *argv[])break ; } +#ifdef RTE_HAS_JANSSON +if (info.file_type ==FIPS_TYPE_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);
@@ -1223,11 +1249,15 @@ 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 ) {if (ret == -EPERM || ret == -ENOTSUP ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n\n" );return 0 ; }
@@ -1242,6 +1272,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);
@@ -1259,7 +1290,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 ;
@@ -1294,6 +1326,9 @@ fips_mct_tdes_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n" );return 0 ; }
@@ -1455,6 +1490,9 @@ fips_mct_aes_ecb_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n" );return 0 ; }
@@ -1537,6 +1575,9 @@ fips_mct_aes_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n" );return 0 ; }
@@ -1667,6 +1708,9 @@ fips_mct_sha_test(void) ret =fips_run_test ();if (ret <0 ) {if (ret == -EPERM || ret == -ENOTSUP ) { +if (info.file_type ==FIPS_TYPE_JSON ) +return ret; +fprintf (info.fp_wr,"Bypass\n\n" );return 0 ; }
@@ -1850,3 +1894,159 @@ 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 ) || (ret == -EPERM || ret == -ENOTSUP )) +break ; +RTE_LOG (ERR ,USER1 ,"Error %i: test block\n" , + ret); +break ; +default : +RTE_LOG (ERR ,USER1 ,"Error %i: Parse block\n" , + ret); + } +return ret; +} + +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); +if (fips_test_one_test_case () ==0 ) +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 (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 */
Signature · 1 line
2.25.1
PATCH v9 5/10 examples/fips_validation: add json to gcm test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds json-specific testing and writeback function. Allows the user to test AES-GCM vector sets.
---
v8:
* reset IV generation var in every test group as initialization.
v3:
* fix checkpatch warnings
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_gcm.c | 152 +++++++++++++++++- examples/fips_validation/main.c | 3 +- 3 files changed, 156 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.h +3 -0
@@ -250,6 +250,9 @@ fips_test_parse_one_json_group(void);int fips_test_parse_one_json_case (void ); + +int +parse_test_gcm_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_gcm.c +151 -1
179 lines not on this page · raw message
examples/fips_validation/main.c +2 -1
@@ -1955,11 +1955,12 @@ fips_test_one_test_group(void)switch (info.algo) {case FIPS_TEST_ALGO_AES_GCM : - ret =parse_test_gcm_init (); + ret =parse_test_gcm_json_init ();break ;default :return -EINVAL ; } +if (ret <0 )return ret;
Signature · 1 line
2.25.1
PATCH v9 6/10 examples/fips_validation: add json to hmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Adds JSON support for the HMAC algorithm.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 6 ++ .../fips_validation/fips_validation_hmac.c | 93 +++++++++++++++++++ examples/fips_validation/main.c | 3 + 4 files changed, 104 insertions(+)
examples/fips_validation/fips_validation.c +2 -0
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; +if (strstr (algo_str,"HMAC" )) + info.algo =FIPS_TEST_ALGO_HMAC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +6 -0
@@ -253,6 +253,12 @@ fips_test_parse_one_json_case(void);int parse_test_gcm_json_init (void ); + +int +parse_test_hmac_json_init (void ); + +int +parse_test_hmac_json_algorithm (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_hmac.c +93 -0
108 lines not on this page · raw message
examples/fips_validation/main.c +3 -0
@@ -1957,6 +1957,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_GCM : ret =parse_test_gcm_json_init ();break ; +case FIPS_TEST_ALGO_HMAC : + ret =parse_test_hmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v9 7/10 examples/fips_validation: implement json cmac test
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Implemented JSON support for the CMAC test.
---
v5:
* parser_read_cmac_direction_str is static.
--- examples/fips_validation/fips_validation.h | 3 + .../fips_validation/fips_validation_cmac.c | 80 +++++++++++++++++++ 2 files changed, 83 insertions(+)
examples/fips_validation/fips_validation.h +3 -0
@@ -259,6 +259,9 @@ parse_test_hmac_json_init(void);int parse_test_hmac_json_algorithm (void ); + +int +parse_test_cmac_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_cmac.c +80 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v9 8/10 examples/fips_validation: add parsing for cmac
In reply to Gowrishankar MuthukrishnanFrom: Brandon Lo <[email protected]>
Added function to parse algorithm for CMAC test.
--
v5:
* parser_read_cmac_direction_str implementation moved to static.
--- examples/fips_validation/fips_validation.c | 19 ++++++++++++++++--- examples/fips_validation/main.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)
examples/fips_validation/fips_validation.c +16 -3
@@ -460,6 +460,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_GCM ;if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; +if (strstr (algo_str,"CMAC" )) + info.algo =FIPS_TEST_ALGO_AES_CMAC ;else return -EINVAL ;
@@ -470,7 +472,6 @@ intfips_test_parse_one_json_group (void) {int ret, i; -json_int_t val;json_t *param;if (info.interim_callbacks) {
@@ -478,8 +479,20 @@ fips_test_parse_one_json_group(void)for (i =0 ; info.interim_callbacks[i].key !=NULL ; i++) { param =json_object_get (json_info.json_test_group, info.interim_callbacks[i].key); - val =json_integer_value (param); -snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , val); +switch (json_typeof (param)) { +case JSON_STRING : +snprintf (json_value,256 ,"%s" ,json_string_value (param)); +break ; + +case JSON_INTEGER : +snprintf (json_value,255 ,"%" JSON_INTEGER_FORMAT , +json_integer_value (param)); +break ; + +default : +return -EINVAL ; + } +/* First argument is blank because the key * is not included in the string being parsed. */
examples/fips_validation/main.c +3 -0
@@ -1960,6 +1960,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_HMAC : ret =parse_test_hmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_CMAC : + ret =parse_test_cmac_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH v9 9/10 examples/fips_validation: add parsing for aes_cbc
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES_CBC test.
--
v6:
* fixed local variable initialization in fips_mct_aes_test.
--- examples/fips_validation/fips_validation.c | 8 +- examples/fips_validation/fips_validation.h | 4 + .../fips_validation/fips_validation_aes.c | 223 ++++++++++++++++++ examples/fips_validation/main.c | 76 ++++-- 4 files changed, 284 insertions(+), 27 deletions(-)
examples/fips_validation/fips_validation.c +5 -3
@@ -120,7 +120,7 @@ fips_test_parse_header(void)for (i =0 ; i < info.nb_vec_lines; i++) {if (!algo_parsed) { -if (strstr (info.vec[i],"AESVS" )) { +if (strstr (info.vec[i],"AES" )) { algo_parsed =1 ; info.algo =FIPS_TEST_ALGO_AES ; ret =parse_test_aes_init ();
@@ -458,10 +458,12 @@ fips_test_parse_one_json_vector_set(void)/* Vector sets contain the algorithm type, and nothing else we need. */ if (strstr (algo_str,"AES-GCM" )) info.algo =FIPS_TEST_ALGO_AES_GCM ; -if (strstr (algo_str,"HMAC" )) +else if (strstr (algo_str,"HMAC" )) info.algo =FIPS_TEST_ALGO_HMAC ; -if (strstr (algo_str,"CMAC" )) +else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ; +else if (strstr (algo_str,"AES-CBC" )) + info.algo =FIPS_TEST_ALGO_AES ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +4 -0
@@ -103,6 +103,7 @@ enum fips_aesavs_test_types {AESAVS_TYPE_VARTXT ,AESAVS_TYPE_MMT ,AESAVS_TYPE_MCT , + AESAVS_TYPE_AFT, }; enum fips_tdes_test_types {
@@ -262,6 +263,9 @@ parse_test_hmac_json_algorithm(void);int parse_test_cmac_json_init (void ); + +int +parse_test_aes_json_init (void );#endif /* RTE_HAS_JANSSON */ int
examples/fips_validation/fips_validation_aes.c +223 -0
247 lines not on this page · raw message
examples/fips_validation/main.c +52 -24
150 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v9 10/10 doc: add notes about acvp validation support
In reply to Gowrishankar MuthukrishnanAdd notes on algorithms supported for ACVP validation.
--- doc/guides/sample_app_ug/fips_validation.rst | 30 +++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-)
doc/guides/sample_app_ug/fips_validation.rst +23 -7
@@ -12,19 +12,22 @@ developed by the United States federal government for use in computer systems by non-military government agencies and government contractors. This application is used to parse and perform symmetric cryptography -computation to the NIST Cryptographic Algorithm Validation Program (CAVP) test -vectors. +computation to the NIST Cryptographic Algorithm Validation Program (CAVP) and +Automated Crypto Validation Protocol (ACVP) test vectors. For an algorithm implementation to be listed on a cryptographic module validation certificate as an Approved security function, the algorithm -implementation must meet all the requirements of FIPS 140-2 and must -successfully complete the cryptographic algorithm validation process. +implementation must meet all the requirements of FIPS 140-2 (in case of CAVP) +and FIPS 140-3 (in case of ACVP) and must successfully complete the +cryptographic algorithm validation process. Limitations ----------- -* Only NIST CAVP request files are parsed by this application. -* The version of request file supported is ``CAVS 21.0`` +CAVP +---- + +* The version of request file supported is ``CAVS 21.0``. * If the header comment in a ``.req`` file does not contain a Algo tag i.e ``AES,TDES,GCM`` you need to manually add it into the header comment for example::
@@ -32,7 +35,7 @@ Limitations # VARIABLE KEY - KAT for CBC / # TDES VARIABLE KEY - KAT for CBC * The application does not supply the test vectors. The user is expected to - obtain the test vector files from `NIST + obtain the test vector files from `CAVP <https://csrc.nist.gov/projects/cryptographic-algorithm-validation- program/block-ciphers>`_ website. To obtain the ``.req`` files you need to email a person from the NIST website and pay for the ``.req`` files.
@@ -48,6 +51,19 @@ Limitations * TDES-CBC (1 Key, 2 Keys, 3 Keys) - MMT, Monte, Permop, Subkey, Varkey, VarText +ACVP +---- + +* The application does not supply the test vectors. The user is expected to + obtain the test vector files from `ACVP <https://pages.nist.gov/ACVP>`_ + website. +* Supported test vectors + * AES-CBC (128,192,256) - AFT, MCT + * AES-GCM (128,192,256) - AFT + * AES-CMAC (128,192,256) - AFT + * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512) + + Application Information -----------------------
Signature · 1 line
2.25.1
Hey everyone,
FIPS-140-2 tested and passed.
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Monday 30 May 2022 16:53
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Gowrishankar Muthukrishnan <[email protected]>
Subject: [v9, 00/10] Add JSON vector set support to fips validation
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
v9:
* doc update.
v8:
* Fixed overlapped places for FIPS 140-2 test vectors.
v7:
* Fixed individual patches to build correctly.
v6:
* CI centos platform fix.
v5:
* AES_CBC support appended in series.
Brandon Lo (8):
examples/fips_validation: add jansson dependency examples/fips_validation: add json info to header examples/fips_validation: add json parsing examples/fips_validation: allow json file as input examples/fips_validation: add json to gcm test examples/fips_validation: add json to hmac examples/fips_validation: implement json cmac test examples/fips_validation: add parsing for cmac
Gowrishankar Muthukrishnan (2):
examples/fips_validation: add parsing for aes_cbc
doc: add notes about acvp validation support
doc/guides/sample_app_ug/fips_validation.rst | 30 +- examples/fips_validation/fips_validation.c | 117 ++++++- examples/fips_validation/fips_validation.h | 64 +++- .../fips_validation/fips_validation_aes.c | 223 +++++++++++++ .../fips_validation/fips_validation_cmac.c | 80 +++++ .../fips_validation/fips_validation_gcm.c | 152 ++++++++- .../fips_validation/fips_validation_hmac.c | 93 ++++++ examples/fips_validation/main.c | 295 ++++++++++++++++-- examples/fips_validation/meson.build | 4 + 9 files changed, 1015 insertions(+), 43 deletions(-)
--
2.25.1
Quoted 11 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Monday, May 30, 2022 4:53 PM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Gowrishankar Muthukrishnan <[email protected]>
Subject: [v9, 00/10] Add JSON vector set support to fips validation
Quoted 6 lines
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Quoted 9 lines
Quoted 8 lines
Subject: [v9, 00/10] Add JSON vector set support to fips validation
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Series-acked-by Fan Zhang <[email protected]>
Series Applied to dpdk-next-crypto
Thanks.
Quoted 9 lines · Akhil Goyal
Quoted 9 lines
Quoted 9 lines
Subject: [v9, 00/10] Add JSON vector set support to fips validation
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Quoted 3 lines
Quoted 1 line
Series-acked-by Fan Zhang <[email protected]>Series Applied to dpdk-next-crypto
This series breaks compiling the fips example out of DPDK.
## Building fips_validation/usr/bin/ld: /tmp/ccQjeHBg.o: in function `fips_test_init':
fips_validation.c:(.text+0x7ab): undefined reference to json_loadf' /usr/bin/ld: /tmp/ccQjeHBg.o: in function fips_test_parse_one_json_vector_set':
fips_validation.c:(.text+0xc2e): undefined reference to json_object_get' /usr/bin/ld: fips_validation.c:(.text+0xc36): undefined reference to json_string_value'/usr/bin/ld: /tmp/ccQjeHBg.o: in function `fips_test_parse_one_json_group':
fips_validation.c:(.text+0xd00): undefined reference to json_object_get' /usr/bin/ld: fips_validation.c:(.text+0xd14): undefined reference to json_integer_value'
etc...
I'll send a fix.
Signature · 1 line
David Marchand
Quoted 10 lines · David Marchand
Quoted 9 lines · Akhil Goyal
Quoted 9 lines
Quoted 9 lines
Subject: [v9, 00/10] Add JSON vector set support to fips validation
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Series-acked-by Fan Zhang <[email protected]>Series Applied to dpdk-next-crypto
This series breaks compiling the fips example out of DPDK.
Gowri, Fan, Akhil,
I disabled compilation checks for this example on my side. Can you look into this?
Thanks.
Signature · 1 line
David Marchand
Hi David,
Do you mean this patch ? - https://patches.dpdk.org/project/dpdk/patch/[email protected]/
I have acked this. @Akhil Goyal could this be merged ?.
Thanks,
Gowrishankar
Quoted 42 lines
-----Original Message-----
From: David Marchand <[email protected]>
Sent: Monday, June 13, 2022 5:29 PM
To: Gowrishankar Muthukrishnan <[email protected]>; Zhang, Roy Fan <[email protected]>; Akhil Goyal <[email protected]>
Cc: [email protected]; Dooley, Brian <[email protected]>; [email protected]; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob Kollanukkaran <[email protected]>
Subject: [EXT] Re: [v9, 00/10] Add JSON vector set support to fips validationExternal Email
----------------------------------------------------------------------
Quoted 11 lines · David Marchand
Quoted 10 lines · Akhil Goyal
Quoted 10 lines
Quoted 10 lines
Subject: [v9, 00/10] Add JSON vector set support to fips validation
Adds a very basic introduction to JSON vector sets in the fips validation example application. This patch set will only introduce the AES-GCM test using a JSON request file because the other algorithms need more information than what is given in the new JSON format.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Series-acked-by Fan Zhang <[email protected]>Series Applied to dpdk-next-crypto
This series breaks compiling the fips example out of DPDK.
Gowri, Fan, Akhil,
I disabled compilation checks for this example on my side. Can you look into this?
Thanks.
--
David Marchand
Hello,
Quoted 2 lines · Gowrishankar Muthukrishnan
Do you mean this patch ? - https://patches.dpdk.org/project/dpdk/patch/[email protected]/
I have acked this. @Akhil Goyal could this be merged ?.
Indeed, I had forgotten about it.
Akhil, please take it for rc2.
Signature · 1 line
David Marchand
Quoted 9 lines
Hello,
Quoted 2 lines · Gowrishankar Muthukrishnan
Do you mean this patch ? - https://patches.dpdk.org/project/dpdk/patch/[email protected]/
I have acked this. @Akhil Goyal could this be merged ?.Indeed, I had forgotten about it.
Akhil, please take it for rc2.
Sure, this patch was not delegated to me, so I did not notice this. I will take it for RC2
Quoted 7 lines · Akhil Goyal
Quoted 5 lines
Quoted 2 lines
Do you mean this patch ? - https://patches.dpdk.org/project/dpdk/patch/[email protected]/
I have acked this. @Akhil Goyal could this be merged ?.Indeed, I had forgotten about it.
Akhil, please take it for rc2.Sure, this patch was not delegated to me, so I did not notice this. I will take it for RC2
Thanks Akhil.
Signature · 1 line
David Marchand