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

examples/fips_validation: fix parsing of TDES vectors

Browse Source 
Processing of test vector for COUNT = 0 is getting skipped, as
some of the NIST TDES files doesn't have an empty line after
[ENCRYPT]/[DECRYPT] and thus treated as an interim block.

Parse function now identifies such blocks, separates out interim
and test vector data, and then parses each with their respective
callbacks.

Fixes: 3d0fad56b74a ("examples/fips_validation: add crypto FIPS application")
Cc: stable@dpdk.org

Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Ayuj Verma <ayverma@marvell.com>
This commit is contained in:
Ayuj Verma 2020-06-11 19:14:16 +05:30 committed by Akhil Goyal
parent a18622864c
commit 32440cdf2a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
examples/fips_validation/fips_validation.c
View File

@ -340,11 +340,13 @@ int
fips_test_parse_one_case(void)
{
uint32_t i, j = 0;
uint32_t is_interim = 0;
uint32_t is_interim;
uint32_t interim_cnt = 0;
int ret;
if (info.interim_callbacks) {
for (i = 0; i < info.nb_vec_lines; i++) {
is_interim = 0;
for (j = 0; info.interim_callbacks[j].key != NULL; j++)
if (strstr(info.vec[i],
info.interim_callbacks[j].key)) {
@ -357,17 +359,24 @@ fips_test_parse_one_case(void)
if (ret < 0)
return ret;
}
if (is_interim)
interim_cnt += 1;
}
}
if (is_interim) {
for (i = 0; i < info.nb_vec_lines; i++)
info.vec_start_off = interim_cnt;
if (interim_cnt) {
for (i = 0; i < interim_cnt; i++)
fprintf(info.fp_wr, "%s\n", info.vec[i]);
fprintf(info.fp_wr, "\n");
return 1;
if (info.nb_vec_lines == interim_cnt)
return 1;
}
for (i = 0; i < info.nb_vec_lines; i++) {
for (i = info.vec_start_off; i < info.nb_vec_lines; i++) {
for (j = 0; info.callbacks[j].key != NULL; j++)
if (strstr(info.vec[i], info.callbacks[j].key)) {
ret = info.callbacks[j].cb(
@ -387,7 +396,7 @@ fips_test_write_one_case(void)
{
uint32_t i;
for (i = 0; i < info.nb_vec_lines; i++)
for (i = info.vec_start_off; i < info.nb_vec_lines; i++)
fprintf(info.fp_wr, "%s\n", info.vec[i]);
}

1
examples/fips_validation/fips_validation.h
View File

@ -161,6 +161,7 @@ struct fips_test_interim_info {
enum fips_test_algorithms algo;
char *one_line_text;
char *vec[MAX_LINE_PER_VECTOR];
uint32_t vec_start_off;
uint32_t nb_vec_lines;
char device_name[MAX_STRING_SIZE];
char file_name[MAX_STRING_SIZE];