test/crypto: add operation status checks
PATCH 1/1 test/crypto: add operation status checks
This patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD.
--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)
app/test/test_cryptodev.c +52 -44
@@ -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; }
@@ -152,6 +152,11 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)while (rte_cryptodev_dequeue_burst (dev_id,0 , &op,1 ) ==0 )rte_pause (); +if (op->status !=RTE_CRYPTO_OP_STATUS_SUCCESS ) { +RTE_LOG (DEBUG ,USER1 ,"Operation status %d\n" , op->status); +return NULL ; + } +return op; }
@@ -2823,9 +2828,18 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id, ut_params->sess =rte_cryptodev_sym_session_create ( ts_params->session_mpool); - status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, - &ut_params->auth_xform, - ts_params->session_priv_mpool); +if (cipher_op ==RTE_CRYPTO_CIPHER_OP_DECRYPT ) { + ut_params->auth_xform.next =NULL ; + ut_params->cipher_xform.next = &ut_params->auth_xform; + status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, + &ut_params->cipher_xform, + ts_params->session_priv_mpool); + + }else + status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, + &ut_params->auth_xform, + ts_params->session_priv_mpool); +TEST_ASSERT_EQUAL (status,0 ,"session init failed" );TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );
@@ -3018,13 +3032,14 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag, }static int -create_wireless_algo_auth_cipher_operation (unsigned int auth_tag_len, +create_wireless_algo_auth_cipher_operation ( +const uint8_t *auth_tag,unsigned int auth_tag_len,const uint8_t *cipher_iv,uint8_t cipher_iv_len,const uint8_t *auth_iv,uint8_t auth_iv_len,unsigned int data_pad_len,unsigned int cipher_len,unsigned int cipher_offset,unsigned int auth_len,unsigned int auth_offset, -uint8_t op_mode,uint8_t do_sgl) +uint8_t op_mode,uint8_t do_sgl,uint8_t verify) {struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -3081,6 +3096,10 @@ create_wireless_algo_auth_cipher_operation(unsigned int auth_tag_len, } } +/* Copy digest for the verification */ +if (verify) +memcpy (sym_op->auth.digest.data, auth_tag, auth_tag_len); +/* Copy cipher and auth IVs at the end of the crypto operation */ uint8_t *iv_ptr =rte_crypto_op_ctod_offset ( ut_params->op, uint8_t *, IV_OFFSET);
@@ -4643,7 +4662,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,/* Create SNOW 3G operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest.offset_bytes == 0 ?
@@ -4653,7 +4672,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLenInBits.len, tdata->auth.offset_bits, - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -4819,7 +4838,7 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,/* Create SNOW 3G operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest.offset_bytes == 0 ?
@@ -4829,7 +4848,7 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLenInBits.len, tdata->auth.offset_bits, - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -4988,7 +5007,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,/* Create KASUMI operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, NULL, 0, (tdata->digest.offset_bytes == 0 ?
@@ -4998,7 +5017,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -5165,7 +5184,7 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,/* Create KASUMI operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, NULL, 0, (tdata->digest.offset_bytes == 0 ?
@@ -5175,7 +5194,7 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -5666,7 +5685,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,/* Create ZUC operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest.offset_bytes == 0 ?
@@ -5676,7 +5695,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -5852,7 +5871,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,/* Create ZUC operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, NULL, 0, (tdata->digest.offset_bytes == 0 ?
@@ -5862,7 +5881,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -6643,7 +6662,7 @@ 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->digest_enc.data, 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 ?
@@ -6653,7 +6672,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLen.len_bits, tdata->auth.offset_bits, - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -6827,7 +6846,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,/* Create the operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest_enc.len, + tdata->digest_enc.data, 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 ?
@@ -6837,7 +6856,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLen.len_bits, tdata->auth.offset_bits, - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -10818,13 +10837,8 @@ test_authentication_verify_fail_when_data_corruption( ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); -TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" ); -TEST_ASSERT_NOT_EQUAL (ut_params->op->status, -RTE_CRYPTO_OP_STATUS_SUCCESS , -"authentication not failed" ); - ut_params->obuf = ut_params->op->sym->m_src; -TEST_ASSERT_NOT_NULL (ut_params->obuf,"failed to retrieve obuf" ); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" );return 0 ; }
@@ -10879,13 +10893,8 @@ test_authentication_verify_GMAC_fail_when_corruption( ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); -TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" ); -TEST_ASSERT_NOT_EQUAL (ut_params->op->status, -RTE_CRYPTO_OP_STATUS_SUCCESS , -"authentication not failed" ); - ut_params->obuf = ut_params->op->sym->m_src; -TEST_ASSERT_NOT_NULL (ut_params->obuf,"failed to retrieve obuf" ); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" );return 0 ; }
@@ -10940,13 +10949,7 @@ test_authenticated_decryption_fail_when_corruption( ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); -TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" ); -TEST_ASSERT_NOT_EQUAL (ut_params->op->status, -RTE_CRYPTO_OP_STATUS_SUCCESS , -"authentication not failed" ); - - ut_params->obuf = ut_params->op->sym->m_src; -TEST_ASSERT_NOT_NULL (ut_params->obuf,"failed to retrieve obuf" ); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" );return 0 ; }
@@ -11149,6 +11152,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,const unsigned int auth_tag_len = tdata->auth_tag.len;const unsigned int iv_len = tdata->iv.len;unsigned int aad_len = tdata->aad.len; +unsigned int aad_len_pad =0 ;/* Generate Crypto op data structure */ ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
@@ -11203,8 +11207,10 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,rte_memcpy (iv_ptr, tdata->iv.data, iv_len); + aad_len_pad =RTE_ALIGN_CEIL (aad_len,16 ); + sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend ( - ut_params->ibuf, aad_len); + ut_params->ibuf, aad_len_pad);TEST_ASSERT_NOT_NULL (sym_op->aead.aad.data,"no room to prepend aad" ); sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
@@ -11219,7 +11225,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op, } sym_op->aead.data.length = tdata->plaintext.len; - sym_op->aead.data.offset = aad_len; + sym_op->aead.data.offset = aad_len_pad;return 0 ; }
@@ -11252,7 +11258,7 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,int ecx =0 ;void *digest_mem =NULL ; -uint32_t prepend_len = tdata->aad.len; +uint32_t prepend_len =RTE_ALIGN_CEIL (tdata->aad.len,16 );if (tdata->plaintext.len % fragsz !=0 ) {if (tdata->plaintext.len / fragsz +1 >SGL_MAX_NO )
@@ -11915,6 +11921,8 @@ static struct unit_test_suite cryptodev_qat_testsuite = { test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),TEST_CASE_ST (ut_setup, ut_teardown, test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B), +TEST_CASE_ST (ut_setup, ut_teardown, + test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),TEST_CASE_ST (ut_setup, ut_teardown, test_AES_GCM_authenticated_encryption_test_case_1), TEST_CASE_ST(ut_setup, ut_teardown,
Signature · 1 line
2.17.1
Hi Adam,
Quoted 8 lines
-----Original Message-----
From: Dybkowski, AdamX <[email protected]>
Sent: Friday, December 20, 2019 11:50 AM
To: [email protected]; Trahe, Fiona <[email protected]>; [email protected]; Doherty, Declan <[email protected]>
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH] test/crypto: add operation status checks
Quoted 5 lines
This patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD.
[Fiona] This should be marked as a fix for backporting
Quoted 10 lines
Signed-off-by Adam Dybkowski <[email protected]>--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)app/test/test_cryptodev.c +0
-0
app/test/test_cryptodev.c static struct rte_crypto_op * · line 146
Quoted 5 lines
app/test/test_cryptodev.c +1
-1@@ -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");
[Fiona] Can you replace this with RTE_LOG while you're modifying it please
app/test/test_cryptodev.c process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op) · line 159
Quoted 12 lines
app/test/test_cryptodev.c +5
-0return NULL ; }@@ -152,6 +152,11 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)while (rte_cryptodev_dequeue_burst (dev_id,0 , &op,1 ) ==0 )rte_pause (); +if (op->status !=RTE_CRYPTO_OP_STATUS_SUCCESS ) { +RTE_LOG (DEBUG ,USER1 ,"Operation status %d\n" , op->status); +return NULL ; + } +
[Fiona] are there any negative tests - e.g. that expect to see an auth verify failure or invalid session - that would be affected by this? If so should the actual status be returned?
Hi Fiona.
Answers inline below.
Quoted 19 lines
-----Original Message-----
From: Trahe, Fiona
Sent: Friday, 20 December, 2019 13:39
To: Dybkowski, AdamX <[email protected]>; [email protected]; [email protected]; Doherty, Declan <[email protected]>
Cc: Trahe, Fiona <[email protected]>
Subject: RE: [PATCH] test/crypto: add operation status checksHi Adam,
Quoted 8 lines
-----Original Message-----
From: Dybkowski, AdamX <[email protected]>
Sent: Friday, December 20, 2019 11:50 AM
To: [email protected]; Trahe, Fiona <[email protected]>; [email protected]; Doherty, Declan <[email protected]>
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH] test/crypto: add operation status checks
Quoted 6 lines
Quoted 5 lines
This patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD.
[Fiona] This should be marked as a fix for backporting
[Adam] OK, will do in v2.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Adam Dybkowski <[email protected]>--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)
Quoted 10 lines
app/test/test_cryptodev.c static struct rte_crypto_op * · line 145
Quoted 9 lines
app/test/test_cryptodev.c +1
-1@@ -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");[Fiona] Can you replace this with
RTE_LOGwhile you're modifying it please
[Adam] OK, will do in v2.
Quoted 7 lines
Quoted 7 lines
app/test/test_cryptodev.c +0
-0return NULL ; }@@ -152,6 +152,11 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op) while (rte_cryptodev_dequeue_burst(dev_id, 0, &op,1 ) ==0 )rte_pause ();
Quoted 6 lines
app/test/test_cryptodev.c process_crypto_request(uint8_t dev_id, struct · line 157
Quoted 3 lines
app/test/test_cryptodev.c +3
-0+if (op->status !=RTE_CRYPTO_OP_STATUS_SUCCESS ) {RTE_LOG (DEBUG , +USER1 ,"Operation status %d\n" , op->status);return NULL ; } +[Fiona] are there any negative tests - e.g. that expect to see an auth verify failure or invalid session - that would be affected by this? If so should the actual status be returned?
[Adam] Few negative tests had to be updated because now in the case of any
op error, the process request function returns NULL. The negative tests now check
for the NULL instead of checking for nonzero op status. This was done intest_authenticated_decryption_fail_when_corruption, test_authentication_verify_GMAC_fail_when_corruption and test_authentication_verify_fail_when_data_corruption.
v2 cover test/crypto: fix missing operation status check
In reply to Adam DybkowskiThis patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD. Also fixed the missing aad padding issue revealed after op status checking was introduced.
---
v2:
* update the commit message, add missing "Fixes" tags
* use RTE_LOG instead of printf
Adam Dybkowski (1):
test/crypto: fix missing operation status check
app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/1 test/crypto: fix missing operation status check
This patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD. Also fixed the missing aad padding issue revealed after op status checking was introduced.
--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)
app/test/test_cryptodev.c +52 -44
@@ -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"); + RTE_LOG(ERR, USER1, "Error sending packet for encryption\n"); return NULL; }
@@ -152,6 +152,11 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)while (rte_cryptodev_dequeue_burst (dev_id,0 , &op,1 ) ==0 )rte_pause (); +if (op->status !=RTE_CRYPTO_OP_STATUS_SUCCESS ) { +RTE_LOG (DEBUG ,USER1 ,"Operation status %d\n" , op->status); +return NULL ; + } +return op; }
@@ -2823,9 +2828,18 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id, ut_params->sess =rte_cryptodev_sym_session_create ( ts_params->session_mpool); - status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, - &ut_params->auth_xform, - ts_params->session_priv_mpool); +if (cipher_op ==RTE_CRYPTO_CIPHER_OP_DECRYPT ) { + ut_params->auth_xform.next =NULL ; + ut_params->cipher_xform.next = &ut_params->auth_xform; + status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, + &ut_params->cipher_xform, + ts_params->session_priv_mpool); + + }else + status =rte_cryptodev_sym_session_init (dev_id, ut_params->sess, + &ut_params->auth_xform, + ts_params->session_priv_mpool); +TEST_ASSERT_EQUAL (status,0 ,"session init failed" );TEST_ASSERT_NOT_NULL (ut_params->sess,"Session creation failed" );
@@ -3018,13 +3032,14 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag, }static int -create_wireless_algo_auth_cipher_operation (unsigned int auth_tag_len, +create_wireless_algo_auth_cipher_operation ( +const uint8_t *auth_tag,unsigned int auth_tag_len,const uint8_t *cipher_iv,uint8_t cipher_iv_len,const uint8_t *auth_iv,uint8_t auth_iv_len,unsigned int data_pad_len,unsigned int cipher_len,unsigned int cipher_offset,unsigned int auth_len,unsigned int auth_offset, -uint8_t op_mode,uint8_t do_sgl) +uint8_t op_mode,uint8_t do_sgl,uint8_t verify) {struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -3081,6 +3096,10 @@ create_wireless_algo_auth_cipher_operation(unsigned int auth_tag_len, } } +/* Copy digest for the verification */ +if (verify) +memcpy (sym_op->auth.digest.data, auth_tag, auth_tag_len); +/* Copy cipher and auth IVs at the end of the crypto operation */ uint8_t *iv_ptr =rte_crypto_op_ctod_offset ( ut_params->op, uint8_t *, IV_OFFSET);
@@ -4643,7 +4662,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,/* Create SNOW 3G operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest.offset_bytes == 0 ?
@@ -4653,7 +4672,7 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLenInBits.len, tdata->auth.offset_bits, - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -4819,7 +4838,7 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,/* Create SNOW 3G operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest.offset_bytes == 0 ?
@@ -4829,7 +4848,7 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLenInBits.len, tdata->auth.offset_bits, - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -4988,7 +5007,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,/* Create KASUMI operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, NULL, 0, (tdata->digest.offset_bytes == 0 ?
@@ -4998,7 +5017,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -5165,7 +5184,7 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,/* Create KASUMI operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, NULL, 0, (tdata->digest.offset_bytes == 0 ?
@@ -5175,7 +5194,7 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -5666,7 +5685,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,/* Create ZUC operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, tdata->auth_iv.data, tdata->auth_iv.len, (tdata->digest.offset_bytes == 0 ?
@@ -5676,7 +5695,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -5852,7 +5871,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,/* Create ZUC operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest.len, + tdata->digest.data, tdata->digest.len, tdata->cipher_iv.data, tdata->cipher_iv.len, NULL, 0, (tdata->digest.offset_bytes == 0 ?
@@ -5862,7 +5881,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, tdata->validCipherOffsetInBits.len, tdata->validAuthLenInBits.len,0 , - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -6643,7 +6662,7 @@ 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->digest_enc.data, 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 ?
@@ -6653,7 +6672,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLen.len_bits, tdata->auth.offset_bits, - op_mode, 0); + op_mode, 0, verify);if (retval <0 )return retval;
@@ -6827,7 +6846,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,/* Create the operation */ retval = create_wireless_algo_auth_cipher_operation( - tdata->digest_enc.len, + tdata->digest_enc.data, 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 ?
@@ -6837,7 +6856,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->cipher.offset_bits, tdata->validAuthLen.len_bits, tdata->auth.offset_bits, - op_mode, 1); + op_mode, 1, verify);if (retval <0 )return retval;
@@ -10818,13 +10837,8 @@ test_authentication_verify_fail_when_data_corruption( ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); -TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" ); -TEST_ASSERT_NOT_EQUAL (ut_params->op->status, -RTE_CRYPTO_OP_STATUS_SUCCESS , -"authentication not failed" ); - ut_params->obuf = ut_params->op->sym->m_src; -TEST_ASSERT_NOT_NULL (ut_params->obuf,"failed to retrieve obuf" ); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" );return 0 ; }
@@ -10879,13 +10893,8 @@ test_authentication_verify_GMAC_fail_when_corruption( ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); -TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" ); -TEST_ASSERT_NOT_EQUAL (ut_params->op->status, -RTE_CRYPTO_OP_STATUS_SUCCESS , -"authentication not failed" ); - ut_params->obuf = ut_params->op->sym->m_src; -TEST_ASSERT_NOT_NULL (ut_params->obuf,"failed to retrieve obuf" ); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" );return 0 ; }
@@ -10940,13 +10949,7 @@ test_authenticated_decryption_fail_when_corruption( ut_params->op =process_crypto_request (ts_params->valid_devs[0 ], ut_params->op); -TEST_ASSERT_NOT_NULL (ut_params->op,"failed crypto process" ); -TEST_ASSERT_NOT_EQUAL (ut_params->op->status, -RTE_CRYPTO_OP_STATUS_SUCCESS , -"authentication not failed" ); - - ut_params->obuf = ut_params->op->sym->m_src; -TEST_ASSERT_NOT_NULL (ut_params->obuf,"failed to retrieve obuf" ); +TEST_ASSERT_NULL (ut_params->op,"authentication not failed" );return 0 ; }
@@ -11149,6 +11152,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,const unsigned int auth_tag_len = tdata->auth_tag.len;const unsigned int iv_len = tdata->iv.len;unsigned int aad_len = tdata->aad.len; +unsigned int aad_len_pad =0 ;/* Generate Crypto op data structure */ ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
@@ -11203,8 +11207,10 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,rte_memcpy (iv_ptr, tdata->iv.data, iv_len); + aad_len_pad =RTE_ALIGN_CEIL (aad_len,16 ); + sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend ( - ut_params->ibuf, aad_len); + ut_params->ibuf, aad_len_pad);TEST_ASSERT_NOT_NULL (sym_op->aead.aad.data,"no room to prepend aad" ); sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
@@ -11219,7 +11225,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op, } sym_op->aead.data.length = tdata->plaintext.len; - sym_op->aead.data.offset = aad_len; + sym_op->aead.data.offset = aad_len_pad;return 0 ; }
@@ -11252,7 +11258,7 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,int ecx =0 ;void *digest_mem =NULL ; -uint32_t prepend_len = tdata->aad.len; +uint32_t prepend_len =RTE_ALIGN_CEIL (tdata->aad.len,16 );if (tdata->plaintext.len % fragsz !=0 ) {if (tdata->plaintext.len / fragsz +1 >SGL_MAX_NO )
@@ -11915,6 +11921,8 @@ static struct unit_test_suite cryptodev_qat_testsuite = { test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),TEST_CASE_ST (ut_setup, ut_teardown, test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B), +TEST_CASE_ST (ut_setup, ut_teardown, + test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),TEST_CASE_ST (ut_setup, ut_teardown, test_AES_GCM_authenticated_encryption_test_case_1), TEST_CASE_ST(ut_setup, ut_teardown,
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v2 1/1] test/crypto: fix missing operation status check
Quoted 16 lines
-----Original Message-----
From: Dybkowski, AdamX <[email protected]>
Sent: Friday, December 20, 2019 12:59 PM
To: [email protected]; Trahe, Fiona <[email protected]>; [email protected]; Doherty, Declan <[email protected]>; [email protected]
Cc: Dybkowski, AdamX <[email protected]>
Subject: [PATCH v2 1/1] test/crypto: fix missing operation status checkThis patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD. Also fixed the missing aad padding issue revealed after op status checking was introduced.
Quoted 4 lines
Fixes c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented")Fixes 77a217a19bb7 ("test/crypto: add AES-CCM tests")Signed-off-by Adam Dybkowski <[email protected]>
Re: [dpdk-dev] [PATCH v2 1/1] test/crypto: fix missing operation status check
In reply to Adam DybkowskiQuoted 7 lines
This patch adds checking of the symmetric crypto operation status that was silently skipped before. It fixes the wireless algorithms session creation (SNOW3G, KASUMI, ZUC) and passing of the digest data for the verification by PMD. Also fixed the missing aad padding issue revealed after op status checking was introduced.
Quoted 8 lines
Fixes c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented")Fixes 77a217a19bb7 ("test/crypto: add AES-CCM tests")Signed-off-by Adam Dybkowski <[email protected]>--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)
Akhil Goyal
AppliedRe: [dpdk-dev] [PATCH v2 1/1] test/crypto: fix missing operation status check
Quoted 4 lines
Quoted 4 lines
Fixes c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented")Fixes 77a217a19bb7 ("test/crypto: add AES-CCM tests")
Quoted 8 lines
Quoted 5 lines
Signed-off-by Adam Dybkowski <[email protected]>--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)Tested-by Ankur Dwivedi <[email protected]>Reviewed-by Anoob Joseph <[email protected]>
Applied to dpdk-next-crypto
Thanks
Re: [dpdk-dev] [dpdk-stable] [PATCH v2 1/1] test/crypto: fix missing operation status check
15/01/2020 16:54, Akhil Goyal:
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Fixes c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented")Fixes 77a217a19bb7 ("test/crypto: add AES-CCM tests")Signed-off-by Adam Dybkowski <[email protected]>--- app/test/test_cryptodev.c | 96 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 44 deletions(-)
Quoted 4 lines
Quoted 2 lines
Tested-by Ankur Dwivedi <[email protected]>Reviewed-by Anoob Joseph <[email protected]>Applied to dpdk-next-crypto
Cc: [email protected] is missing
I guess you want to backport it so I add the tag in master.