Handle mixed algorithms on GEN3 QAT
v2 cover Handle mixed algorithms on GEN3 QAT
v2:
* Added release notes update.
Adam Dybkowski (2):
crypto/qat: handle mixed hash-cipher requests on GEN3 QAT test/crypto: add more tests for mixed encypted-digest
app/test/test_cryptodev.c | 470 ++++++- app/test/test_cryptodev_mixed_test_vectors.h | 1320 +++++++++++++++++- doc/guides/cryptodevs/qat.rst | 24 + doc/guides/rel_notes/release_20_02.rst | 7 + drivers/common/qat/qat_adf/icp_qat_fw.h | 3 + drivers/common/qat/qat_adf/icp_qat_fw_la.h | 2 + drivers/crypto/qat/qat_sym_session.c | 72 + 7 files changed, 1829 insertions(+), 69 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 crypto/qat: handle mixed hash-cipher requests on GEN3 QAT
This patch implements handling mixed encrypted digest hash-cipher requests (e.g. SNOW3G + ZUC or ZUC + AES CTR) possible when running on GEN3 QAT. Such algorithm combinations are not supported on GEN1/GEN2 hardware.
--- doc/guides/cryptodevs/qat.rst | 24 ++++++++ doc/guides/rel_notes/release_20_02.rst | 7 +++ drivers/common/qat/qat_adf/icp_qat_fw.h | 3 + drivers/common/qat/qat_adf/icp_qat_fw_la.h | 2 + drivers/crypto/qat/qat_sym_session.c | 72 ++++++++++++++++++++++ 5 files changed, 108 insertions(+)
doc/guides/cryptodevs/qat.rst +24 -0
@@ -72,6 +72,30 @@ Supported AEAD algorithms: * ``RTE_CRYPTO_AEAD_AES_CCM`` +Supported Chains +~~~~~~~~~~~~~~~~ + +All the usual chains are supported and also some mixed chains: + +.. table:: Supported hash-cipher chains for wireless digest-encrypted cases + + +------------------+-----------+-------------+----------+----------+ + | Cipher algorithm | NULL AUTH | SNOW3G UIA2 | ZUC EIA3 | AES CMAC | + +==================+===========+=============+==========+==========+ + | NULL CIPHER | Y | 3 | 3 | Y | + +------------------+-----------+-------------+----------+----------+ + | SNOW3G UEA2 | 3 | Y | 3 | 3 | + +------------------+-----------+-------------+----------+----------+ + | ZUC EEA3 | 3 | 3 | 2&3 | 3 | + +------------------+-----------+-------------+----------+----------+ + | AES CTR | Y | 3 | 3 | Y | + +------------------+-----------+-------------+----------+----------+ + +* The combinations marked as "Y" are supported on all QAT hardware versions. +* The combinations marked as "2&3" are supported on GEN2/GEN3 QAT hardware only. +* The combinations marked as "3" are supported on GEN3 QAT hardware only. + + Limitations ~~~~~~~~~~~
doc/guides/rel_notes/release_20_02.rst +7 -0
@@ -56,6 +56,13 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= + * **Added handling of mixed algorithms in encrypted digest requests in QAT PMD.** + + Added handling of mixed algorithms in encrypted digest hash-cipher + (generation) and cipher-hash (verification) requests (e.g. SNOW3G + ZUC or + ZUC + AES CTR) in QAT PMD possible when running on GEN3 QAT hardware. + Such algorithm combinations are not supported on GEN1/GEN2 hardware + and executing the request returns RTE_CRYPTO_OP_STATUS_INVALID_SESSION. Removed Items -------------
drivers/common/qat/qat_adf/icp_qat_fw.h +3 -0
@@ -175,6 +175,9 @@ struct icp_qat_fw_comn_resp {#define QAT_COMN_PTR_TYPE_SGL 0x1#define QAT_COMN_CD_FLD_TYPE_64BIT_ADR 0x0#define QAT_COMN_CD_FLD_TYPE_16BYTE_DATA 0x1 +#define QAT_COMN_EXT_FLAGS_BITPOS 8 +#define QAT_COMN_EXT_FLAGS_MASK 0x1 +#define QAT_COMN_EXT_FLAGS_USED 0x1#define ICP_QAT_FW_COMN_FLAGS_BUILD (cdt, ptr) \ ((((cdt) & QAT_COMN_CD_FLD_TYPE_MASK) << QAT_COMN_CD_FLD_TYPE_BITPOS) \
drivers/common/qat/qat_adf/icp_qat_fw_la.h +2 -0
@@ -273,6 +273,8 @@ struct icp_qat_fw_cipher_auth_cd_ctrl_hdr {#define ICP_QAT_FW_AUTH_HDR_FLAG_DO_NESTED 1#define ICP_QAT_FW_AUTH_HDR_FLAG_NO_NESTED 0 +#define ICP_QAT_FW_AUTH_HDR_FLAG_SNOW3G_UIA2_BITPOS 3 +#define ICP_QAT_FW_AUTH_HDR_FLAG_ZUC_EIA3_BITPOS 4#define ICP_QAT_FW_CCM_GCM_AAD_SZ_MAX 240#define ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET 24#define ICP_QAT_FW_CIPHER_REQUEST_PARAMETERS_OFFSET (0)
drivers/crypto/qat/qat_sym_session.c +72 -0
90 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/2 test/crypto: add more tests for mixed encypted-digest
In reply to Adam DybkowskiThis patch adds unit tests for QAT PMD for mixed encrypted-digest cases, involving SNOW3G UIA2, ZUC EIA3, AES CMAC and NULL auth algorithms together with SNOW3G UEA2, ZUC EEA3, AES CTR and NULL cipher algorithms in various combinations.
--- app/test/test_cryptodev.c | 470 ++++++- app/test/test_cryptodev_mixed_test_vectors.h | 1320 +++++++++++++++++- 2 files changed, 1721 insertions(+), 69 deletions(-)
app/test/test_cryptodev.c +403 -67
@@ -143,7 +143,7 @@ static struct rte_crypto_op * process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op) { if (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) { - printf("Error sending packet for encryption"); + printf("Error sending packet for encryption\n"); return NULL; }
@@ -2696,13 +2696,15 @@ create_wireless_algo_cipher_auth_session(uint8_t dev_id,/* Create Crypto session*/ ut_params->sess =rte_cryptodev_sym_session_create ( ts_params->session_mpool); +TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" ); status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, &ut_params->cipher_xform, ts_params->session_priv_mpool); +if (status == -ENOTSUP ) +return status;TEST_ASSERT_EQUAL (status,0 ,"session init failed" ); -TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );return 0 ; }
@@ -2822,12 +2824,15 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id,/* Create Crypto session*/ ut_params->sess =rte_cryptodev_sym_session_create ( ts_params->session_mpool); +TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" ); status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, &ut_params->auth_xform, ts_params->session_priv_mpool); +if (status == -ENOTSUP ) +return status; +TEST_ASSERT_EQUAL (status,0 ,"session init failed" ); -TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );return 0 ; }
@@ -2971,6 +2976,11 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params; +enum rte_crypto_cipher_algorithm cipher_algo = + ut_params->cipher_xform.cipher.algo; +enum rte_crypto_auth_algorithm auth_algo = + ut_params->auth_xform.auth.algo; +/* Generate Crypto op data structure */ ut_params->op =rte_crypto_op_alloc (ts_params->op_mpool,RTE_CRYPTO_OP_TYPE_SYMMETRIC );
@@ -2991,8 +3001,22 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,TEST_ASSERT_NOT_NULL (sym_op->auth.digest.data,"no room to append auth tag" ); ut_params->digest = sym_op->auth.digest.data; - sym_op->auth.digest.phys_addr =rte_pktmbuf_iova_offset ( - ut_params->ibuf, data_pad_len); + +if (rte_pktmbuf_is_contiguous (ut_params->ibuf)) { + sym_op->auth.digest.phys_addr =rte_pktmbuf_iova_offset ( + ut_params->ibuf, data_pad_len); + }else { +struct rte_mbuf *m = ut_params->ibuf; +unsigned int offset = data_pad_len; + +while (offset > m->data_len && m->next !=NULL ) { + offset -= m->data_len; + m = m->next; + } + sym_op->auth.digest.phys_addr =rte_pktmbuf_iova_offset ( + m, offset); + } +if (op ==RTE_CRYPTO_AUTH_OP_GENERATE )memset (sym_op->auth.digest.data,0 , auth_tag_len);else
@@ -3009,10 +3033,25 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag, iv_ptr += cipher_iv_len;rte_memcpy (iv_ptr, auth_iv, auth_iv_len); - sym_op->cipher.data.length = cipher_len; - sym_op->cipher.data.offset = cipher_offset; - sym_op->auth.data.length = auth_len; - sym_op->auth.data.offset = auth_offset; +if (cipher_algo ==RTE_CRYPTO_CIPHER_SNOW3G_UEA2 || + cipher_algo ==RTE_CRYPTO_CIPHER_KASUMI_F8 || + cipher_algo ==RTE_CRYPTO_CIPHER_ZUC_EEA3 ) { + sym_op->cipher.data.length = cipher_len; + sym_op->cipher.data.offset = cipher_offset; + }else { + sym_op->cipher.data.length = cipher_len >>3 ; + sym_op->cipher.data.offset = cipher_offset >>3 ; + } + +if (auth_algo ==RTE_CRYPTO_AUTH_SNOW3G_UIA2 || + auth_algo ==RTE_CRYPTO_AUTH_KASUMI_F9 || + auth_algo ==RTE_CRYPTO_AUTH_ZUC_EIA3 ) { + sym_op->auth.data.length = auth_len; + sym_op->auth.data.offset = auth_offset; + }else { + sym_op->auth.data.length = auth_len >>3 ; + sym_op->auth.data.offset = auth_offset >>3 ; + }return 0 ; }
@@ -6576,8 +6615,9 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,unsigned int ciphertext_len;struct rte_cryptodev_info dev_info; +struct rte_crypto_op *op; -/* Check if device supports particular algorithms */ +/* Check if device supports particular algorithms separately */ if (test_mixed_check_if_unsupported (tdata))return -ENOTSUP ;
@@ -6593,18 +6633,26 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, }/* Create the session */ - retval =create_wireless_algo_auth_cipher_session ( - ts_params->valid_devs[0 ], - (verify ?RTE_CRYPTO_CIPHER_OP_DECRYPT - :RTE_CRYPTO_CIPHER_OP_ENCRYPT ), - (verify ?RTE_CRYPTO_AUTH_OP_VERIFY - :RTE_CRYPTO_AUTH_OP_GENERATE ), - tdata->auth_algo, - tdata->cipher_algo, - tdata->auth_key.data, tdata->auth_key.len, - tdata->auth_iv.len, tdata->digest_enc.len, - tdata->cipher_iv.len); - +if (verify) + retval =create_wireless_algo_cipher_auth_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_DECRYPT , +RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len); +else + retval =create_wireless_algo_auth_cipher_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_ENCRYPT , +RTE_CRYPTO_AUTH_OP_GENERATE , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);if (retval <0 )return retval;
@@ -6642,25 +6690,45 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, }/* Create the operation */ - retval =create_wireless_algo_auth_cipher_operation ( - tdata->digest_enc.len, - tdata->cipher_iv.data, tdata->cipher_iv.len, - tdata->auth_iv.data, tdata->auth_iv.len, - (tdata->digest_enc.offset ==0 ? - (verify ? ciphertext_pad_len : plaintext_pad_len) - : tdata->digest_enc.offset), - tdata->validCipherLen.len_bits, - tdata->cipher.offset_bits, - tdata->validAuthLen.len_bits, - tdata->auth.offset_bits, - op_mode,0 ); - +if (verify) + retval =create_wireless_algo_cipher_hash_operation ( + tdata->digest_enc.data, tdata->digest_enc.len, + tdata->auth_iv.data, tdata->auth_iv.len, + plaintext_len,RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits); +else + retval =create_wireless_algo_auth_cipher_operation ( + tdata->digest_enc.len, + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->auth_iv.data, tdata->auth_iv.len, + (tdata->digest_enc.offset ==0 ? + plaintext_pad_len + : tdata->digest_enc.offset), + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits, + op_mode,0 );if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); +/* Check if the op failed because the device doesn't */ +/* support this particular combination of algorithms */ +if (op ==NULL && ut_params->op->status == +RTE_CRYPTO_OP_STATUS_INVALID_SESSION ) { +printf ("Device doesn't support this mixed combination. " +"Test Skipped.\n" ); +return -ENOTSUP ; + } + ut_params->op = op; +TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->obuf = (op_mode == IN_PLACE ?
@@ -6675,12 +6743,10 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, (tdata->cipher.offset_bits >>3 );debug_hexdump (stdout,"plaintext:" , plaintext, - (tdata->plaintext.len_bits >>3 ) - - tdata->digest_enc.len); + tdata->plaintext.len_bits >>3 );debug_hexdump (stdout,"plaintext expected:" , tdata->plaintext.data, - (tdata->plaintext.len_bits >>3 ) - - tdata->digest_enc.len); + tdata->plaintext.len_bits >>3 ); }else {if (ut_params->obuf) ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
@@ -6725,6 +6791,10 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,DIGEST_BYTE_LENGTH_SNOW3G_UIA2 , "Generated auth tag not as expected"); } + +TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS , +"crypto op processing failed" ); +return 0 ; }
@@ -6748,6 +6818,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,uint8_t digest_buffer[10000 ];struct rte_cryptodev_info dev_info; +struct rte_crypto_op *op;/* Check if device supports particular algorithms */ if (test_mixed_check_if_unsupported (tdata))
@@ -6776,18 +6847,26 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, }/* Create the session */ - retval =create_wireless_algo_auth_cipher_session ( - ts_params->valid_devs[0 ], - (verify ?RTE_CRYPTO_CIPHER_OP_DECRYPT - :RTE_CRYPTO_CIPHER_OP_ENCRYPT ), - (verify ?RTE_CRYPTO_AUTH_OP_VERIFY - :RTE_CRYPTO_AUTH_OP_GENERATE ), - tdata->auth_algo, - tdata->cipher_algo, - tdata->auth_key.data, tdata->auth_key.len, - tdata->auth_iv.len, tdata->digest_enc.len, - tdata->cipher_iv.len); - +if (verify) + retval =create_wireless_algo_cipher_auth_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_DECRYPT , +RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len); +else + retval =create_wireless_algo_auth_cipher_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_ENCRYPT , +RTE_CRYPTO_AUTH_OP_GENERATE , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);if (retval <0 )return retval;
@@ -6797,7 +6876,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, plaintext_pad_len =RTE_ALIGN_CEIL (plaintext_len,16 ); ut_params->ibuf =create_segmented_mbuf (ts_params->mbuf_pool, - plaintext_pad_len,15 ,0 ); + ciphertext_pad_len,15 ,0 );TEST_ASSERT_NOT_NULL (ut_params->ibuf,"Failed to allocate input buffer in mempool" );
@@ -6826,25 +6905,46 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,memset (buffer,0 ,sizeof (buffer));/* Create the operation */ - retval =create_wireless_algo_auth_cipher_operation ( - tdata->digest_enc.len, - tdata->cipher_iv.data, tdata->cipher_iv.len, - tdata->auth_iv.data, tdata->auth_iv.len, - (tdata->digest_enc.offset ==0 ? - (verify ? ciphertext_pad_len : plaintext_pad_len) - : tdata->digest_enc.offset), - tdata->validCipherLen.len_bits, - tdata->cipher.offset_bits, - tdata->validAuthLen.len_bits, - tdata->auth.offset_bits, - op_mode,1 ); - +if (verify) + retval =create_wireless_algo_cipher_hash_operation ( + tdata->digest_enc.data, tdata->digest_enc.len, + tdata->auth_iv.data, tdata->auth_iv.len, + plaintext_len,RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits); +else + retval =create_wireless_algo_auth_cipher_operation ( + tdata->digest_enc.len, + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->auth_iv.data, tdata->auth_iv.len, + (tdata->digest_enc.offset ==0 ? + plaintext_pad_len + : tdata->digest_enc.offset), + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits, + op_mode,1 );if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); +/* Check if the op failed because the device doesn't */ +/* support this particular combination of algorithms */ +if (op ==NULL && ut_params->op->status == +RTE_CRYPTO_OP_STATUS_INVALID_SESSION ) { +printf ("Device doesn't support this mixed combination. " +"Test Skipped.\n" ); +return -ENOTSUP ; + } + + ut_params->op = op; +TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->obuf = (op_mode == IN_PLACE ?
@@ -6917,6 +7017,10 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.len, "Generated auth tag not as expected"); } + +TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS , +"crypto op processing failed" ); +return 0 ; }
@@ -6978,6 +7082,176 @@ test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void) &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1); } +/** MIXED AUTH + CIPHER */ + +static int +test_auth_zuc_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_zuc_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_zuc_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} +static int test_3DES_chain_qat_all (void ) {
@@ -12288,6 +12562,68 @@ static struct unit_test_suite cryptodev_qat_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl), +/** AUTH ZUC + CIPHER SNOW3G */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_zuc_cipher_snow_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_snow_test_case_1), +/** AUTH AES CMAC + CIPHER SNOW3G */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_snow_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_snow_test_case_1), +/** AUTH ZUC + CIPHER AES CTR */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_zuc_cipher_aes_ctr_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_aes_ctr_test_case_1), +/** AUTH SNOW3G + CIPHER AES CTR */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_snow_cipher_aes_ctr_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_snow_cipher_aes_ctr_test_case_1), +/** AUTH SNOW3G + CIPHER ZUC */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_snow_cipher_zuc_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_snow_cipher_zuc_test_case_1), +/** AUTH AES CMAC + CIPHER ZUC */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_zuc_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_zuc_test_case_1), + +/** AUTH NULL + CIPHER SNOW3G */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_null_cipher_snow_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_null_cipher_snow_test_case_1), +/** AUTH NULL + CIPHER ZUC */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_null_cipher_zuc_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_null_cipher_zuc_test_case_1), +/** AUTH SNOW3G + CIPHER NULL */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_snow_cipher_null_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_snow_cipher_null_test_case_1), +/** AUTH ZUC + CIPHER NULL */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_zuc_cipher_null_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_null_test_case_1), +/** AUTH NULL + CIPHER AES CTR */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_null_cipher_aes_ctr_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_null_cipher_aes_ctr_test_case_1), +/** AUTH AES CMAC + CIPHER NULL */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_null_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_null_test_case_1), +TEST_CASES_END ()/**< NULL terminate unit test array */ } };
app/test/test_cryptodev_mixed_test_vectors.h +1318 -2
1,331 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 2/2] test/crypto: add more tests for mixed encypted-digest
Hi Adam,
Quoted 7 lines
This patch adds unit tests for QAT PMD for mixed encrypted-digest cases, involving SNOW3G UIA2, ZUC EIA3, AES CMAC and NULL auth algorithms together with SNOW3G UEA2, ZUC EEA3, AES CTR and NULL cipher algorithms in various combinations.
Signed-off-by Adam Dybkowski <[email protected]>
This patch doesn't apply on current tree.
Could you please rebase.
Quoted 5 lines
--- app/test/test_cryptodev.c | 470 ++++++- app/test/test_cryptodev_mixed_test_vectors.h | 1320 +++++++++++++++++- 2 files changed, 1721 insertions(+), 69 deletions(-)
//snip
Quoted 23 lines
app/test/test_cryptodev.c +10
-12/* Create the session */ - retval =create_wireless_algo_auth_cipher_session ( - ts_params->valid_devs[0 ], - (verify ?RTE_CRYPTO_CIPHER_OP_DECRYPT - :RTE_CRYPTO_CIPHER_OP_ENCRYPT ), - (verify ?RTE_CRYPTO_AUTH_OP_VERIFY - :RTE_CRYPTO_AUTH_OP_GENERATE ), - tdata->auth_algo, - tdata->cipher_algo, - tdata->auth_key.data, tdata->auth_key.len, - tdata->auth_iv.len, tdata->digest_enc.len, - tdata->cipher_iv.len); - +if (verify) + retval =create_wireless_algo_cipher_auth_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_DECRYPT , +RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);
app/test/test_cryptodev.c test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, · line 6655
Quoted 10 lines
app/test/test_cryptodev.c +10
-0+else + retval =create_wireless_algo_auth_cipher_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_ENCRYPT , +RTE_CRYPTO_AUTH_OP_GENERATE , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);
Why are these changes done? It looked better previously.
Quoted 228 lines
app/test/test_cryptodev.c +34
-14if (retval <0 )return retval;@@ -6642,25 +6690,45 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, }/* Create the operation */ - retval =create_wireless_algo_auth_cipher_operation ( - tdata->digest_enc.len, - tdata->cipher_iv.data, tdata->cipher_iv.len, - tdata->auth_iv.data, tdata->auth_iv.len, - (tdata->digest_enc.offset ==0 ? - (verify ? ciphertext_pad_len : plaintext_pad_len) - : tdata->digest_enc.offset), - tdata->validCipherLen.len_bits, - tdata->cipher.offset_bits, - tdata->validAuthLen.len_bits, - tdata->auth.offset_bits, - op_mode,0 ); - +if (verify) + retval =create_wireless_algo_cipher_hash_operation ( + tdata->digest_enc.data, tdata->digest_enc.len, + tdata->auth_iv.data, tdata->auth_iv.len, + plaintext_len,RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits); +else + retval =create_wireless_algo_auth_cipher_operation ( + tdata->digest_enc.len, + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->auth_iv.data, tdata->auth_iv.len, + (tdata->digest_enc.offset ==0 ? + plaintext_pad_len + : tdata->digest_enc.offset), + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits, + op_mode,0 );if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); +/* Check if the op failed because the device doesn't */ +/* support this particular combination of algorithms */ +if (op ==NULL && ut_params->op->status == +RTE_CRYPTO_OP_STATUS_INVALID_SESSION ) { +printf ("Device doesn't support this mixed combination. " +"Test Skipped.\n" ); +return -ENOTSUP ; + } + ut_params->op = op; +TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" );app/test/test_cryptodev.c +2
-4ut_params->obuf = (op_mode == IN_PLACE ?@@ -6675,12 +6743,10 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, (tdata->cipher.offset_bits >>3 );debug_hexdump (stdout,"plaintext:" , plaintext, - (tdata->plaintext.len_bits >>3 ) - - tdata->digest_enc.len); + tdata->plaintext.len_bits >>3 );debug_hexdump (stdout,"plaintext expected:" , tdata->plaintext.data, - (tdata->plaintext.len_bits >>3 ) - - tdata->digest_enc.len); + tdata->plaintext.len_bits >>3 ); }else {if (ut_params->obuf)app/test/test_cryptodev.c +4
-0ciphertext = rte_pktmbuf_mtod(ut_params->obuf,@@ -6725,6 +6791,10 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,DIGEST_BYTE_LENGTH_SNOW3G_UIA2 , "Generated auth tag not as expected"); } + +TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS , +"crypto op processing failed" ); +return 0 ;}
app/test/test_cryptodev.c +1
-0@@ -6748,6 +6818,7 @@ test_mixed_auth_cipher_sgl(const structmixed_cipher_auth_test_data *tdata, uint8_t digest_buffer[10000];struct rte_cryptodev_info dev_info; +struct rte_crypto_op *op;/* Check if device supports particular algorithms */ app/test/test_cryptodev.c +56
-27if (test_mixed_check_if_unsupported (tdata))@@ -6776,18 +6847,26 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, }/* Create the session */ - retval =create_wireless_algo_auth_cipher_session ( - ts_params->valid_devs[0 ], - (verify ?RTE_CRYPTO_CIPHER_OP_DECRYPT - :RTE_CRYPTO_CIPHER_OP_ENCRYPT ), - (verify ?RTE_CRYPTO_AUTH_OP_VERIFY - :RTE_CRYPTO_AUTH_OP_GENERATE ), - tdata->auth_algo, - tdata->cipher_algo, - tdata->auth_key.data, tdata->auth_key.len, - tdata->auth_iv.len, tdata->digest_enc.len, - tdata->cipher_iv.len); - +if (verify) + retval =create_wireless_algo_cipher_auth_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_DECRYPT , +RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len); +else + retval =create_wireless_algo_auth_cipher_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_ENCRYPT , +RTE_CRYPTO_AUTH_OP_GENERATE , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);if (retval <0 )return retval;@@ -6797,7 +6876,7 @@ test_mixed_auth_cipher_sgl(const structmixed_cipher_auth_test_data *tdata, plaintext_pad_len =RTE_ALIGN_CEIL (plaintext_len,16 ); ut_params->ibuf =create_segmented_mbuf (ts_params->mbuf_pool, - plaintext_pad_len,15 ,0 ); + ciphertext_pad_len,15 ,0 );TEST_ASSERT_NOT_NULL (ut_params->ibuf,"Failed to allocate input buffer in mempool" );@@ -6826,25 +6905,46 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,memset (buffer,0 ,sizeof (buffer));/* Create the operation */ - retval =create_wireless_algo_auth_cipher_operation ( - tdata->digest_enc.len, - tdata->cipher_iv.data, tdata->cipher_iv.len, - tdata->auth_iv.data, tdata->auth_iv.len, - (tdata->digest_enc.offset ==0 ? - (verify ? ciphertext_pad_len : plaintext_pad_len) - : tdata->digest_enc.offset), - tdata->validCipherLen.len_bits, - tdata->cipher.offset_bits, - tdata->validAuthLen.len_bits, - tdata->auth.offset_bits, - op_mode,1 ); - +if (verify) + retval =create_wireless_algo_cipher_hash_operation ( + tdata->digest_enc.data, tdata->digest_enc.len, + tdata->auth_iv.data, tdata->auth_iv.len, + plaintext_len,RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits); +else + retval =create_wireless_algo_auth_cipher_operation ( + tdata->digest_enc.len, + tdata->cipher_iv.data, tdata->cipher_iv.len, + tdata->auth_iv.data, tdata->auth_iv.len, + (tdata->digest_enc.offset ==0 ? + plaintext_pad_len + : tdata->digest_enc.offset), + tdata->validCipherLen.len_bits, + tdata->cipher.offset_bits, + tdata->validAuthLen.len_bits, + tdata->auth.offset_bits, + op_mode,1 );if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); +/* Check if the op failed because the device doesn't */ +/* support this particular combination of algorithms */ +if (op ==NULL && ut_params->op->status == +RTE_CRYPTO_OP_STATUS_INVALID_SESSION ) { +printf ("Device doesn't support this mixed combination. " +"Test Skipped.\n" ); +return -ENOTSUP ; + } + + ut_params->op = op; +TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" );app/test/test_cryptodev.c +4
-0ut_params->obuf = (op_mode == IN_PLACE ?@@ -6917,6 +7017,10 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.len, "Generated auth tag not as expected"); } + +TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS , +"crypto op processing failed" ); +return 0 ;}
Review line 7086
Quoted 5 lines
(quoted diff) +0
-0@@ -6978,6 +7082,176 @@ test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void) &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1); }
Can we have a single function to execute all cases with some function arguments?
Quoted 246 lines
app/test/test_cryptodev.c +28
-0+/** MIXED AUTH + CIPHER */ + +static int +test_auth_zuc_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_snow_test_case_1 (void ) +{ + return test_mixed_auth_cipher( + &auth_aes_cmac_cipher_snow_test_case_1, OUT_OF_PLACE,1);
app/test/test_cryptodev.c +204
-0+} + +static int +test_auth_zuc_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_zuc_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} +static int test_3DES_chain_qat_all (void ) {@@ -12288,6 +12562,68 @@ static struct unit_test_suite cryptodev_qat_testsuite = {TEST_CASE_ST (ut_setup, ut_teardown, test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl), +/** AUTH ZUC + CIPHER SNOW3G */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_zuc_cipher_snow_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_snow_test_case_1), +/** AUTH AES CMAC + CIPHER SNOW3G */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_snow_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_snow_test_case_1), +/** AUTH ZUC + CIPHER AES CTR */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_zuc_cipher_aes_ctr_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_aes_ctr_test_case_1), +/** AUTH SNOW3G + CIPHER AES CTR */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_snow_cipher_aes_ctr_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_snow_cipher_aes_ctr_test_case_1), +/** AUTH SNOW3G + CIPHER ZUC */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_snow_cipher_zuc_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_snow_cipher_zuc_test_case_1), +/** AUTH AES CMAC + CIPHER ZUC */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_zuc_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_zuc_test_case_1), + +/** AUTH NULL + CIPHER SNOW3G */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_null_cipher_snow_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_null_cipher_snow_test_case_1), +/** AUTH NULL + CIPHER ZUC */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_null_cipher_zuc_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_null_cipher_zuc_test_case_1), +/** AUTH SNOW3G + CIPHER NULL */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_snow_cipher_null_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_snow_cipher_null_test_case_1), +/** AUTH ZUC + CIPHER NULL */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_zuc_cipher_null_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_null_test_case_1), +/** AUTH NULL + CIPHER AES CTR */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_null_cipher_aes_ctr_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_null_cipher_aes_ctr_test_case_1), +/** AUTH AES CMAC + CIPHER NULL */ +TEST_CASE_ST (ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_null_test_case_1), +TEST_CASE_ST (ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_null_test_case_1), +TEST_CASES_END ()/**< NULL terminate unit test array */ }
};
Quoted 10 lines
-----Original Message-----
From: Dybkowski, AdamX <[email protected]>
Sent: Wednesday, December 11, 2019 2:10 PM
To: [email protected]; Trahe, Fiona <[email protected]>; [email protected]; Kusztal, ArkadiuszX <[email protected]>
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH v2 0/2] Handle mixed algorithms on GEN3 QAT
Quoted 7 lines
v2:
* Added release notes update.Adam Dybkowski (2):
crypto/qat: handle mixed hash-cipher requests on GEN3 QAT test/crypto: add more tests for mixed encypted-digest
Series
v3 cover Handle mixed algorithms on GEN3 QAT
In reply to Adam Dybkowskiv2:
* Added release notes update.
v3:
* Rebase, update release notes.
Adam Dybkowski (2):
crypto/qat: handle mixed hash-cipher requests on GEN3 QAT test/crypto: add more tests for mixed encypted-digest
app/test/test_cryptodev.c | 400 +++++- app/test/test_cryptodev_mixed_test_vectors.h | 1320 +++++++++++++++++- doc/guides/cryptodevs/qat.rst | 24 + doc/guides/rel_notes/release_20_02.rst | 7 + drivers/common/qat/qat_adf/icp_qat_fw.h | 3 + drivers/common/qat/qat_adf/icp_qat_fw_la.h | 2 + drivers/crypto/qat/qat_sym_session.c | 72 + 7 files changed, 1784 insertions(+), 44 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 crypto/qat: handle mixed hash-cipher requests on GEN3 QAT
This patch implements handling mixed encrypted digest hash-cipher requests (e.g. SNOW3G + ZUC or ZUC + AES CTR) possible when running on GEN3 QAT. Such algorithm combinations are not supported on GEN1/GEN2 hardware.
--- doc/guides/cryptodevs/qat.rst | 24 ++++++++ doc/guides/rel_notes/release_20_02.rst | 7 +++ drivers/common/qat/qat_adf/icp_qat_fw.h | 3 + drivers/common/qat/qat_adf/icp_qat_fw_la.h | 2 + drivers/crypto/qat/qat_sym_session.c | 72 ++++++++++++++++++++++ 5 files changed, 108 insertions(+)
doc/guides/cryptodevs/qat.rst +24 -0
@@ -72,6 +72,30 @@ Supported AEAD algorithms: * ``RTE_CRYPTO_AEAD_AES_CCM`` +Supported Chains +~~~~~~~~~~~~~~~~ + +All the usual chains are supported and also some mixed chains: + +.. table:: Supported hash-cipher chains for wireless digest-encrypted cases + + +------------------+-----------+-------------+----------+----------+ + | Cipher algorithm | NULL AUTH | SNOW3G UIA2 | ZUC EIA3 | AES CMAC | + +==================+===========+=============+==========+==========+ + | NULL CIPHER | Y | 3 | 3 | Y | + +------------------+-----------+-------------+----------+----------+ + | SNOW3G UEA2 | 3 | Y | 3 | 3 | + +------------------+-----------+-------------+----------+----------+ + | ZUC EEA3 | 3 | 3 | 2&3 | 3 | + +------------------+-----------+-------------+----------+----------+ + | AES CTR | Y | 3 | 3 | Y | + +------------------+-----------+-------------+----------+----------+ + +* The combinations marked as "Y" are supported on all QAT hardware versions. +* The combinations marked as "2&3" are supported on GEN2/GEN3 QAT hardware only. +* The combinations marked as "3" are supported on GEN3 QAT hardware only. + + Limitations ~~~~~~~~~~~
doc/guides/rel_notes/release_20_02.rst +7 -0
@@ -60,6 +60,13 @@ New Features Chacha20-Poly1305 AEAD algorithm can now be supported in Cryptodev. +* **Added handling of mixed algorithms in encrypted digest requests in QAT PMD.** + + Added handling of mixed algorithms in encrypted digest hash-cipher + (generation) and cipher-hash (verification) requests (e.g. SNOW3G + ZUC or + ZUC + AES CTR) in QAT PMD possible when running on GEN3 QAT hardware. + Such algorithm combinations are not supported on GEN1/GEN2 hardware + and executing the request returns RTE_CRYPTO_OP_STATUS_INVALID_SESSION. Removed Items -------------
drivers/common/qat/qat_adf/icp_qat_fw.h +3 -0
@@ -175,6 +175,9 @@ struct icp_qat_fw_comn_resp {#define QAT_COMN_PTR_TYPE_SGL 0x1#define QAT_COMN_CD_FLD_TYPE_64BIT_ADR 0x0#define QAT_COMN_CD_FLD_TYPE_16BYTE_DATA 0x1 +#define QAT_COMN_EXT_FLAGS_BITPOS 8 +#define QAT_COMN_EXT_FLAGS_MASK 0x1 +#define QAT_COMN_EXT_FLAGS_USED 0x1#define ICP_QAT_FW_COMN_FLAGS_BUILD (cdt, ptr) \ ((((cdt) & QAT_COMN_CD_FLD_TYPE_MASK) << QAT_COMN_CD_FLD_TYPE_BITPOS) \
drivers/common/qat/qat_adf/icp_qat_fw_la.h +2 -0
@@ -273,6 +273,8 @@ struct icp_qat_fw_cipher_auth_cd_ctrl_hdr {#define ICP_QAT_FW_AUTH_HDR_FLAG_DO_NESTED 1#define ICP_QAT_FW_AUTH_HDR_FLAG_NO_NESTED 0 +#define ICP_QAT_FW_AUTH_HDR_FLAG_SNOW3G_UIA2_BITPOS 3 +#define ICP_QAT_FW_AUTH_HDR_FLAG_ZUC_EIA3_BITPOS 4#define ICP_QAT_FW_CCM_GCM_AAD_SZ_MAX 240#define ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET 24#define ICP_QAT_FW_CIPHER_REQUEST_PARAMETERS_OFFSET (0)
drivers/crypto/qat/qat_sym_session.c +72 -0
90 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v3 1/2] crypto/qat: handle mixed hash-cipher requests on GEN3 QAT
Quoted 8 lines
-----Original Message-----
From: Dybkowski, AdamX <[email protected]>
Sent: Wednesday, January 15, 2020 2:59 PM
To: [email protected]; Trahe, Fiona <[email protected]>; [email protected]
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH v3 1/2]crypto/qat: handle mixed hash-cipher requests on GEN3 QAT
Quoted 6 lines
This patch implements handling mixed encrypted digest hash-cipher requests (e.g. SNOW3G + ZUC or ZUC + AES CTR) possible when running on GEN3 QAT. Such algorithm combinations are not supported on GEN1/GEN2 hardware.
Signed-off-by Adam Dybkowski <[email protected]>
PATCH v3 2/2 test/crypto: add more tests for mixed encypted-digest
In reply to Adam DybkowskiThis patch adds unit tests for QAT PMD for mixed encrypted-digest cases, involving SNOW3G UIA2, ZUC EIA3, AES CMAC and NULL auth algorithms together with SNOW3G UEA2, ZUC EEA3, AES CTR and NULL cipher algorithms in various combinations.
--- app/test/test_cryptodev.c | 400 +++++- app/test/test_cryptodev_mixed_test_vectors.h | 1320 +++++++++++++++++- 2 files changed, 1676 insertions(+), 44 deletions(-)
app/test/test_cryptodev.c +358 -42
@@ -2701,13 +2701,15 @@ create_wireless_algo_cipher_auth_session(uint8_t dev_id,/* Create Crypto session*/ ut_params->sess =rte_cryptodev_sym_session_create ( ts_params->session_mpool); +TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" ); status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, &ut_params->cipher_xform, ts_params->session_priv_mpool); +if (status == -ENOTSUP ) +return status;TEST_ASSERT_EQUAL (status,0 ,"session init failed" ); -TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );return 0 ; }
@@ -2827,6 +2829,7 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id,/* Create Crypto session*/ ut_params->sess =rte_cryptodev_sym_session_create ( ts_params->session_mpool); +TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );if (cipher_op ==RTE_CRYPTO_CIPHER_OP_DECRYPT ) { ut_params->auth_xform.next =NULL ;
@@ -2840,8 +2843,10 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id, &ut_params->auth_xform, ts_params->session_priv_mpool); +if (status == -ENOTSUP ) +return status; +TEST_ASSERT_EQUAL (status,0 ,"session init failed" ); -TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );return 0 ; }
@@ -2985,6 +2990,11 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params; +enum rte_crypto_cipher_algorithm cipher_algo = + ut_params->cipher_xform.cipher.algo; +enum rte_crypto_auth_algorithm auth_algo = + ut_params->auth_xform.auth.algo; +/* Generate Crypto op data structure */ ut_params->op =rte_crypto_op_alloc (ts_params->op_mpool,RTE_CRYPTO_OP_TYPE_SYMMETRIC );
@@ -3005,8 +3015,22 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,TEST_ASSERT_NOT_NULL (sym_op->auth.digest.data,"no room to append auth tag" ); ut_params->digest = sym_op->auth.digest.data; - sym_op->auth.digest.phys_addr =rte_pktmbuf_iova_offset ( - ut_params->ibuf, data_pad_len); + +if (rte_pktmbuf_is_contiguous (ut_params->ibuf)) { + sym_op->auth.digest.phys_addr =rte_pktmbuf_iova_offset ( + ut_params->ibuf, data_pad_len); + }else { +struct rte_mbuf *m = ut_params->ibuf; +unsigned int offset = data_pad_len; + +while (offset > m->data_len && m->next !=NULL ) { + offset -= m->data_len; + m = m->next; + } + sym_op->auth.digest.phys_addr =rte_pktmbuf_iova_offset ( + m, offset); + } +if (op ==RTE_CRYPTO_AUTH_OP_GENERATE )memset (sym_op->auth.digest.data,0 , auth_tag_len);else
@@ -3023,10 +3047,25 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag, iv_ptr += cipher_iv_len;rte_memcpy (iv_ptr, auth_iv, auth_iv_len); - sym_op->cipher.data.length = cipher_len; - sym_op->cipher.data.offset = cipher_offset; - sym_op->auth.data.length = auth_len; - sym_op->auth.data.offset = auth_offset; +if (cipher_algo ==RTE_CRYPTO_CIPHER_SNOW3G_UEA2 || + cipher_algo ==RTE_CRYPTO_CIPHER_KASUMI_F8 || + cipher_algo ==RTE_CRYPTO_CIPHER_ZUC_EEA3 ) { + sym_op->cipher.data.length = cipher_len; + sym_op->cipher.data.offset = cipher_offset; + }else { + sym_op->cipher.data.length = cipher_len >>3 ; + sym_op->cipher.data.offset = cipher_offset >>3 ; + } + +if (auth_algo ==RTE_CRYPTO_AUTH_SNOW3G_UIA2 || + auth_algo ==RTE_CRYPTO_AUTH_KASUMI_F9 || + auth_algo ==RTE_CRYPTO_AUTH_ZUC_EIA3 ) { + sym_op->auth.data.length = auth_len; + sym_op->auth.data.offset = auth_offset; + }else { + sym_op->auth.data.length = auth_len >>3 ; + sym_op->auth.data.offset = auth_offset >>3 ; + }return 0 ; }
@@ -6595,8 +6634,9 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,unsigned int ciphertext_len;struct rte_cryptodev_info dev_info; +struct rte_crypto_op *op; -/* Check if device supports particular algorithms */ +/* Check if device supports particular algorithms separately */ if (test_mixed_check_if_unsupported (tdata))return -ENOTSUP ;
@@ -6612,18 +6652,26 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, }/* Create the session */ - retval =create_wireless_algo_auth_cipher_session ( - ts_params->valid_devs[0 ], - (verify ?RTE_CRYPTO_CIPHER_OP_DECRYPT - :RTE_CRYPTO_CIPHER_OP_ENCRYPT ), - (verify ?RTE_CRYPTO_AUTH_OP_VERIFY - :RTE_CRYPTO_AUTH_OP_GENERATE ), - tdata->auth_algo, - tdata->cipher_algo, - tdata->auth_key.data, tdata->auth_key.len, - tdata->auth_iv.len, tdata->digest_enc.len, - tdata->cipher_iv.len); - +if (verify) + retval =create_wireless_algo_cipher_auth_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_DECRYPT , +RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len); +else + retval =create_wireless_algo_auth_cipher_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_ENCRYPT , +RTE_CRYPTO_AUTH_OP_GENERATE , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);if (retval <0 )return retval;
@@ -6666,7 +6714,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest_enc.offset ==0 ? - (verify ? ciphertext_pad_len : plaintext_pad_len) + plaintext_pad_len : tdata->digest_enc.offset), tdata->validCipherLen.len_bits, tdata->cipher.offset_bits,
@@ -6677,9 +6725,19 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); +/* Check if the op failed because the device doesn't */ +/* support this particular combination of algorithms */ +if (op ==NULL && ut_params->op->status == +RTE_CRYPTO_OP_STATUS_INVALID_SESSION ) { +printf ("Device doesn't support this mixed combination. " +"Test Skipped.\n" ); +return -ENOTSUP ; + } + ut_params->op = op; +TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->obuf = (op_mode == IN_PLACE ?
@@ -6694,12 +6752,10 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, (tdata->cipher.offset_bits >>3 );debug_hexdump (stdout,"plaintext:" , plaintext, - (tdata->plaintext.len_bits >>3 ) - - tdata->digest_enc.len); + tdata->plaintext.len_bits >>3 );debug_hexdump (stdout,"plaintext expected:" , tdata->plaintext.data, - (tdata->plaintext.len_bits >>3 ) - - tdata->digest_enc.len); + tdata->plaintext.len_bits >>3 ); }else {if (ut_params->obuf) ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
@@ -6744,6 +6800,10 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,DIGEST_BYTE_LENGTH_SNOW3G_UIA2 , "Generated auth tag not as expected"); } + +TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS , +"crypto op processing failed" ); +return 0 ; }
@@ -6767,6 +6827,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,uint8_t digest_buffer[10000 ];struct rte_cryptodev_info dev_info; +struct rte_crypto_op *op;/* Check if device supports particular algorithms */ if (test_mixed_check_if_unsupported (tdata))
@@ -6795,18 +6856,26 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, }/* Create the session */ - retval =create_wireless_algo_auth_cipher_session ( - ts_params->valid_devs[0 ], - (verify ?RTE_CRYPTO_CIPHER_OP_DECRYPT - :RTE_CRYPTO_CIPHER_OP_ENCRYPT ), - (verify ?RTE_CRYPTO_AUTH_OP_VERIFY - :RTE_CRYPTO_AUTH_OP_GENERATE ), - tdata->auth_algo, - tdata->cipher_algo, - tdata->auth_key.data, tdata->auth_key.len, - tdata->auth_iv.len, tdata->digest_enc.len, - tdata->cipher_iv.len); - +if (verify) + retval =create_wireless_algo_cipher_auth_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_DECRYPT , +RTE_CRYPTO_AUTH_OP_VERIFY , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len); +else + retval =create_wireless_algo_auth_cipher_session ( + ts_params->valid_devs[0 ], +RTE_CRYPTO_CIPHER_OP_ENCRYPT , +RTE_CRYPTO_AUTH_OP_GENERATE , + tdata->auth_algo, + tdata->cipher_algo, + tdata->auth_key.data, tdata->auth_key.len, + tdata->auth_iv.len, tdata->digest_enc.len, + tdata->cipher_iv.len);if (retval <0 )return retval;
@@ -6816,7 +6885,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, plaintext_pad_len =RTE_ALIGN_CEIL (plaintext_len,16 ); ut_params->ibuf =create_segmented_mbuf (ts_params->mbuf_pool, - plaintext_pad_len,15 ,0 ); + ciphertext_pad_len,15 ,0 );TEST_ASSERT_NOT_NULL (ut_params->ibuf,"Failed to allocate input buffer in mempool" );
@@ -6850,7 +6919,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest_enc.offset ==0 ? - (verify ? ciphertext_pad_len : plaintext_pad_len) + plaintext_pad_len : tdata->digest_enc.offset), tdata->validCipherLen.len_bits, tdata->cipher.offset_bits,
@@ -6861,9 +6930,20 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,if (retval <0 )return retval; - ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], + op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); +/* Check if the op failed because the device doesn't */ +/* support this particular combination of algorithms */ +if (op ==NULL && ut_params->op->status == +RTE_CRYPTO_OP_STATUS_INVALID_SESSION ) { +printf ("Device doesn't support this mixed combination. " +"Test Skipped.\n" ); +return -ENOTSUP ; + } + + ut_params->op = op; +TEST_ASSERT_NOT_NULL (ut_params->op,"failed to retrieve obuf" ); ut_params->obuf = (op_mode == IN_PLACE ?
@@ -6936,6 +7016,10 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.len, "Generated auth tag not as expected"); } + +TEST_ASSERT_EQUAL (ut_params->op->status,RTE_CRYPTO_OP_STATUS_SUCCESS , +"crypto op processing failed" ); +return 0 ; }
@@ -6997,6 +7081,176 @@ test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void) &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1); } +/** MIXED AUTH + CIPHER */ + +static int +test_auth_zuc_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_zuc_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_snow_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_snow_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_snow_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_zuc_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_zuc_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_zuc_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_snow_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_snow_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_snow_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_zuc_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_zuc_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_zuc_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_null_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_null_cipher_aes_ctr_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_null_cipher_aes_ctr_test_case_1,OUT_OF_PLACE ,1 ); +} + +static int +test_auth_aes_cmac_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_null_test_case_1,OUT_OF_PLACE ,0 ); +} + +static int +test_verify_auth_aes_cmac_cipher_null_test_case_1 (void ) +{ +return test_mixed_auth_cipher ( + &auth_aes_cmac_cipher_null_test_case_1,OUT_OF_PLACE ,1 ); +} +static int test_3DES_chain_qat_all (void ) {
@@ -12296,6 +12550,68 @@ static struct unit_test_suite cryptodev_qat_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl), +/** AUTH ZUC + CIPHER SNOW3G */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_zuc_cipher_snow_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_snow_test_case_1), +/** AUTH AES CMAC + CIPHER SNOW3G */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_snow_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_snow_test_case_1), +/** AUTH ZUC + CIPHER AES CTR */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_zuc_cipher_aes_ctr_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_aes_ctr_test_case_1), +/** AUTH SNOW3G + CIPHER AES CTR */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_snow_cipher_aes_ctr_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_snow_cipher_aes_ctr_test_case_1), +/** AUTH SNOW3G + CIPHER ZUC */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_snow_cipher_zuc_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_snow_cipher_zuc_test_case_1), +/** AUTH AES CMAC + CIPHER ZUC */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_zuc_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_zuc_test_case_1), + +/** AUTH NULL + CIPHER SNOW3G */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_null_cipher_snow_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_null_cipher_snow_test_case_1), +/** AUTH NULL + CIPHER ZUC */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_null_cipher_zuc_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_null_cipher_zuc_test_case_1), +/** AUTH SNOW3G + CIPHER NULL */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_snow_cipher_null_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_snow_cipher_null_test_case_1), +/** AUTH ZUC + CIPHER NULL */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_zuc_cipher_null_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_zuc_cipher_null_test_case_1), +/** AUTH NULL + CIPHER AES CTR */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_null_cipher_aes_ctr_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_null_cipher_aes_ctr_test_case_1), +/** AUTH AES CMAC + CIPHER NULL */ + TEST_CASE_ST(ut_setup, ut_teardown, + test_auth_aes_cmac_cipher_null_test_case_1), + TEST_CASE_ST(ut_setup, ut_teardown, + test_verify_auth_aes_cmac_cipher_null_test_case_1), +TEST_CASES_END ()/**< NULL terminate unit test array */ } };
app/test/test_cryptodev_mixed_test_vectors.h +1318 -2
1,331 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v3 2/2] test/crypto: add more tests for mixed encypted-digest
Quoted 8 lines
-----Original Message-----
From: Dybkowski, AdamX <[email protected]>
Sent: Wednesday, January 15, 2020 2:59 PM
To: [email protected]; Trahe, Fiona <[email protected]>; [email protected]
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH v3 2/2] test/crypto: add more tests for mixed encypted-digest
Quoted 6 lines
This patch adds unit tests for QAT PMD for mixed encrypted-digest cases, involving SNOW3G UIA2, ZUC EIA3, AES CMAC and NULL auth algorithms together with SNOW3G UEA2, ZUC EEA3, AES CTR and NULL cipher algorithms in various combinations.
Signed-off-by Adam Dybkowski <[email protected]>
Quoted 11 lines
v2:
* Added release notes update.v3:
* Rebase, update release notes.Adam Dybkowski (2):
crypto/qat: handle mixed hash-cipher requests on GEN3 QAT test/crypto: add more tests for mixed encypted-digest
Quoted 9 lines
app/test/test_cryptodev.c | 400 +++++- app/test/test_cryptodev_mixed_test_vectors.h | 1320 +++++++++++++++++- doc/guides/cryptodevs/qat.rst | 24 + doc/guides/rel_notes/release_20_02.rst | 7 + drivers/common/qat/qat_adf/icp_qat_fw.h | 3 + drivers/common/qat/qat_adf/icp_qat_fw_la.h | 2 + drivers/crypto/qat/qat_sym_session.c | 72 + 7 files changed, 1784 insertions(+), 44 deletions(-)
Series Applied to dpdk-next-crypto
Thanks