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 9809542ECF for ; Thu, 20 Jul 2023 17:25:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 951DD40685; Thu, 20 Jul 2023 17:25:12 +0200 (CEST) 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 1A87F40685 for ; Thu, 20 Jul 2023 17:25:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866710; 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=GCL1ZhIcJkCS62Q69KU/ISss8gb+xKnAyV1265dsP6I=; b=IjpGl04ipBtfMARdqTuSFuEQFA47ak7Iqf4mkLrVHoZivjht+modHa3Hymmk0dFhqGJi7s COabOSFkNlOqGAKnON4BuYKmYoC79Iy74CPC+CarsvohFr9r8QP35onCwU2vQ4Uzv/SHco ZwH7uK5b2sOfG14XJek6RhMwmnB2Fog= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-20-3fNFX0kdN2yGqirJUfqMMA-1; Thu, 20 Jul 2023 11:24:34 -0400 X-MC-Unique: 3fNFX0kdN2yGqirJUfqMMA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E7EEE88D1B6; Thu, 20 Jul 2023 15:23:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 884F1492C13; Thu, 20 Jul 2023 15:23:24 +0000 (UTC) From: Kevin Traynor To: Samina Arshad Cc: Brian Dooley , Gowrishankar Muthukrishnan , dpdk stable Subject: patch 'examples/fips_validation: fix digest length in AES-GCM' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:28 +0100 Message-ID: <20230720151942.262154-137-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/1532786fc5a2fe862d872e5d47ea6dd47c6f33b4 Thanks. Kevin --- >From 1532786fc5a2fe862d872e5d47ea6dd47c6f33b4 Mon Sep 17 00:00:00 2001 From: Samina Arshad Date: Wed, 28 Jun 2023 14:38:36 +0000 Subject: [PATCH] examples/fips_validation: fix digest length in AES-GCM [ upstream commit 94dfc563b620b2f04db7c59b6fdee458a9e1d481 ] For AES GCM non JSON decrypt test cases the digest length is being set incorrectly.The digest length is not being cleared after test cases, causing an issue when running tests individually without the --path-is-folder flag. This fix adds the digest length correctly to the decrypt cases and clears the digest length after each test file. Fixes: 4aaad2995e13 ("examples/fips_validation: support GCM parsing") Signed-off-by: Samina Arshad Acked-by: Brian Dooley Acked-by: Gowrishankar Muthukrishnan --- examples/fips_validation/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index e8223206f2..a3d7aad7dd 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -714,5 +714,5 @@ prepare_aead_op(void) return -ENOMEM; } - env.digest_len = vec.cipher_auth.digest.len; + env.digest_len = vec.aead.digest.len; sym->aead.data.length = vec.pt.len; @@ -723,5 +723,5 @@ prepare_aead_op(void) if (ret < 0) return ret; - + env.digest_len = vec.aead.digest.len; sym->aead.data.length = vec.ct.len; sym->aead.digest.data = vec.aead.digest.val; @@ -1851,4 +1851,5 @@ error_one_case: rte_free(env.digest); env.digest = NULL; + env.digest_len = 0; } if (env.mbuf) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:11.201391779 +0100 +++ 0137-examples-fips_validation-fix-digest-length-in-AES-GC.patch 2023-07-20 16:17:55.221752795 +0100 @@ -1 +1 @@ -From 94dfc563b620b2f04db7c59b6fdee458a9e1d481 Mon Sep 17 00:00:00 2001 +From 1532786fc5a2fe862d872e5d47ea6dd47c6f33b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 94dfc563b620b2f04db7c59b6fdee458a9e1d481 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 4237224d9d..6518c959c4 100644 +index e8223206f2..a3d7aad7dd 100644 @@ -27 +28 @@ -@@ -835,5 +835,5 @@ prepare_aead_op(void) +@@ -714,5 +714,5 @@ prepare_aead_op(void) @@ -34 +35 @@ -@@ -844,5 +844,5 @@ prepare_aead_op(void) +@@ -723,5 +723,5 @@ prepare_aead_op(void) @@ -41 +42 @@ -@@ -2619,4 +2619,5 @@ error_one_case: +@@ -1851,4 +1851,5 @@ error_one_case: @@ -46 +47 @@ - rte_pktmbuf_free(env.mbuf); + if (env.mbuf)