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: 02ed7b3871 ("test/crypto: add SNOW3G test cases for auth-cipher")
Cc: stable@dpdk.org

Signed-off-by: Kai Ji <kai.ji@intel.com>
Signed-off-by: Damian Nowak <damianx.nowak@intel.com>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
This commit is contained in:
Kai Ji 2021-05-04 15:19:41 +01:00 committed by Akhil Goyal
parent 1c91424d0a
commit 91317c0155

View File

@ -4671,16 +4671,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(
@ -4882,16 +4886,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(