From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B596BA054A for ; Tue, 25 Oct 2022 17:08:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B2BA542C49; Tue, 25 Oct 2022 17:08:52 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3064042C1D for ; Tue, 25 Oct 2022 17:08:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0DCXCQm6F4ZtGYoeJo5yub60B9liRRd+fQxR1rSBo98=; b=NI6dAInkDnTV3+3MLbhvxVGWL2sFXSf0RlqYPZBjjQTBf14JrriQnHujHmrBXWgR6HOeaL +taplJRz1bc5v8VE+XzguUNAX4unoGXkngmebnikQT9IWfiHVANQ16UoDNuJ3syVNVaOWr +BAaYTpWJrsBmM6XXcKX2gT99t2tm68= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-649-FyYAvNuiNBuc0QHX9nIA9g-1; Tue, 25 Oct 2022 11:08:48 -0400 X-MC-Unique: FyYAvNuiNBuc0QHX9nIA9g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 873E53C11EB7; Tue, 25 Oct 2022 15:08:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B2F84A9254; Tue, 25 Oct 2022 15:08:43 +0000 (UTC) From: Kevin Traynor To: Sunyang Wu Cc: Joey Xing , Qingmin Liu , Lei Cai , Akhil Goyal , dpdk stable Subject: patch 'test/crypto: fix debug messages' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:28 +0100 Message-Id: <20221025150734.142189-33-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 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/01/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1af7871cdd2483cd8515a7f6a5e69ae033226d33 Thanks. Kevin --- >From 1af7871cdd2483cd8515a7f6a5e69ae033226d33 Mon Sep 17 00:00:00 2001 From: Sunyang Wu 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 Reviewed-by: Joey Xing Reviewed-by: Qingmin Liu Reviewed-by: Lei Cai Acked-by: Akhil Goyal --- 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 b11be735d0..da5dc4baa8 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -8076,5 +8076,5 @@ create_aead_operation(enum rte_crypto_aead_operation op, /* 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); @@ -8085,5 +8085,5 @@ 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 { diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index 1131290e88..7210497a84 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -209,6 +209,6 @@ queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess) 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*/ -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.291172900 +0100 +++ 0033-test-crypto-fix-debug-messages.patch 2022-10-25 14:18:58.396798037 +0100 @@ -1 +1 @@ -From 1c6b77de0aa97072372fa80891c93063ec132c1a Mon Sep 17 00:00:00 2001 +From 1af7871cdd2483cd8515a7f6a5e69ae033226d33 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c6b77de0aa97072372fa80891c93063ec132c1a ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 69a0301de0..54ce306b42 100644 +index b11be735d0..da5dc4baa8 100644 @@ -29 +30 @@ -@@ -8288,5 +8288,5 @@ create_aead_operation(enum rte_crypto_aead_operation op, +@@ -8076,5 +8076,5 @@ create_aead_operation(enum rte_crypto_aead_operation op, @@ -36 +37 @@ -@@ -8297,5 +8297,5 @@ create_aead_operation(enum rte_crypto_aead_operation op, +@@ -8085,5 +8085,5 @@ create_aead_operation(enum rte_crypto_aead_operation op, @@ -44 +45 @@ -index fc1a727472..9da54530e5 100644 +index 1131290e88..7210497a84 100644 @@ -47 +48 @@ -@@ -209,6 +209,6 @@ queue_ops_rsa_enc_dec(void *sess) +@@ -209,6 +209,6 @@ queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)