patch 'test/crypto: fix debug messages' has been queued to stable release 19.11.14

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Fri Nov 11 12:38:30 CET 2022


Hi,

FYI, your patch has been queued to stable release 19.11.14

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/18/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/32b1e6562d1af9335721e5ea652513830fa42d73

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 32b1e6562d1af9335721e5ea652513830fa42d73 Mon Sep 17 00:00:00 2001
From: Sunyang Wu <sunyang.wu at jaguarmicro.com>
Date: Tue, 26 Jul 2022 11:38:19 +0800
Subject: [PATCH] test/crypto: fix debug messages

[ upstream commit 1c6b77de0aa97072372fa80891c93063ec132c1a ]

When the queue_ops_rsa_enc_dec function is called, the plaintext will
be printed twice instead of both plaintext and ciphertext. When the
create_aead_operation function is called, the contents of iv and aad
will be printed incorrectly. This patch fixes the issues above.

Fixes: 77a217a19bb7 ("test/crypto: add AES-CCM tests")
Fixes: 5ae36995f10f ("test/crypto: move RSA enqueue/dequeue into functions")

Signed-off-by: Sunyang Wu <sunyang.wu at jaguarmicro.com>
Reviewed-by: Joey Xing <joey.xing at jaguarmicro.com>
Reviewed-by: Qingmin Liu <qingmin.liu at jaguarmicro.com>
Reviewed-by: Lei Cai <lei.cai at jaguarmicro.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 app/test/test_cryptodev.c      | 4 ++--
 app/test/test_cryptodev_asym.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 8ad2f251e5..279cf8b07c 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -7708,7 +7708,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
 				rte_pktmbuf_iova(ut_params->ibuf);
 		/* Copy AAD 18 bytes after the AAD pointer, according to the API */
 		memcpy(sym_op->aead.aad.data + 18, tdata->aad.data, tdata->aad.len);
-		debug_hexdump(stdout, "aad:", sym_op->aead.aad.data,
+		debug_hexdump(stdout, "aad:", sym_op->aead.aad.data + 18,
 			tdata->aad.len);
 
 		/* Append IV at the end of the crypto operation*/
@@ -7717,7 +7717,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
 
 		/* Copy IV 1 byte after the IV pointer, according to the API */
 		rte_memcpy(iv_ptr + 1, tdata->iv.data, tdata->iv.len);
-		debug_hexdump(stdout, "iv:", iv_ptr,
+		debug_hexdump(stdout, "iv:", iv_ptr + 1,
 			tdata->iv.len);
 	} else {
 		aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 9254c17183..fd398cd90d 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -207,8 +207,8 @@ queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)
 		status = TEST_FAILED;
 		goto error_exit;
 	}
-	debug_hexdump(stdout, "encrypted message", asym_op->rsa.message.data,
-		      asym_op->rsa.message.length);
+	debug_hexdump(stdout, "encrypted message", asym_op->rsa.cipher.data,
+		      asym_op->rsa.cipher.length);
 
 	/* Use the resulted output as decryption Input vector*/
 	asym_op = result_op->asym;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:05.246009058 +0100
+++ 0013-test-crypto-fix-debug-messages.patch	2022-11-11 12:35:04.737191864 +0100
@@ -1 +1 @@
-From 1c6b77de0aa97072372fa80891c93063ec132c1a Mon Sep 17 00:00:00 2001
+From 32b1e6562d1af9335721e5ea652513830fa42d73 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c6b77de0aa97072372fa80891c93063ec132c1a ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index 69a0301de0..54ce306b42 100644
+index 8ad2f251e5..279cf8b07c 100644
@@ -29 +30 @@
-@@ -8287,7 +8287,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
+@@ -7708,7 +7708,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
@@ -38 +39 @@
-@@ -8296,7 +8296,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
+@@ -7717,7 +7717,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
@@ -48 +49 @@
-index fc1a727472..9da54530e5 100644
+index 9254c17183..fd398cd90d 100644
@@ -51 +52 @@
-@@ -208,8 +208,8 @@ queue_ops_rsa_enc_dec(void *sess)
+@@ -207,8 +207,8 @@ queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)


More information about the stable mailing list