fips_validation: Add plain SHA support
PATCH 1/1 fips_validation: Add plain SHA support
From: Damian Nowak <[email protected]>
This patch enables plain SHA algorithm CAVP test support in fips_validation sample application.
--- examples/fips_validation/Makefile | 1 + examples/fips_validation/fips_validation.c | 17 ++++ examples/fips_validation/fips_validation.h | 17 +++- examples/fips_validation/fips_validation_sha.c | 110 +++++++++++++++++++++++ examples/fips_validation/main.c | 119 +++++++++++++++++++++++++ examples/fips_validation/meson.build | 1 + 6 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 examples/fips_validation/fips_validation_sha.c
examples/fips_validation/Makefile +1 -0
@@ -12,6 +12,7 @@ SRCS-y += fips_validation_tdes.c SRCS-y += fips_validation_gcm.c SRCS-y += fips_validation_cmac.c SRCS-y += fips_validation_ccm.c +SRCS-y += fips_validation_sha.c SRCS-y += fips_dev_self_test.c SRCS-y += main.c
examples/fips_validation/fips_validation.c +17 -0
@@ -136,6 +136,11 @@ fips_test_parse_header(void) ret =parse_test_tdes_init ();if (ret <0 )return 0 ; + }else if (strstr (info.vec[i],"SHA-" )) { + info.algo =FIPS_TEST_ALGO_SHA ; + ret =parse_test_sha_init (); +if (ret <0 ) +return ret; } tmp =strstr (info.vec[i],"# Config info for " );
@@ -186,6 +191,18 @@ fips_test_parse_header(void)continue ; } + tmp =strstr (info.vec[i],"\" information for \"" ); +if (tmp !=NULL ) { +char tmp_output[128 ] = {0 }; + +strlcpy (tmp_output, info.vec[i], tmp - info.vec[i] +1 ); + +fprintf (info.fp_wr,"%s%s%s\n" , tmp_output, +"\" information for DPDK Cryptodev " , + info.device_name); +continue ; + } +if (i == info.nb_vec_lines -1 ) {/** update the time as current time, write to file */ fprintf(info.fp_wr, "%s%s\n", "# Generated on ",
examples/fips_validation/fips_validation.h +16 -1
@@ -14,6 +14,7 @@#define MAX_NB_TESTS 10240#define MAX_BUF_SIZE 2048#define MAX_STRING_SIZE 64 +#define MAX_DIGEST_SIZE 64#define POSITIVE_TEST 0#define NEGATIVE_TEST -1
@@ -29,6 +30,7 @@ enum fips_test_algorithms {FIPS_TEST_ALGO_AES_CCM ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES , +FIPS_TEST_ALGO_SHA , FIPS_TEST_ALGO_MAX };
@@ -111,6 +113,11 @@ enum fips_ccm_test_types { CCM_DVPT, /* Decryption-Verification Process Test */ }; +enum fips_sha_test_types { +SHA_KAT =0 , +SHA_MCT +}; +struct aesavs_interim_data {enum fips_aesavs_test_types test_type;uint32_t cipher_algo;
@@ -135,6 +142,11 @@ struct ccm_interim_data {uint32_t iv_len; }; +struct sha_interim_data { +enum fips_sha_test_types test_type; +enum rte_crypto_auth_algorithm algo; +}; +struct fips_test_interim_info {FILE *fp_rd;FILE *fp_wr;
@@ -150,7 +162,7 @@ struct fips_test_interim_info {struct hmac_interim_data hmac_data;struct tdes_interim_data tdes_data;struct ccm_interim_data ccm_data; - +struct sha_interim_data sha_data; } interim_info;enum fips_test_op op;
@@ -200,6 +212,9 @@ parse_test_cmac_init(void);int parse_test_ccm_init (void ); +int +parse_test_sha_init (void ); +int parser_read_uint8_hex (uint8_t *value,const char *p);
examples/fips_validation/fips_validation_sha.c new file +110 -0
110 lines not on this page · raw message
examples/fips_validation/main.c +119 -0
137 lines not on this page · raw message
examples/fips_validation/meson.build +1 -0
@@ -16,6 +16,7 @@ sources = files( 'fips_validation_gcm.c', 'fips_validation_cmac.c', 'fips_validation_ccm.c', + 'fips_validation_sha.c', 'fips_dev_self_test.c', 'main.c' )
Signature · 1 line
2.14.5
Quoted 5 lines
From: Damian Nowak <[email protected]>
This patch enables plain SHA algorithm CAVP test support in
fips_validationsample application.
Quoted 8 lines
Signed-off-by Damian Nowak <[email protected]>Acked-by Fan Zhang <[email protected]>--- examples/fips_validation/Makefile | 1 + examples/fips_validation/fips_validation.c | 17 ++++ examples/fips_validation/fips_validation.h | 17 +++- examples/fips_validation/fips_validation_sha.c | 110+++++++++++++++++++++++
All looks fine but the warnings can be avoided.
You can inherit my ack
Hi Damian,
Quoted 13 lines · Marko
Quoted 5 lines
From: Damian Nowak <[email protected]>
This patch enables plain SHA algorithm CAVP test support in
fips_validationsample application.Quoted 8 lines
Signed-off-by Damian Nowak <[email protected]>Acked-by Fan Zhang <[email protected]>--- examples/fips_validation/Makefile | 1 + examples/fips_validation/fips_validation.c | 17 ++++ examples/fips_validation/fips_validation.h | 17 +++- examples/fips_validation/fips_validation_sha.c | 110+++++++++++++++++++++++
Quoted 4 lines
All looks fine but the warnings can be avoided.
You can inherit my ackAcked-by Marko Kovacevic <[email protected]>
could you please send another version with warnings removed?
Thanks.
v2 cover fips_validation: Add plain SHA support
In reply to Fan ZhangThis patch enables plain SHA algorithm CAVP test support in fips_validation sample application.
---
v2: fix checkpatches issues
Damian Nowak (1):
fips_validation: Add plain SHA support
examples/fips_validation/Makefile | 1 + examples/fips_validation/fips_validation.c | 17 ++++ examples/fips_validation/fips_validation.h | 17 +++- examples/fips_validation/fips_validation_sha.c | 110 +++++++++++++++++++++ examples/fips_validation/main.c | 127 +++++++++++++++++++++++++ examples/fips_validation/meson.build | 1 + 6 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 examples/fips_validation/fips_validation_sha.c
Signature · 1 line
2.7.4
PATCH v2 1/1 fips_validation: Add plain SHA support
This patch enables plain SHA algorithm CAVP test support in fips_validation sample application.
--- examples/fips_validation/Makefile | 1 + examples/fips_validation/fips_validation.c | 17 ++++ examples/fips_validation/fips_validation.h | 17 +++- examples/fips_validation/fips_validation_sha.c | 110 +++++++++++++++++++++ examples/fips_validation/main.c | 127 +++++++++++++++++++++++++ examples/fips_validation/meson.build | 1 + 6 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 examples/fips_validation/fips_validation_sha.c
examples/fips_validation/Makefile +1 -0
@@ -12,6 +12,7 @@ SRCS-y += fips_validation_tdes.c SRCS-y += fips_validation_gcm.c SRCS-y += fips_validation_cmac.c SRCS-y += fips_validation_ccm.c +SRCS-y += fips_validation_sha.c SRCS-y += fips_dev_self_test.c SRCS-y += main.c
examples/fips_validation/fips_validation.c +17 -0
@@ -136,6 +136,11 @@ fips_test_parse_header(void) ret =parse_test_tdes_init ();if (ret <0 )return 0 ; + }else if (strstr (info.vec[i],"SHA-" )) { + info.algo =FIPS_TEST_ALGO_SHA ; + ret =parse_test_sha_init (); +if (ret <0 ) +return ret; } tmp =strstr (info.vec[i],"# Config info for " );
@@ -186,6 +191,18 @@ fips_test_parse_header(void)continue ; } + tmp =strstr (info.vec[i],"\" information for \"" ); +if (tmp !=NULL ) { +char tmp_output[128 ] = {0 }; + +strlcpy (tmp_output, info.vec[i], tmp - info.vec[i] +1 ); + +fprintf (info.fp_wr,"%s%s%s\n" , tmp_output, +"\" information for DPDK Cryptodev " , + info.device_name); +continue ; + } +if (i == info.nb_vec_lines -1 ) {/** update the time as current time, write to file */ fprintf(info.fp_wr, "%s%s\n", "# Generated on ",
examples/fips_validation/fips_validation.h +16 -1
@@ -14,6 +14,7 @@#define MAX_NB_TESTS 10240#define MAX_BUF_SIZE 2048#define MAX_STRING_SIZE 64 +#define MAX_DIGEST_SIZE 64#define POSITIVE_TEST 0#define NEGATIVE_TEST -1
@@ -29,6 +30,7 @@ enum fips_test_algorithms {FIPS_TEST_ALGO_AES_CCM ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES , +FIPS_TEST_ALGO_SHA , FIPS_TEST_ALGO_MAX };
@@ -111,6 +113,11 @@ enum fips_ccm_test_types { CCM_DVPT, /* Decryption-Verification Process Test */ }; +enum fips_sha_test_types { +SHA_KAT =0 , +SHA_MCT +}; +struct aesavs_interim_data {enum fips_aesavs_test_types test_type;uint32_t cipher_algo;
@@ -135,6 +142,11 @@ struct ccm_interim_data {uint32_t iv_len; }; +struct sha_interim_data { +enum fips_sha_test_types test_type; +enum rte_crypto_auth_algorithm algo; +}; +struct fips_test_interim_info {FILE *fp_rd;FILE *fp_wr;
@@ -150,7 +162,7 @@ struct fips_test_interim_info {struct hmac_interim_data hmac_data;struct tdes_interim_data tdes_data;struct ccm_interim_data ccm_data; - +struct sha_interim_data sha_data; } interim_info;enum fips_test_op op;
@@ -201,6 +213,9 @@ intparse_test_ccm_init (void);int +parse_test_sha_init (void ); + +int parser_read_uint8_hex (uint8_t *value,const char *p);int
examples/fips_validation/fips_validation_sha.c new file +110 -0
110 lines not on this page · raw message
examples/fips_validation/main.c +127 -0
145 lines not on this page · raw message
examples/fips_validation/meson.build +1 -0
@@ -16,6 +16,7 @@ sources = files( 'fips_validation_gcm.c', 'fips_validation_cmac.c', 'fips_validation_ccm.c', + 'fips_validation_sha.c', 'fips_dev_self_test.c', 'main.c' )
Signature · 1 line
2.7.4
Akhil Goyal
AppliedQuoted 8 lines · Damian Nowak
This patch enables plain SHA algorithm CAVP test support in
fips_validationsample application.Signed-off-by Damian Nowak <[email protected]>Acked-by Fan Zhang <[email protected]>Acked-by Marko Kovacevic <[email protected]>---
Applied to dpdk-next-crypto
Thanks.