* [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher OOP @ 2021-11-08 15:19 Anoob Joseph 2021-11-10 11:23 ` De Lara Guarch, Pablo 2021-11-10 13:04 ` [dpdk-dev] [PATCH v2] test/crypto: skip plain text compare for null cipher Anoob Joseph 0 siblings, 2 replies; 7+ messages in thread From: Anoob Joseph @ 2021-11-08 15:19 UTC (permalink / raw) To: Akhil Goyal, Declan Doherty, Fan Zhang Cc: Anoob Joseph, Jerin Jacob, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Radu Nicolau, Ciara Power, Gagandeep Singh, dev NULL cipher is used for validating auth only cases. With out of place processing, validating plain text should not be done as the PMD is only expected to update auth data. Signed-off-by: Anoob Joseph <anoobj@marvell.com> --- app/test/test_cryptodev.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index e54a1a9..964f44f 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -7490,6 +7490,22 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.len); } + /* + * NULL cipher is used for auth only cases where only authentication + * is done. With verify operation, MAC would be validated by the PMD. + * With generate operation, verify MAC generated by the PMD. + */ + if (op_mode == OUT_OF_PLACE && + tdata->cipher_algo == RTE_CRYPTO_CIPHER_NULL) { + if (!verify) + TEST_ASSERT_BUFFERS_ARE_EQUAL( + ut_params->digest, + tdata->digest_enc.data, + tdata->digest_enc.len, + "Generated auth tag not as expected"); + goto op_status_check; + } + /* Validate obuf */ if (verify) { TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( @@ -7511,6 +7527,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, "Generated auth tag not as expected"); } +op_status_check: TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS, "crypto op processing failed"); -- 2.7.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher OOP 2021-11-08 15:19 [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher OOP Anoob Joseph @ 2021-11-10 11:23 ` De Lara Guarch, Pablo 2021-11-10 11:48 ` Anoob Joseph 2021-11-10 13:04 ` [dpdk-dev] [PATCH v2] test/crypto: skip plain text compare for null cipher Anoob Joseph 1 sibling, 1 reply; 7+ messages in thread From: De Lara Guarch, Pablo @ 2021-11-10 11:23 UTC (permalink / raw) To: Anoob Joseph, Akhil Goyal, Doherty, Declan, Zhang, Roy Fan Cc: Jerin Jacob, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Nicolau, Radu, Power, Ciara, Gagandeep Singh, dev Hi Anoob, > -----Original Message----- > From: dev <dev-bounces@dpdk.org> On Behalf Of Anoob Joseph > Sent: Monday, November 8, 2021 3:20 PM > To: Akhil Goyal <gakhil@marvell.com>; Doherty, Declan > <declan.doherty@intel.com>; Zhang, Roy Fan <roy.fan.zhang@intel.com> > Cc: Anoob Joseph <anoobj@marvell.com>; Jerin Jacob <jerinj@marvell.com>; > Archana Muniganti <marchana@marvell.com>; Tejasree Kondoj > <ktejasree@marvell.com>; Hemant Agrawal <hemant.agrawal@nxp.com>; > Nicolau, Radu <radu.nicolau@intel.com>; Power, Ciara > <ciara.power@intel.com>; Gagandeep Singh <g.singh@nxp.com>; > dev@dpdk.org > Subject: [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher > OOP > > NULL cipher is used for validating auth only cases. With out of place processing, > validating plain text should not be done as the PMD is only expected to update > auth data. > > Signed-off-by: Anoob Joseph <anoobj@marvell.com> > --- > app/test/test_cryptodev.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index > e54a1a9..964f44f 100644 > --- a/app/test/test_cryptodev.c > +++ b/app/test/test_cryptodev.c > @@ -7490,6 +7490,22 @@ test_mixed_auth_cipher(const struct > mixed_cipher_auth_test_data *tdata, > tdata->digest_enc.len); > } > > + /* > + * NULL cipher is used for auth only cases where only authentication > + * is done. With verify operation, MAC would be validated by the PMD. > + * With generate operation, verify MAC generated by the PMD. > + */ > + if (op_mode == OUT_OF_PLACE && > + tdata->cipher_algo == RTE_CRYPTO_CIPHER_NULL) { Why only checking for OUT_OF_PLACE? As far as cipher algorithm is NULL, only digest should be checked. Also, looking at the code, there is this same check, but with hardcoded tag length. Could you rearrange the code to have less lines and generic? Something like: <pseudo-code> if (!verify) check_digest if (cipher_algo != NULL) check_ciphertext/plaintext check op status </pseudo-code> Also, I think this change is applicable in test_mixed_auth_cipher_sgl. Thanks, Pablo ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher OOP 2021-11-10 11:23 ` De Lara Guarch, Pablo @ 2021-11-10 11:48 ` Anoob Joseph 0 siblings, 0 replies; 7+ messages in thread From: Anoob Joseph @ 2021-11-10 11:48 UTC (permalink / raw) To: De Lara Guarch, Pablo, Akhil Goyal, Doherty, Declan, Zhang, Roy Fan Cc: Jerin Jacob Kollanukkaran, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Nicolau, Radu, Power, Ciara, Gagandeep Singh, dev, Ji, Kai Hi Pablo, Thanks for the review. Please see inline. Thanks, Anoob > -----Original Message----- > From: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com> > Sent: Wednesday, November 10, 2021 4:54 PM > To: Anoob Joseph <anoobj@marvell.com>; Akhil Goyal > <gakhil@marvell.com>; Doherty, Declan <declan.doherty@intel.com>; > Zhang, Roy Fan <roy.fan.zhang@intel.com> > Cc: Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Archana Muniganti > <marchana@marvell.com>; Tejasree Kondoj <ktejasree@marvell.com>; > Hemant Agrawal <hemant.agrawal@nxp.com>; Nicolau, Radu > <radu.nicolau@intel.com>; Power, Ciara <ciara.power@intel.com>; > Gagandeep Singh <g.singh@nxp.com>; dev@dpdk.org > Subject: [EXT] RE: [dpdk-dev] [PATCH] test/crypto: skip plain text compare > for null cipher OOP > > External Email > > ---------------------------------------------------------------------- > Hi Anoob, > > > -----Original Message----- > > From: dev <dev-bounces@dpdk.org> On Behalf Of Anoob Joseph > > Sent: Monday, November 8, 2021 3:20 PM > > To: Akhil Goyal <gakhil@marvell.com>; Doherty, Declan > > <declan.doherty@intel.com>; Zhang, Roy Fan <roy.fan.zhang@intel.com> > > Cc: Anoob Joseph <anoobj@marvell.com>; Jerin Jacob > > <jerinj@marvell.com>; Archana Muniganti <marchana@marvell.com>; > > Tejasree Kondoj <ktejasree@marvell.com>; Hemant Agrawal > > <hemant.agrawal@nxp.com>; Nicolau, Radu <radu.nicolau@intel.com>; > > Power, Ciara <ciara.power@intel.com>; Gagandeep Singh > > <g.singh@nxp.com>; dev@dpdk.org > > Subject: [dpdk-dev] [PATCH] test/crypto: skip plain text compare for > > null cipher OOP > > > > NULL cipher is used for validating auth only cases. With out of place > > processing, validating plain text should not be done as the PMD is > > only expected to update auth data. > > > > Signed-off-by: Anoob Joseph <anoobj@marvell.com> > > --- > > app/test/test_cryptodev.c | 17 +++++++++++++++++ > > 1 file changed, 17 insertions(+) > > > > diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c > > index e54a1a9..964f44f 100644 > > --- a/app/test/test_cryptodev.c > > +++ b/app/test/test_cryptodev.c > > @@ -7490,6 +7490,22 @@ test_mixed_auth_cipher(const struct > > mixed_cipher_auth_test_data *tdata, > > tdata->digest_enc.len); > > } > > > > + /* > > + * NULL cipher is used for auth only cases where only authentication > > + * is done. With verify operation, MAC would be validated by the > PMD. > > + * With generate operation, verify MAC generated by the PMD. > > + */ > > + if (op_mode == OUT_OF_PLACE && > > + tdata->cipher_algo == RTE_CRYPTO_CIPHER_NULL) { > > Why only checking for OUT_OF_PLACE? As far as cipher algorithm is NULL, > only digest should be checked. [Anoob] Agreed. I will make this change in v2. > Also, looking at the code, there is this same check, but with hardcoded tag > length. > Could you rearrange the code to have less lines and generic? [Anoob] Yes. This looks better and the code would be self-explanatory as well. Will make this change in v2. > > Something like: > > <pseudo-code> > if (!verify) > check_digest > > if (cipher_algo != NULL) > check_ciphertext/plaintext > > check op status > </pseudo-code> > > Also, I think this change is applicable in test_mixed_auth_cipher_sgl. [Anoob] Yes. I'll make that change as well. > > Thanks, > Pablo ^ permalink raw reply [flat|nested] 7+ messages in thread
* [dpdk-dev] [PATCH v2] test/crypto: skip plain text compare for null cipher 2021-11-08 15:19 [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher OOP Anoob Joseph 2021-11-10 11:23 ` De Lara Guarch, Pablo @ 2021-11-10 13:04 ` Anoob Joseph 2021-11-10 17:00 ` Power, Ciara 1 sibling, 1 reply; 7+ messages in thread From: Anoob Joseph @ 2021-11-10 13:04 UTC (permalink / raw) To: Akhil Goyal, Declan Doherty, Fan Zhang, Pablo de Lara Cc: Anoob Joseph, Jerin Jacob, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Radu Nicolau, Ciara Power, Gagandeep Singh, Kai Ji, dev, adamx.dybkowski NULL cipher is used for validating auth only cases. With NULL cipher, validating plain text should not be done as the PMD is only expected to update auth data. Fixes: e847fc512817 ("test/crypto: add encrypted digest case for AES-CTR-CMAC") Cc: adamx.dybkowski@intel.com Signed-off-by: Anoob Joseph <anoobj@marvell.com> --- Changes in v2: - Made the skip applicable for in place also (comment from Pablo) - Re-organized code as suggested by Pablo - Made same change in test_mixed_auth_cipher_sgl (comment from Pablo) app/test/test_cryptodev.c | 63 ++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 8137b8a..c223588 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -7343,27 +7343,30 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.len); } - /* Validate obuf */ - if (verify) { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - plaintext, - tdata->plaintext.data, - tdata->plaintext.len_bits >> 3, - "Plaintext data not as expected"); - } else { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - ciphertext, - tdata->ciphertext.data, - tdata->validDataLen.len_bits, - "Ciphertext data not as expected"); - + if (!verify) { TEST_ASSERT_BUFFERS_ARE_EQUAL( ut_params->digest, tdata->digest_enc.data, - DIGEST_BYTE_LENGTH_SNOW3G_UIA2, + tdata->digest_enc.len, "Generated auth tag not as expected"); } + if (tdata->cipher_algo != RTE_CRYPTO_CIPHER_NULL) { + if (verify) { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + plaintext, + tdata->plaintext.data, + tdata->plaintext.len_bits >> 3, + "Plaintext data not as expected"); + } else { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + ciphertext, + tdata->ciphertext.data, + tdata->validDataLen.len_bits, + "Ciphertext data not as expected"); + } + } + TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS, "crypto op processing failed"); @@ -7560,19 +7563,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.data, tdata->digest_enc.len); } - /* Validate obuf */ - if (verify) { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - plaintext, - tdata->plaintext.data, - tdata->plaintext.len_bits >> 3, - "Plaintext data not as expected"); - } else { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - ciphertext, - tdata->ciphertext.data, - tdata->validDataLen.len_bits, - "Ciphertext data not as expected"); + if (!verify) { TEST_ASSERT_BUFFERS_ARE_EQUAL( digest, tdata->digest_enc.data, @@ -7580,6 +7571,22 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, "Generated auth tag not as expected"); } + if (tdata->cipher_algo != RTE_CRYPTO_CIPHER_NULL) { + if (verify) { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + plaintext, + tdata->plaintext.data, + tdata->plaintext.len_bits >> 3, + "Plaintext data not as expected"); + } else { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + ciphertext, + tdata->ciphertext.data, + tdata->validDataLen.len_bits, + "Ciphertext data not as expected"); + } + } + TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS, "crypto op processing failed"); -- 2.7.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v2] test/crypto: skip plain text compare for null cipher 2021-11-10 13:04 ` [dpdk-dev] [PATCH v2] test/crypto: skip plain text compare for null cipher Anoob Joseph @ 2021-11-10 17:00 ` Power, Ciara 2021-11-10 17:16 ` De Lara Guarch, Pablo 0 siblings, 1 reply; 7+ messages in thread From: Power, Ciara @ 2021-11-10 17:00 UTC (permalink / raw) To: Anoob Joseph, Akhil Goyal, Doherty, Declan, Zhang, Roy Fan, De Lara Guarch, Pablo Cc: Jerin Jacob, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Nicolau, Radu, Gagandeep Singh, Ji, Kai, dev, adamx.dybkowski, De Lara Guarch, Pablo Hi Anoob, >-----Original Message----- >From: Anoob Joseph <anoobj@marvell.com> >Sent: Wednesday 10 November 2021 13:04 >To: Akhil Goyal <gakhil@marvell.com>; Doherty, Declan ><declan.doherty@intel.com>; Zhang, Roy Fan <roy.fan.zhang@intel.com>; De >Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com> >Cc: Anoob Joseph <anoobj@marvell.com>; Jerin Jacob <jerinj@marvell.com>; >Archana Muniganti <marchana@marvell.com>; Tejasree Kondoj ><ktejasree@marvell.com>; Hemant Agrawal <hemant.agrawal@nxp.com>; >Nicolau, Radu <radu.nicolau@intel.com>; Power, Ciara ><ciara.power@intel.com>; Gagandeep Singh <g.singh@nxp.com>; Ji, Kai ><kai.ji@intel.com>; dev@dpdk.org; adamx.dybkowski@intel.com >Subject: [PATCH v2] test/crypto: skip plain text compare for null cipher > >NULL cipher is used for validating auth only cases. With NULL cipher, validating >plain text should not be done as the PMD is only expected to update auth >data. > >Fixes: e847fc512817 ("test/crypto: add encrypted digest case for AES-CTR- >CMAC") >Cc: adamx.dybkowski@intel.com > >Signed-off-by: Anoob Joseph <anoobj@marvell.com> >--- >Changes in v2: >- Made the skip applicable for in place also (comment from Pablo) >- Re-organized code as suggested by Pablo >- Made same change in test_mixed_auth_cipher_sgl (comment from Pablo) > > app/test/test_cryptodev.c | 63 ++++++++++++++++++++++++++-------------- Acked-by: Ciara Power <ciara.power@intel.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v2] test/crypto: skip plain text compare for null cipher 2021-11-10 17:00 ` Power, Ciara @ 2021-11-10 17:16 ` De Lara Guarch, Pablo 2021-11-11 11:04 ` Akhil Goyal 0 siblings, 1 reply; 7+ messages in thread From: De Lara Guarch, Pablo @ 2021-11-10 17:16 UTC (permalink / raw) To: Power, Ciara, Anoob Joseph, Akhil Goyal, Doherty, Declan, Zhang, Roy Fan Cc: Jerin Jacob, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Nicolau, Radu, Gagandeep Singh, Ji, Kai, dev, adamx.dybkowski Hi Anoob, > -----Original Message----- > From: Power, Ciara <ciara.power@intel.com> > Sent: Wednesday, November 10, 2021 5:01 PM > To: Anoob Joseph <anoobj@marvell.com>; Akhil Goyal <gakhil@marvell.com>; > Doherty, Declan <declan.doherty@intel.com>; Zhang, Roy Fan > <roy.fan.zhang@intel.com>; De Lara Guarch, Pablo > <pablo.de.lara.guarch@intel.com> > Cc: Jerin Jacob <jerinj@marvell.com>; Archana Muniganti > <marchana@marvell.com>; Tejasree Kondoj <ktejasree@marvell.com>; Hemant > Agrawal <hemant.agrawal@nxp.com>; Nicolau, Radu > <radu.nicolau@intel.com>; Gagandeep Singh <g.singh@nxp.com>; Ji, Kai > <kai.ji@intel.com>; dev@dpdk.org; adamx.dybkowski@intel.com; De Lara > Guarch, Pablo <pablo.de.lara.guarch@intel.com> > Subject: RE: [PATCH v2] test/crypto: skip plain text compare for null cipher > > Hi Anoob, > > >-----Original Message----- > >From: Anoob Joseph <anoobj@marvell.com> > >Sent: Wednesday 10 November 2021 13:04 > >To: Akhil Goyal <gakhil@marvell.com>; Doherty, Declan > ><declan.doherty@intel.com>; Zhang, Roy Fan <roy.fan.zhang@intel.com>; > >De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com> > >Cc: Anoob Joseph <anoobj@marvell.com>; Jerin Jacob > ><jerinj@marvell.com>; Archana Muniganti <marchana@marvell.com>; > >Tejasree Kondoj <ktejasree@marvell.com>; Hemant Agrawal > ><hemant.agrawal@nxp.com>; Nicolau, Radu <radu.nicolau@intel.com>; > >Power, Ciara <ciara.power@intel.com>; Gagandeep Singh > ><g.singh@nxp.com>; Ji, Kai <kai.ji@intel.com>; dev@dpdk.org; > >adamx.dybkowski@intel.com > >Subject: [PATCH v2] test/crypto: skip plain text compare for null > >cipher > > > >NULL cipher is used for validating auth only cases. With NULL cipher, > >validating plain text should not be done as the PMD is only expected to > >update auth data. > > > >Fixes: e847fc512817 ("test/crypto: add encrypted digest case for > >AES-CTR- > >CMAC") > >Cc: adamx.dybkowski@intel.com > > > >Signed-off-by: Anoob Joseph <anoobj@marvell.com> > >--- > >Changes in v2: > >- Made the skip applicable for in place also (comment from Pablo) > >- Re-organized code as suggested by Pablo > >- Made same change in test_mixed_auth_cipher_sgl (comment from Pablo) > > > > app/test/test_cryptodev.c | 63 > > ++++++++++++++++++++++++++-------------- > > Acked-by: Ciara Power <ciara.power@intel.com> Wonder if this patch needs to CC stable, as it's fixing a commit from 2019? Apart from this: Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v2] test/crypto: skip plain text compare for null cipher 2021-11-10 17:16 ` De Lara Guarch, Pablo @ 2021-11-11 11:04 ` Akhil Goyal 0 siblings, 0 replies; 7+ messages in thread From: Akhil Goyal @ 2021-11-11 11:04 UTC (permalink / raw) To: De Lara Guarch, Pablo, Power, Ciara, Anoob Joseph, Doherty, Declan, Zhang, Roy Fan Cc: Jerin Jacob Kollanukkaran, Archana Muniganti, Tejasree Kondoj, Hemant Agrawal, Nicolau, Radu, Gagandeep Singh, Ji, Kai, dev, adamx.dybkowski, dpdk stable > > > > Acked-by: Ciara Power <ciara.power@intel.com> > > Wonder if this patch needs to CC stable, as it's fixing a commit from 2019? > > Apart from this: > Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com> Applied to dpdk-next-crypto Cc: stable@dpdk.org ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-11 11:04 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-11-08 15:19 [dpdk-dev] [PATCH] test/crypto: skip plain text compare for null cipher OOP Anoob Joseph 2021-11-10 11:23 ` De Lara Guarch, Pablo 2021-11-10 11:48 ` Anoob Joseph 2021-11-10 13:04 ` [dpdk-dev] [PATCH v2] test/crypto: skip plain text compare for null cipher Anoob Joseph 2021-11-10 17:00 ` Power, Ciara 2021-11-10 17:16 ` De Lara Guarch, Pablo 2021-11-11 11:04 ` Akhil Goyal
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).