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 5166A427EF for ; Wed, 22 Mar 2023 11:32:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CAA140E09; Wed, 22 Mar 2023 11:32:30 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 779B840A84 for ; Wed, 22 Mar 2023 11:32:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481148; 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=Gf8Z+1zLJPGvti6k+sV+LpvAREtLz42UHn2vpkOGmx0=; b=C5PKIDOj0ToYEU7t9v3c+vh5Sl0+9M7Xq7pkYw5MYwa5VMC4IifAKr9wL48LpVg1j2Zvvr rgfKAC3gPsy3ZHaf0NjPSwY7mXOp2EXDRW7Zy2dFzaxNrjt7fquV+heuZhDNWxjaBWHqSe zFBzFIxr2/11i0zA8iyW/V5PocS3f14= 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-638-CuKRqjfxOb6tMSIKRD-o5g-1; Wed, 22 Mar 2023 06:32:26 -0400 X-MC-Unique: CuKRqjfxOb6tMSIKRD-o5g-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 856553C10687; Wed, 22 Mar 2023 10:32:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AF6F492C14; Wed, 22 Mar 2023 10:32:25 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Brian Dooley , Tejasree Kondoj , Pablo de Lara , dpdk stable Subject: patch 'test/crypto: fix capability check for ZUC cipher-auth' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:31:53 +0000 Message-Id: <20230322103209.456098-6-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/23. 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/50f94c98a99308e2d9210f618fbc2093e58dca97 Thanks. Kevin --- >From 50f94c98a99308e2d9210f618fbc2093e58dca97 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 3 Mar 2023 09:38:20 +0000 Subject: [PATCH] test/crypto: fix capability check for ZUC cipher-auth [ upstream commit dd4d13779d63475aa13d2b9f9de06db145e39c78 ] The cipher-auth test function for ZUC was not using the improved cipher and auth capability check functions. This meant the required key and IV lengths were not being checked, leading to problems with ZUC-256 tests running, and failing, on devices that only support ZUC-128. Fixes: 27b787132484 ("test/crypto: check cipher parameters") Fixes: f93fce6de4aa ("test/crypto: check auth parameters") Signed-off-by: Ciara Power Acked-by: Brian Dooley Acked-by: Tejasree Kondoj Acked-by: Pablo de Lara --- app/test/test_cryptodev.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 0b4b216611..a18b15d7c2 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -136,4 +136,15 @@ static int dev_configure_and_start(uint64_t ff_disable); +static int +check_cipher_capability(const struct crypto_testsuite_params *ts_params, + const enum rte_crypto_cipher_algorithm cipher_algo, + const uint16_t key_size, const uint16_t iv_size); + +static int +check_auth_capability(const struct crypto_testsuite_params *ts_params, + const enum rte_crypto_auth_algorithm auth_algo, + const uint16_t key_size, const uint16_t iv_size, + const uint16_t tag_size); + static struct rte_mbuf * setup_test_string(struct rte_mempool *mpool, @@ -4795,5 +4806,4 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) struct rte_cryptodev_info dev_info; - struct rte_cryptodev_sym_capability_idx cap_idx; rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info); @@ -4817,17 +4827,12 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) /* Check if device supports ZUC EEA3 */ - cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER; - cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3; - - if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], - &cap_idx) == NULL) + if (check_cipher_capability(ts_params, RTE_CRYPTO_CIPHER_ZUC_EEA3, + tdata->key.len, tdata->cipher_iv.len) < 0) return TEST_SKIPPED; /* Check if device supports ZUC EIA3 */ - cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH; - cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3; - - if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], - &cap_idx) == NULL) + if (check_auth_capability(ts_params, RTE_CRYPTO_AUTH_ZUC_EIA3, + tdata->key.len, tdata->auth_iv.len, + tdata->digest.len) < 0) return TEST_SKIPPED; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.079059306 +0000 +++ 0006-test-crypto-fix-capability-check-for-ZUC-cipher-auth.patch 2023-03-22 10:30:07.905866553 +0000 @@ -1 +1 @@ -From dd4d13779d63475aa13d2b9f9de06db145e39c78 Mon Sep 17 00:00:00 2001 +From 50f94c98a99308e2d9210f618fbc2093e58dca97 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dd4d13779d63475aa13d2b9f9de06db145e39c78 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 9447777224..26ae382ad4 100644 +index 0b4b216611..a18b15d7c2 100644 @@ -27 +28 @@ -@@ -137,4 +137,15 @@ static int +@@ -136,4 +136,15 @@ static int @@ -43 +44 @@ -@@ -4762,5 +4773,4 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) +@@ -4795,5 +4806,4 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) @@ -49 +50 @@ -@@ -4784,17 +4794,12 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata) +@@ -4817,17 +4827,12 @@ test_zuc_cipher_auth(const struct wireless_test_data *tdata)