examples/fips_validation: add parsing for xts
PATCH 1/1 examples/fips_validation: add parsing for xts
Added function to parse algorithm for AES XTS test.
--- examples/fips_validation/fips_validation.c | 4 +- examples/fips_validation/fips_validation.h | 17 ++- .../fips_validation/fips_validation_xts.c | 126 ++++++++++++++++++ examples/fips_validation/main.c | 5 + 4 files changed, 150 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.c +3 -1
@@ -463,7 +463,9 @@ fips_test_parse_one_json_vector_set(void)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 ; + info.algo =FIPS_TEST_ALGO_AES_CBC ; +else if (strstr (algo_str,"AES-XTS" )) + info.algo =FIPS_TEST_ALGO_AES_XTS ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +16 -1
@@ -34,13 +34,14 @@enum fips_test_algorithms {FIPS_TEST_ALGO_AES =0 , +FIPS_TEST_ALGO_AES_CBC ,FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM , +FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES ,FIPS_TEST_ALGO_SHA , -FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_MAX };
@@ -170,7 +171,17 @@ struct gcm_interim_data {uint8_t gen_iv; }; + #ifdef USE_JANSSON +enum xts_tweak_modes { + XTS_TWEAK_MODE_HEX = 0, + XTS_TWEAK_MODE_NUMBER +}; + +struct xts_interim_data { + enum xts_tweak_modes tweak_mode; +}; + struct fips_test_json_info { /* Information used for reading from json */ json_t *json_root;
@@ -207,6 +218,7 @@ struct fips_test_interim_info {struct ccm_interim_data ccm_data;struct sha_interim_data sha_data;struct gcm_interim_data gcm_data; +struct xts_interim_data xts_data; } interim_info;enum fips_test_op op;
@@ -266,6 +278,9 @@ parse_test_cmac_json_init(void);int parse_test_aes_json_init (void ); + +int +parse_test_xts_json_init (void );#endif /* USE_JANSSON */ int
examples/fips_validation/fips_validation_xts.c +126 -0
138 lines not on this page · raw message
examples/fips_validation/main.c +5 -0
@@ -1781,6 +1781,7 @@ static intinit_test_ops (void) {switch (info.algo) { +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_aes_xform;
@@ -1988,6 +1989,10 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_CMAC : ret =parse_test_cmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_XTS : + ret =parse_test_xts_json_init (); +break ; +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : ret =parse_test_aes_json_init ();break ;
Signature · 1 line
2.25.1
Quoted 16 lines · Gowrishankar Muthukrishnan
Added function to parse algorithm for AES XTS test.
Signed-off-by Gowrishankar Muthukrishnan <[email protected]>--- examples/fips_validation/fips_validation.c | 4 +- examples/fips_validation/fips_validation.h | 17 ++- .../fips_validation/fips_validation_xts.c | 126 ++++++++++++++++++ examples/fips_validation/main.c | 5 + 4 files changed, 150 insertions(+), 2 deletions(-)examples/fips_validation/fips_validation.c +0
-0
examples/fips_validation/fips_validation.c fips_test_parse_one_json_vector_set(void) · line 466
Quoted 5 lines
examples/fips_validation/fips_validation.c +1
-1@@ -463,7 +463,9 @@ fips_test_parse_one_json_vector_set(void)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 ; + info.algo =FIPS_TEST_ALGO_AES_CBC ;
Is this part related to adding xts support?
It looks more like a fix.
Quoted 26 lines
examples/fips_validation/fips_validation.c +2
-0+else if (strstr (algo_str,"AES-XTS" )) + info.algo =FIPS_TEST_ALGO_AES_XTS ;else return -EINVAL ;examples/fips_validation/fips_validation.h +2
-1@@ -34,13 +34,14 @@enum fips_test_algorithms {FIPS_TEST_ALGO_AES =0 , +FIPS_TEST_ALGO_AES_CBC ,FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM , +FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES ,FIPS_TEST_ALGO_SHA , -FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_MAX };
examples/fips_validation/fips_validation.h struct gcm_interim_data { · line 174
Quoted 4 lines
examples/fips_validation/fips_validation.h +1
-0@@ -170,7 +171,17 @@ struct gcm_interim_data {uint8_t gen_iv; }; +
No need for another blank line.
Quoted 59 lines
examples/fips_validation/fips_validation.h +13
-0#ifdef USE_JANSSON +enum xts_tweak_modes { + XTS_TWEAK_MODE_HEX = 0, + XTS_TWEAK_MODE_NUMBER +}; + +struct xts_interim_data { + enum xts_tweak_modes tweak_mode; +}; + struct fips_test_json_info { /* Information used for reading from json */ json_t *json_root;@@ -207,6 +218,7 @@ struct fips_test_interim_info {struct ccm_interim_data ccm_data;struct sha_interim_data sha_data;struct gcm_interim_data gcm_data; +struct xts_interim_data xts_data; } interim_info;enum fips_test_op op;@@ -266,6 +278,9 @@ parse_test_cmac_json_init(void);int parse_test_aes_json_init (void ); + +int +parse_test_xts_json_init (void );#endif /* USE_JANSSON */ int examples/fips_validation/fips_validation_xts.c +16
-0@@ -24,6 +24,22 @@#define OP_ENC_STR "ENCRYPT"#define OP_DEC_STR "DECRYPT" +#define ALGO_JSON_STR "algorithm" +#define TESTTYPE_JSON_STR "testType" +#define DIR_JSON_STR "direction" +#define KEYLEN_JSON_STR "keyLen" +#define TWEAKMODE_JSON_STR "tweakMode" + +#define KEY_JSON_STR "key" +#define DATAUNITLEN_JSON_STR "dataUnitLen" +#define PAYLOADLEN_JSON_STR "payloadLen" +#define TWEAKVALUE_JSON_STR "tweakValue" +#define PT_JSON_STR "pt" +#define CT_JSON_STR "ct" + +#define OP_ENC_JSON_STR "encrypt" +#define OP_DEC_JSON_STR "decrypt" + static int parse_interim_xts_enc_dec(const char *key, __rte_unused char *text,
examples/fips_validation/fips_validation_xts.c struct fips_test_callback xts_writeback_callbacks[] = { · line 81
Quoted 4 lines
examples/fips_validation/fips_validation_xts.c +1
-0@@ -62,6 +78,116 @@ struct fips_test_callback xts_writeback_callbacks[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef RTE_HAS_JANSSON
Code in examples can't rely on internal RTE_HAS_JANSSON.
Signature · 1 line
David Marchand
Thanks David, I ack and have added your suggestions in V3.
Regards,
Gowrishankar
PATCH v2 1/1 examples/fips_validation: add parsing for xts
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES XTS test.
---
v2:
- build failure fixed if no jansson lib available.
--- examples/fips_validation/fips_validation.c | 4 +- examples/fips_validation/fips_validation.h | 16 +- .../fips_validation/fips_validation_xts.c | 141 ++++++++++++++++++ examples/fips_validation/main.c | 5 + 4 files changed, 164 insertions(+), 2 deletions(-)
examples/fips_validation/fips_validation.c +3 -1
@@ -463,7 +463,9 @@ fips_test_parse_one_json_vector_set(void)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 ; + info.algo =FIPS_TEST_ALGO_AES_CBC ; +else if (strstr (algo_str,"AES-XTS" )) + info.algo =FIPS_TEST_ALGO_AES_XTS ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +15 -1
@@ -34,13 +34,14 @@enum fips_test_algorithms {FIPS_TEST_ALGO_AES =0 , +FIPS_TEST_ALGO_AES_CBC ,FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM , +FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES ,FIPS_TEST_ALGO_SHA , -FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_MAX };
@@ -170,6 +171,15 @@ struct gcm_interim_data {uint8_t gen_iv; }; +enum xts_tweak_modes { +XTS_TWEAK_MODE_HEX =0 , +XTS_TWEAK_MODE_NUMBER +}; + +struct xts_interim_data { +enum xts_tweak_modes tweak_mode; +}; +#ifdef USE_JANSSON struct fips_test_json_info {/* Information used for reading from json */
@@ -207,6 +217,7 @@ struct fips_test_interim_info {struct ccm_interim_data ccm_data;struct sha_interim_data sha_data;struct gcm_interim_data gcm_data; +struct xts_interim_data xts_data; } interim_info;enum fips_test_op op;
@@ -266,6 +277,9 @@ parse_test_cmac_json_init(void);int parse_test_aes_json_init (void ); + +int +parse_test_xts_json_init (void );#endif /* USE_JANSSON */ int
examples/fips_validation/fips_validation_xts.c +141 -0
153 lines not on this page · raw message
examples/fips_validation/main.c +5 -0
@@ -1781,6 +1781,7 @@ static intinit_test_ops (void) {switch (info.algo) { +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_aes_xform;
@@ -1988,6 +1989,10 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_CMAC : ret =parse_test_cmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_XTS : + ret =parse_test_xts_json_init (); +break ; +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : ret =parse_test_aes_json_init ();break ;
Signature · 1 line
2.25.1
Hi,
Quoted 29 lines
-----Original Message-----
From: Gowrishankar Muthukrishnan <[email protected]>
Sent: Tuesday, June 28, 2022 2:12 PM
To: [email protected]
Cc: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>; Anoob Joseph <[email protected]>; Archana Muniganti <[email protected]>; Jerin Jacob <[email protected]>; Gowrishankar Muthukrishnan <[email protected]>
Subject: [PATCH v2] examples/fips_validation: add parsing for xtsAdded function to parse algorithm for AES XTS test.
Signed-off-by Gowrishankar Muthukrishnan <[email protected]>---
v2:
- build failure fixed if no jansson lib available.--- examples/fips_validation/fips_validation.c | 4 +- examples/fips_validation/fips_validation.h | 16 +- .../fips_validation/fips_validation_xts.c | 141 ++++++++++++++++++ examples/fips_validation/main.c | 5 + 4 files changed, 164 insertions(+), 2 deletions(-)examples/fips_validation/fips_validation.c +0
-0
examples/fips_validation/fips_validation.c fips_test_parse_one_json_vector_set(void) · line 465
Quoted 3 lines
examples/fips_validation/fips_validation.c +0
-0@@ -463,7 +463,9 @@ fips_test_parse_one_json_vector_set(void)else if (strstr (algo_str,"CMAC" )) info.algo =FIPS_TEST_ALGO_AES_CMAC ;else if (strstr (algo_str,"AES-CBC" ))
As David suggested - this looks to be a fix - I believe he is right. I will let Akhil to decide.
examples/fips_validation/fips_validation.c fips_test_parse_one_json_vector_set(void) · line 471
Quoted 7 lines
examples/fips_validation/fips_validation.c +3
-1- info.algo =FIPS_TEST_ALGO_AES ; + info.algo =FIPS_TEST_ALGO_AES_CBC ; + else if (strstr(algo_str, "AES-XTS")) + info.algo = FIPS_TEST_ALGO_AES_XTS; else return -EINVAL;
<snip>
Other than that,
v3 cover example/fips_validation: add xts and sha json parsing
In reply to Gowrishankar MuthukrishnanAdd support in fips_validation to parse AES_XTS and SHA json vectors.
v3:
- individual patches for xts and sha are clubbed in this new series.
Gowrishankar Muthukrishnan (3):
examples/fips_validation: add aes_cbc specific enum examples/fips_validation: add parsing for xts examples/fips_validation: add parsing for sha
examples/fips_validation/fips_validation.c | 6 +- examples/fips_validation/fips_validation.h | 26 ++- .../fips_validation/fips_validation_sha.c | 188 ++++++++++++++++++ .../fips_validation/fips_validation_xts.c | 141 +++++++++++++ examples/fips_validation/main.c | 44 +++- 5 files changed, 392 insertions(+), 13 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/3 examples/fips_validation: add aes_cbc specific enum
Add algorithm enum specifically for AES_CBC instead of relying on AES as such.
--- examples/fips_validation/fips_validation.c | 2 +- examples/fips_validation/fips_validation.h | 1 + examples/fips_validation/main.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
examples/fips_validation/fips_validation.c +1 -1
@@ -463,7 +463,7 @@ fips_test_parse_one_json_vector_set(void)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 ; + info.algo =FIPS_TEST_ALGO_AES_CBC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +1 -0
@@ -34,6 +34,7 @@enum fips_test_algorithms {FIPS_TEST_ALGO_AES =0 , +FIPS_TEST_ALGO_AES_CBC ,FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM ,
examples/fips_validation/main.c +1 -0
@@ -1781,6 +1781,7 @@ static intinit_test_ops (void) {switch (info.algo) { +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_aes_xform;
Signature · 1 line
2.25.1
PATCH v3 2/3 examples/fips_validation: add parsing for xts
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES XTS test.
---
v3:
- CBC related changes moved to 1/3 patch.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 15 +- .../fips_validation/fips_validation_xts.c | 141 ++++++++++++++++++ examples/fips_validation/main.c | 4 + 4 files changed, 161 insertions(+), 1 deletion(-)
examples/fips_validation/fips_validation.c +2 -0
@@ -464,6 +464,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_CMAC ; else if (strstr(algo_str, "AES-CBC")) info.algo = FIPS_TEST_ALGO_AES_CBC; + else if (strstr(algo_str, "AES-XTS")) + info.algo = FIPS_TEST_ALGO_AES_XTS; else return -EINVAL;
examples/fips_validation/fips_validation.h +14 -1
@@ -38,10 +38,10 @@ enum fips_test_algorithms {FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM , +FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES ,FIPS_TEST_ALGO_SHA , -FIPS_TEST_ALGO_AES_XTS , FIPS_TEST_ALGO_MAX };
@@ -171,6 +171,15 @@ struct gcm_interim_data {uint8_t gen_iv; }; +enum xts_tweak_modes { +XTS_TWEAK_MODE_HEX =0 , +XTS_TWEAK_MODE_NUMBER +}; + +struct xts_interim_data { +enum xts_tweak_modes tweak_mode; +}; +#ifdef USE_JANSSON struct fips_test_json_info {/* Information used for reading from json */
@@ -208,6 +217,7 @@ struct fips_test_interim_info {struct ccm_interim_data ccm_data;struct sha_interim_data sha_data;struct gcm_interim_data gcm_data; +struct xts_interim_data xts_data; } interim_info;enum fips_test_op op;
@@ -267,6 +277,9 @@ parse_test_cmac_json_init(void);int parse_test_aes_json_init (void ); + +int +parse_test_xts_json_init (void );#endif /* USE_JANSSON */ int
examples/fips_validation/fips_validation_xts.c +141 -0
153 lines not on this page · raw message
examples/fips_validation/main.c +4 -0
@@ -1989,6 +1989,10 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_CMAC : ret =parse_test_cmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_XTS : + ret =parse_test_xts_json_init (); +break ; +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : ret =parse_test_aes_json_init ();break ;
Signature · 1 line
2.25.1
PATCH v3 3/3 examples/fips_validation: add parsing for sha
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for SHA test.
---
v3:
- added a comment on flat array of fips_val for parse_writeback callback.
--- examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 10 + .../fips_validation/fips_validation_sha.c | 188 ++++++++++++++++++ examples/fips_validation/main.c | 39 +++- 4 files changed, 228 insertions(+), 11 deletions(-)
examples/fips_validation/fips_validation.c +2 -0
@@ -466,6 +466,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_CBC ; else if (strstr(algo_str, "AES-XTS")) info.algo = FIPS_TEST_ALGO_AES_XTS; + else if (strstr(algo_str, "SHA")) + info.algo = FIPS_TEST_ALGO_SHA; else return -EINVAL;
examples/fips_validation/fips_validation.h +10 -0
@@ -133,6 +133,7 @@ enum fips_ccm_test_types {enum fips_sha_test_types {SHA_KAT =0 , +SHA_AFT ,SHA_MCT };
@@ -280,6 +281,15 @@ parse_test_aes_json_init(void);int parse_test_xts_json_init (void ); + +int +parse_test_sha_json_init (void ); + +int +parse_test_sha_json_algorithm (void ); + +int +parse_test_sha_json_test_type (void );#endif /* USE_JANSSON */ int
examples/fips_validation/fips_validation_sha.c +188 -0
203 lines not on this page · raw message
examples/fips_validation/main.c +28 -11
@@ -1693,19 +1693,26 @@ fips_mct_sha_test(void)#define SHA_EXTERN_ITER 100#define SHA_INTERN_ITER 1000#define SHA_MD_BLOCK 3 -struct fips_val val = {NULL ,0 }, md[SHA_MD_BLOCK ]; +/* val[0] is op result and other value is for parse_writeback callback */ +struct fips_val val[2 ] = {{NULL ,0 },}; +struct fips_val md[SHA_MD_BLOCK ], msg;char temp[MAX_DIGEST_SIZE *2 ];int ret;uint32_t i, j; + msg.len =SHA_MD_BLOCK * vec.cipher_auth.digest.len; + msg.val =calloc (1 , msg.len); +memcpy (vec.cipher_auth.digest.val, vec.pt.val, vec.cipher_auth.digest.len);for (i =0 ; i <SHA_MD_BLOCK ; i++) md[i].val =rte_malloc (NULL , (MAX_DIGEST_SIZE *2 ),0 );rte_free (vec.pt.val); vec.pt.val =rte_malloc (NULL , (MAX_DIGEST_SIZE *SHA_MD_BLOCK ),0 ); -fips_test_write_one_case (); -fprintf (info.fp_wr,"\n" ); +if (info.file_type !=FIPS_TYPE_JSON ) { +fips_test_write_one_case (); +fprintf (info.fp_wr,"\n" ); + }for (j =0 ; j <SHA_EXTERN_ITER ; j++) {
@@ -1719,6 +1726,9 @@ fips_mct_sha_test(void) vec.cipher_auth.digest.len); md[2 ].len = vec.cipher_auth.digest.len; +for (i =0 ; i <SHA_MD_BLOCK ; i++) +memcpy (&msg.val[i * md[i].len], md[i].val, md[i].len); +for (i =0 ; i < (SHA_INTERN_ITER ); i++) { memcpy(vec.pt.val, md[0].val,
@@ -1742,7 +1752,7 @@ fips_mct_sha_test(void)return ret; } - ret =get_writeback_data (&val); + ret =get_writeback_data (&val[0 ]);if (ret <0 )return ret;
@@ -1751,7 +1761,7 @@ fips_mct_sha_test(void)memcpy (md[1 ].val, md[2 ].val, md[2 ].len); md[1 ].len = md[2 ].len; -memcpy (md[2 ].val, (val.val + vec.pt.len), +memcpy (md[2 ].val, (val[0 ].val + vec.pt.len), vec.cipher_auth.digest.len); md[2 ].len = vec.cipher_auth.digest.len; }
@@ -1759,11 +1769,14 @@ fips_mct_sha_test(void)memcpy (vec.cipher_auth.digest.val, md[2 ].val, md[2 ].len); vec.cipher_auth.digest.len = md[2 ].len; -fprintf (info.fp_wr,"COUNT = %u\n" , j); - -writeback_hex_str ("" , temp, &vec.cipher_auth.digest); - -fprintf (info.fp_wr,"MD = %s\n\n" , temp); +if (info.file_type !=FIPS_TYPE_JSON ) { +fprintf (info.fp_wr,"COUNT = %u\n" , j); +writeback_hex_str ("" , temp, &vec.cipher_auth.digest); +fprintf (info.fp_wr,"MD = %s\n\n" , temp); + } + val[1 ].val = msg.val; + val[1 ].len = msg.len; + info.parse_writeback (val); }for (i =0 ; i < (SHA_MD_BLOCK ); i++)
@@ -1771,7 +1784,8 @@ fips_mct_sha_test(void)rte_free (vec.pt.val); -free (val.val); +free (val[0 ].val); +free (msg.val);return 0 ; }
@@ -1996,6 +2010,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES : ret =parse_test_aes_json_init ();break ; +case FIPS_TEST_ALGO_SHA : + ret =parse_test_sha_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
v4 cover example/fips_validation: add xts and sha json parsing
In reply to Gowrishankar MuthukrishnanAdd support in fips_validation to parse AES_XTS and SHA json vectors.
v4:
- doc updates
Gowrishankar Muthukrishnan (3):
examples/fips_validation: add aes_cbc specific enum examples/fips_validation: add parsing for xts examples/fips_validation: add parsing for sha
doc/guides/sample_app_ug/fips_validation.rst | 2 + examples/fips_validation/fips_validation.c | 6 +- examples/fips_validation/fips_validation.h | 26 ++- .../fips_validation/fips_validation_sha.c | 188 ++++++++++++++++++ .../fips_validation/fips_validation_xts.c | 141 +++++++++++++ examples/fips_validation/main.c | 44 +++- 6 files changed, 394 insertions(+), 13 deletions(-)
Signature · 1 line
2.25.1
PATCH v4 1/3 examples/fips_validation: add aes_cbc specific enum
Add algorithm enum specifically for AES_CBC instead of relying on AES as such.
--- examples/fips_validation/fips_validation.c | 2 +- examples/fips_validation/fips_validation.h | 1 + examples/fips_validation/main.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)
examples/fips_validation/fips_validation.c +1 -1
@@ -463,7 +463,7 @@ fips_test_parse_one_json_vector_set(void)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 ; + info.algo =FIPS_TEST_ALGO_AES_CBC ;else return -EINVAL ;
examples/fips_validation/fips_validation.h +1 -0
@@ -34,6 +34,7 @@enum fips_test_algorithms {FIPS_TEST_ALGO_AES =0 , +FIPS_TEST_ALGO_AES_CBC ,FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM ,
examples/fips_validation/main.c +1 -0
@@ -1781,6 +1781,7 @@ static intinit_test_ops (void) {switch (info.algo) { +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_aes_xform;
Signature · 1 line
2.25.1
PATCH v4 2/3 examples/fips_validation: add parsing for xts
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for AES XTS test.
---
v4:
- doc update
--- doc/guides/sample_app_ug/fips_validation.rst | 1 + examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 15 +- .../fips_validation/fips_validation_xts.c | 141 ++++++++++++++++++ examples/fips_validation/main.c | 4 + 5 files changed, 162 insertions(+), 1 deletion(-)
doc/guides/sample_app_ug/fips_validation.rst +1 -0
@@ -61,6 +61,7 @@ ACVP * AES-CBC (128,192,256) - AFT, MCT * AES-GCM (128,192,256) - AFT * AES-CMAC (128,192,256) - AFT + * AES-XTS (128,256) - AFT * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512)
examples/fips_validation/fips_validation.c +2 -0
@@ -464,6 +464,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_CMAC ; else if (strstr(algo_str, "AES-CBC")) info.algo = FIPS_TEST_ALGO_AES_CBC; + else if (strstr(algo_str, "AES-XTS")) + info.algo = FIPS_TEST_ALGO_AES_XTS; else return -EINVAL;
examples/fips_validation/fips_validation.h +14 -1
@@ -38,10 +38,10 @@ enum fips_test_algorithms {FIPS_TEST_ALGO_AES_GCM ,FIPS_TEST_ALGO_AES_CMAC ,FIPS_TEST_ALGO_AES_CCM , +FIPS_TEST_ALGO_AES_XTS ,FIPS_TEST_ALGO_HMAC ,FIPS_TEST_ALGO_TDES ,FIPS_TEST_ALGO_SHA , -FIPS_TEST_ALGO_AES_XTS , FIPS_TEST_ALGO_MAX };
@@ -171,6 +171,15 @@ struct gcm_interim_data {uint8_t gen_iv; }; +enum xts_tweak_modes { +XTS_TWEAK_MODE_HEX =0 , +XTS_TWEAK_MODE_NUMBER +}; + +struct xts_interim_data { +enum xts_tweak_modes tweak_mode; +}; +#ifdef USE_JANSSON struct fips_test_json_info {/* Information used for reading from json */
@@ -208,6 +217,7 @@ struct fips_test_interim_info {struct ccm_interim_data ccm_data;struct sha_interim_data sha_data;struct gcm_interim_data gcm_data; +struct xts_interim_data xts_data; } interim_info;enum fips_test_op op;
@@ -267,6 +277,9 @@ parse_test_cmac_json_init(void);int parse_test_aes_json_init (void ); + +int +parse_test_xts_json_init (void );#endif /* USE_JANSSON */ int
examples/fips_validation/fips_validation_xts.c +141 -0
153 lines not on this page · raw message
examples/fips_validation/main.c +4 -0
@@ -1989,6 +1989,10 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES_CMAC : ret =parse_test_cmac_json_init ();break ; +case FIPS_TEST_ALGO_AES_XTS : + ret =parse_test_xts_json_init (); +break ; +case FIPS_TEST_ALGO_AES_CBC :case FIPS_TEST_ALGO_AES : ret =parse_test_aes_json_init ();break ;
Signature · 1 line
2.25.1
PATCH v4 3/3 examples/fips_validation: add parsing for sha
In reply to Gowrishankar MuthukrishnanAdded function to parse algorithm for SHA test.
---
v4:
- doc update
--- doc/guides/sample_app_ug/fips_validation.rst | 1 + examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 10 + .../fips_validation/fips_validation_sha.c | 188 ++++++++++++++++++ examples/fips_validation/main.c | 39 +++- 5 files changed, 229 insertions(+), 11 deletions(-)
doc/guides/sample_app_ug/fips_validation.rst +1 -0
@@ -63,6 +63,7 @@ ACVP * AES-CMAC (128,192,256) - AFT * AES-XTS (128,256) - AFT * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512) + * SHA (1,256) - AFT, MCT Application Information
examples/fips_validation/fips_validation.c +2 -0
@@ -466,6 +466,8 @@ fips_test_parse_one_json_vector_set(void) info.algo =FIPS_TEST_ALGO_AES_CBC ; else if (strstr(algo_str, "AES-XTS")) info.algo = FIPS_TEST_ALGO_AES_XTS; + else if (strstr(algo_str, "SHA")) + info.algo = FIPS_TEST_ALGO_SHA; else return -EINVAL;
examples/fips_validation/fips_validation.h +10 -0
@@ -133,6 +133,7 @@ enum fips_ccm_test_types {enum fips_sha_test_types {SHA_KAT =0 , +SHA_AFT ,SHA_MCT };
@@ -280,6 +281,15 @@ parse_test_aes_json_init(void);int parse_test_xts_json_init (void ); + +int +parse_test_sha_json_init (void ); + +int +parse_test_sha_json_algorithm (void ); + +int +parse_test_sha_json_test_type (void );#endif /* USE_JANSSON */ int
examples/fips_validation/fips_validation_sha.c +188 -0
203 lines not on this page · raw message
examples/fips_validation/main.c +28 -11
@@ -1693,19 +1693,26 @@ fips_mct_sha_test(void)#define SHA_EXTERN_ITER 100#define SHA_INTERN_ITER 1000#define SHA_MD_BLOCK 3 -struct fips_val val = {NULL ,0 }, md[SHA_MD_BLOCK ]; +/* val[0] is op result and other value is for parse_writeback callback */ +struct fips_val val[2 ] = {{NULL ,0 },}; +struct fips_val md[SHA_MD_BLOCK ], msg;char temp[MAX_DIGEST_SIZE *2 ];int ret;uint32_t i, j; + msg.len =SHA_MD_BLOCK * vec.cipher_auth.digest.len; + msg.val =calloc (1 , msg.len); +memcpy (vec.cipher_auth.digest.val, vec.pt.val, vec.cipher_auth.digest.len);for (i =0 ; i <SHA_MD_BLOCK ; i++) md[i].val =rte_malloc (NULL , (MAX_DIGEST_SIZE *2 ),0 );rte_free (vec.pt.val); vec.pt.val =rte_malloc (NULL , (MAX_DIGEST_SIZE *SHA_MD_BLOCK ),0 ); -fips_test_write_one_case (); -fprintf (info.fp_wr,"\n" ); +if (info.file_type !=FIPS_TYPE_JSON ) { +fips_test_write_one_case (); +fprintf (info.fp_wr,"\n" ); + }for (j =0 ; j <SHA_EXTERN_ITER ; j++) {
@@ -1719,6 +1726,9 @@ fips_mct_sha_test(void) vec.cipher_auth.digest.len); md[2 ].len = vec.cipher_auth.digest.len; +for (i =0 ; i <SHA_MD_BLOCK ; i++) +memcpy (&msg.val[i * md[i].len], md[i].val, md[i].len); +for (i =0 ; i < (SHA_INTERN_ITER ); i++) { memcpy(vec.pt.val, md[0].val,
@@ -1742,7 +1752,7 @@ fips_mct_sha_test(void)return ret; } - ret =get_writeback_data (&val); + ret =get_writeback_data (&val[0 ]);if (ret <0 )return ret;
@@ -1751,7 +1761,7 @@ fips_mct_sha_test(void)memcpy (md[1 ].val, md[2 ].val, md[2 ].len); md[1 ].len = md[2 ].len; -memcpy (md[2 ].val, (val.val + vec.pt.len), +memcpy (md[2 ].val, (val[0 ].val + vec.pt.len), vec.cipher_auth.digest.len); md[2 ].len = vec.cipher_auth.digest.len; }
@@ -1759,11 +1769,14 @@ fips_mct_sha_test(void)memcpy (vec.cipher_auth.digest.val, md[2 ].val, md[2 ].len); vec.cipher_auth.digest.len = md[2 ].len; -fprintf (info.fp_wr,"COUNT = %u\n" , j); - -writeback_hex_str ("" , temp, &vec.cipher_auth.digest); - -fprintf (info.fp_wr,"MD = %s\n\n" , temp); +if (info.file_type !=FIPS_TYPE_JSON ) { +fprintf (info.fp_wr,"COUNT = %u\n" , j); +writeback_hex_str ("" , temp, &vec.cipher_auth.digest); +fprintf (info.fp_wr,"MD = %s\n\n" , temp); + } + val[1 ].val = msg.val; + val[1 ].len = msg.len; + info.parse_writeback (val); }for (i =0 ; i < (SHA_MD_BLOCK ); i++)
@@ -1771,7 +1784,8 @@ fips_mct_sha_test(void)rte_free (vec.pt.val); -free (val.val); +free (val[0 ].val); +free (msg.val);return 0 ; }
@@ -1996,6 +2010,9 @@ fips_test_one_test_group(void)case FIPS_TEST_ALGO_AES : ret =parse_test_aes_json_init ();break ; +case FIPS_TEST_ALGO_SHA : + ret =parse_test_sha_json_init (); +break ;default :return -EINVAL ; }
Signature · 1 line
2.25.1
Akhil Goyal
AppliedRE: [EXT] [PATCH v4 0/3] example/fips_validation: add xts and sha json parsing
In reply to Gowrishankar MuthukrishnanQuoted 10 lines
Add support in
fips_validationto parseAES_XTSand SHA json vectors.v4:
- doc updatesGowrishankar Muthukrishnan (3):
examples/fips_validation: addaes_cbcspecific enum examples/fips_validation: add parsing for xts examples/fips_validation: add parsing for sha
Quoted 8 lines
doc/guides/sample_app_ug/fips_validation.rst | 2 + examples/fips_validation/fips_validation.c | 6 +- examples/fips_validation/fips_validation.h | 26 ++- .../fips_validation/fips_validation_sha.c | 188 ++++++++++++++++++ .../fips_validation/fips_validation_xts.c | 141 +++++++++++++ examples/fips_validation/main.c | 44 +++- 6 files changed, 394 insertions(+), 13 deletions(-)
Applied to dpdk-next-crypto
Thanks.