d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/fips_validation: share callback with multiple keys

Browse Source 
Make use of key param in test callbacks so that,
test callback can be shared with multiple keys.

Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
Acked-by: Brian Dooley <brian.dooley@intel.com>
This commit is contained in:
Gowrishankar Muthukrishnan 2022-08-12 17:22:00 +05:30 committed by Akhil Goyal
parent 6ea24fc7b8
commit 0f42f3d603
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
examples/fips_validation/fips_validation.c
View File

@ -501,11 +501,8 @@ fips_test_parse_one_json_group(void)
return -EINVAL; return -EINVAL;
} }
/* First argument is blank because the key
* is not included in the string being parsed.
*/
ret = info.interim_callbacks[i].cb( ret = info.interim_callbacks[i].cb(
"", json_value, info.interim_callbacks[i].key, json_value,
info.interim_callbacks[i].val info.interim_callbacks[i].val
); );
if (ret < 0) if (ret < 0)
@ -527,11 +524,8 @@ fips_test_parse_one_json_case(void)
param = json_object_get(json_info.json_test_case, info.callbacks[i].key); param = json_object_get(json_info.json_test_case, info.callbacks[i].key);
if (param) { if (param) {
strcpy(info.one_line_text, json_string_value(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( ret = info.callbacks[i].cb(
"", info.one_line_text, info.callbacks[i].key, info.one_line_text,
info.callbacks[i].val info.callbacks[i].val
); );
if (ret < 0) if (ret < 0)
@ -627,7 +621,14 @@ parse_uint8_hex_str(const char *key, char *src, struct fips_val *val)
{ {
uint32_t len, j; uint32_t len, j;
#ifdef USE_JANSSON
/*
* Offset not applicable in case of JSON test vectors.
*/
RTE_SET_USED(key);
#else
src += strlen(key); src += strlen(key);
#endif
len = strlen(src) / 2; len = strlen(src) / 2;
@ -655,6 +656,15 @@ parse_uint8_hex_str(const char *key, char *src, struct fips_val *val)
return 0; return 0;
} }
#ifdef USE_JANSSON
int
parser_read_uint32_val(const char *key, char *src, struct fips_val *val)
{
RTE_SET_USED(key);
return parser_read_uint32(&val->len, src);
}
#else
int int
parser_read_uint32_val(const char *key, char *src, struct fips_val *val) parser_read_uint32_val(const char *key, char *src, struct fips_val *val)
{ {
@ -678,6 +688,7 @@ parser_read_uint32_val(const char *key, char *src, struct fips_val *val)
return ret; return ret;
} }
#endif
int int
parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val) parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val)