* [dpdk-dev] test/crypto: fix auth-cipher compare length in oop
@ 2021-05-04 14:19 Kai Ji
2021-05-04 16:10 ` Zhang, Roy Fan
0 siblings, 1 reply; 4+ messages in thread
From: Kai Ji @ 2021-05-04 14:19 UTC (permalink / raw)
To: dev; +Cc: damianx.nowak, roy.fan.zhang, Kai Ji
For out-of-place operations, comparing expected ciphertext with
the operation result should skip cipher_offset bytes, as those
will not be copied from source to the destination buffer, making
the tests fail.
Fixes: 02ed7b3871d6 ("test/crypto: add SNOW3G test cases for auth-cipher")
Cc: damianx.nowak@intel.com
Signed-off-by: Kai Ji <kai.ji@intel.com>
Signed-off-by: Damian Nowak <damianx.nowak@intel.com>
---
app/test/test_cryptodev.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 70bf6fe2c..d6956f9c2 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -4200,16 +4200,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
/* Validate obuf */
if (verify) {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
plaintext,
tdata->plaintext.data,
- tdata->plaintext.len >> 3,
+ (tdata->plaintext.len - tdata->cipher.offset_bits -
+ (tdata->digest.len << 3)),
+ tdata->cipher.offset_bits,
"SNOW 3G Plaintext data not as expected");
} else {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
ciphertext,
tdata->ciphertext.data,
- tdata->validDataLenInBits.len,
+ (tdata->validDataLenInBits.len -
+ tdata->cipher.offset_bits),
+ tdata->cipher.offset_bits,
"SNOW 3G Ciphertext data not as expected");
TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -4397,16 +4401,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
/* Validate obuf */
if (verify) {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
plaintext,
tdata->plaintext.data,
- tdata->plaintext.len >> 3,
+ (tdata->plaintext.len - tdata->cipher.offset_bits -
+ (tdata->digest.len << 3)),
+ tdata->cipher.offset_bits,
"SNOW 3G Plaintext data not as expected");
} else {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
ciphertext,
tdata->ciphertext.data,
- tdata->validDataLenInBits.len,
+ (tdata->validDataLenInBits.len -
+ tdata->cipher.offset_bits),
+ tdata->cipher.offset_bits,
"SNOW 3G Ciphertext data not as expected");
TEST_ASSERT_BUFFERS_ARE_EQUAL(
--
2.17.1
--------------------------------------------------------------
Intel Research and Development Ireland Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263
This e-mail and any attachments may contain confidential material for the sole
use of the intended recipient(s). Any review or distribution by others is
strictly prohibited. If you are not the intended recipient, please contact the
sender and delete all copies.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] test/crypto: fix auth-cipher compare length in oop
2021-05-04 14:19 [dpdk-dev] test/crypto: fix auth-cipher compare length in oop Kai Ji
@ 2021-05-04 16:10 ` Zhang, Roy Fan
2021-05-05 15:14 ` Akhil Goyal
0 siblings, 1 reply; 4+ messages in thread
From: Zhang, Roy Fan @ 2021-05-04 16:10 UTC (permalink / raw)
To: Ji, Kai, dev; +Cc: damianx.nowak
> -----Original Message-----
> From: Ji, Kai <kai.ji@intel.com>
> Sent: Tuesday, May 4, 2021 3:20 PM
> To: dev@dpdk.org
> Cc: damianx.nowak@intel.com; Zhang, Roy Fan <roy.fan.zhang@intel.com>;
> Ji, Kai <kai.ji@intel.com>
> Subject: [dpdk-dev] test/crypto: fix auth-cipher compare length in oop
>
> For out-of-place operations, comparing expected ciphertext with
> the operation result should skip cipher_offset bytes, as those
> will not be copied from source to the destination buffer, making
> the tests fail.
>
> Fixes: 02ed7b3871d6 ("test/crypto: add SNOW3G test cases for auth-cipher")
> Cc: damianx.nowak@intel.com
>
> Signed-off-by: Kai Ji <kai.ji@intel.com>
> Signed-off-by: Damian Nowak <damianx.nowak@intel.com>
> ---
> app/test/test_cryptodev.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
Welcome Kai!
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] test/crypto: fix auth-cipher compare length in oop
2021-05-04 16:10 ` Zhang, Roy Fan
@ 2021-05-05 15:14 ` Akhil Goyal
0 siblings, 0 replies; 4+ messages in thread
From: Akhil Goyal @ 2021-05-05 15:14 UTC (permalink / raw)
To: Zhang, Roy Fan, Ji, Kai, dev; +Cc: damianx.nowak
> > Subject: [dpdk-dev] test/crypto: fix auth-cipher compare length in oop
> >
> > For out-of-place operations, comparing expected ciphertext with
> > the operation result should skip cipher_offset bytes, as those
> > will not be copied from source to the destination buffer, making
> > the tests fail.
> >
> > Fixes: 02ed7b3871d6 ("test/crypto: add SNOW3G test cases for auth-
> cipher")
> > Cc: damianx.nowak@intel.com
> >
> > Signed-off-by: Kai Ji <kai.ji@intel.com>
> > Signed-off-by: Damian Nowak <damianx.nowak@intel.com>
> > ---
> > app/test/test_cryptodev.c | 24 ++++++++++++++++--------
> > 1 file changed, 16 insertions(+), 8 deletions(-)
> >
>
> Welcome Kai!
>
> Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
Applied to dpdk-next-crypto
Thanks.
PS. This patch was posted twice without superseding. Please take care next time to avoid confusion.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-dev] test/crypto: fix auth-cipher compare length in oop
@ 2021-05-04 13:33 Kai Ji
0 siblings, 0 replies; 4+ messages in thread
From: Kai Ji @ 2021-05-04 13:33 UTC (permalink / raw)
To: dev; +Cc: damianx.nowak, roy.fan.zhang, Kai Ji
For out-of-place operations, comparing expected ciphertext with
the operation result should skip cipher_offset bytes, as those
will not be copied from source to the destination buffer, making
the tests fail.
Fixes: 02ed7b3871d6 ("test/crypto: add SNOW3G test cases for auth-cipher")
Cc: damianx.nowak@intel.com
Signed-off-by: Kai Ji <kai.ji@intel.com>
Signed-off-by: Damian Nowak <damianx.nowak@intel.com>
---
app/test/test_cryptodev.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 70bf6fe2c..d6956f9c2 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -4200,16 +4200,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
/* Validate obuf */
if (verify) {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
plaintext,
tdata->plaintext.data,
- tdata->plaintext.len >> 3,
+ (tdata->plaintext.len - tdata->cipher.offset_bits -
+ (tdata->digest.len << 3)),
+ tdata->cipher.offset_bits,
"SNOW 3G Plaintext data not as expected");
} else {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
ciphertext,
tdata->ciphertext.data,
- tdata->validDataLenInBits.len,
+ (tdata->validDataLenInBits.len -
+ tdata->cipher.offset_bits),
+ tdata->cipher.offset_bits,
"SNOW 3G Ciphertext data not as expected");
TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -4397,16 +4401,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
/* Validate obuf */
if (verify) {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
plaintext,
tdata->plaintext.data,
- tdata->plaintext.len >> 3,
+ (tdata->plaintext.len - tdata->cipher.offset_bits -
+ (tdata->digest.len << 3)),
+ tdata->cipher.offset_bits,
"SNOW 3G Plaintext data not as expected");
} else {
- TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+ TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
ciphertext,
tdata->ciphertext.data,
- tdata->validDataLenInBits.len,
+ (tdata->validDataLenInBits.len -
+ tdata->cipher.offset_bits),
+ tdata->cipher.offset_bits,
"SNOW 3G Ciphertext data not as expected");
TEST_ASSERT_BUFFERS_ARE_EQUAL(
--
2.17.1
--------------------------------------------------------------
Intel Research and Development Ireland Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263
This e-mail and any attachments may contain confidential material for the sole
use of the intended recipient(s). Any review or distribution by others is
strictly prohibited. If you are not the intended recipient, please contact the
sender and delete all copies.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-05 15:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-04 14:19 [dpdk-dev] test/crypto: fix auth-cipher compare length in oop Kai Ji
2021-05-04 16:10 ` Zhang, Roy Fan
2021-05-05 15:14 ` Akhil Goyal
-- strict thread matches above, loose matches on Subject: below --
2021-05-04 13:33 Kai Ji
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).