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 D1D9BA0544 for ; Fri, 11 Nov 2022 12:39:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCEFF42D0D; Fri, 11 Nov 2022 12:39:54 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 5B72240141 for ; Fri, 11 Nov 2022 12:39:53 +0100 (CET) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 35C26412D9 for ; Fri, 11 Nov 2022 11:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166793; bh=Kmtb5hOqpruJCexZqT4uop75KsAL5lK5B2EPG6xzRy8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K82fZYQE6Tbce8PjaIqEHF/56Vgu9BpmdHqFCSaTdQPpfeH8HDBo3HkmQnSh2ulBU o5f7tXZSRF410KbdFlXcgmReXk3V3vzliFwOJTc67lbm/yKF2YY2QVlIweabgAgeSE wSoKG0hePCNvATCAFPnm9Iiuevo9pcw2M/26tVMtBGbhhX+WPcqM3z5Ylg9lvJBKZq BpirSsdKI3YuPWtznBh1dQms8DoTokLHeKTjCV2acjCHW8tqYA9R5Jm/D8h6AAleVx Vug5KoRg19ipxr3iLXw+JAvRoyH6dOHbii9hrREuTyrJCkwzbAUHDQjY0lTtR8m+Or LpUoMsO7M48gA== Received: by mail-ej1-f70.google.com with SMTP id hp16-20020a1709073e1000b007adf5a83df7so2909249ejc.1 for ; Fri, 11 Nov 2022 03:39:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Kmtb5hOqpruJCexZqT4uop75KsAL5lK5B2EPG6xzRy8=; b=zTSdI/r4KaQZEfcTYao8iOLb+8ue59xJ0fxDyXQGaTtGpszXkE2AT+MhQXdzqtReTK 542Q9FM/fXm5iInn8KoUfrBBRsPhSOAmKOpk6/9SMOmFmyspujHuvjp8ms8BvJR3GWJ2 gUETaiJ+8xMJhjoJnOmXY5ia1Ex6dunPZAyuy0YuDOa/nseuBkI1DQUsHCOIXygNwwCy Wdr8zvpeC6bqyRkU5B5V+VzdLmA52NuhrBvV1gd79WZvrekcy+/rJn+lPiFNZkpnWXV/ taom8cAiqMSnFyZU9PrExJxaRWq69Y/ge1KeEkllmEH/tq9YLzwmngYlXH+FMJjhAMle gyeA== X-Gm-Message-State: ANoB5pmyrogLOrR/DvywxRI86ZBAsQFy51fcCNJ0ND6i/OtlD4TZVwh3 I3PemCtcTMs95fcw/WuXwdmFwwb7jv35NpwdavdgYY8VaHsdzL6BP1axxCpgCQsQBMHqK7SUzZp AfvgE1oHUVHjcka81nIRc8Ogk X-Received: by 2002:aa7:d396:0:b0:462:67bf:c64e with SMTP id x22-20020aa7d396000000b0046267bfc64emr1197063edq.20.1668166792114; Fri, 11 Nov 2022 03:39:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf6G/CGhivOLj5va78CNPIulCGTYoEpJ4p9IxLFm9dxBljHyGKsC1RQd+SW6XraC2cFairr8Vw== X-Received: by 2002:aa7:d396:0:b0:462:67bf:c64e with SMTP id x22-20020aa7d396000000b0046267bfc64emr1197050edq.20.1668166791915; Fri, 11 Nov 2022 03:39:51 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id v17-20020a1709067d9100b0074134543f82sm796944ejo.90.2022.11.11.03.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:39:51 -0800 (PST) From: christian.ehrhardt@canonical.com 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 19.11.14 Date: Fri, 11 Nov 2022 12:38:30 +0100 Message-Id: <20221111113904.1549618-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 --- >From 32b1e6562d1af9335721e5ea652513830fa42d73 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 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@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)