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 AAED942DA6 for ; Sat, 15 Jul 2023 00:35:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3C1942D13; Sat, 15 Jul 2023 00:35:33 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id A942040DFB for ; Sat, 15 Jul 2023 00:35:32 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-31441dfbf97so2631450f8f.1 for ; Fri, 14 Jul 2023 15:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374132; x=1691966132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uEO2GUdfWAB2VXNF223mN7GFBLsJ9D4xc6eTxvVtg4g=; b=Gv2PqGS4/vYTS8SBRL5tFZRKjrPGUVPeZTVOYreqkt9Fv2u8iW0nzu9VHXtHSZhm8q 9ZI0RyF0TvwCQ7R/RzT0K6QG3RWrUni5igcZ4Y74JU8MgsG47E8M/KzLKGB5S5gxEHfR 8ZoOtXeO95xLu241aFjw6yPc+ur4LqFfqglyWPQD33qF2YrdGI627k7/EgdDandDKlpb JA2QDWaRMsPB6ulp79clvc8B+ytlQIlqT7c4kfVgBqCMRb1w2RR/SYPbLuBeK7/tvpIK pRFc64eghNQ9q+UzzCULRiwZZ7NLcpAM/7JD6/yRPJRepnPcbcPSsgfDLmKYK04gyuSq LGAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374132; x=1691966132; 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=uEO2GUdfWAB2VXNF223mN7GFBLsJ9D4xc6eTxvVtg4g=; b=k3ZGxjNOsEZHqxva19cp5wh315MzPB6bZ5atNNK4IUlPxg4HuWSRjpIMn9VuiICk9/ WD2dDtMjbxLmWPX929807VtFifVQpSYqyEVyDm6Vf7VZ3YJNoARpkJQpQ2TRy/d3jgxy Y1YhjMHEgTrJCAg2UXTA4z6aPkchU0jkaeLqoUXuQpIQRCU+CmMdQJEtZbezHyE+NUZ7 xq0mAoVbo2R3fOrgjtCVyfwzxKA9HvS+4ZEDBbBptQVm4IWfIkWnbQ9dZUdj4j18SVJ+ ir4T5ETuB17POYyf4gjoVdpHc3UEZa2MuCWJ1rBT37wmkr107vW4kSiDPLK5tV319uov 2BMg== X-Gm-Message-State: ABy/qLbr2TsbSrRm1Knz/jhrQbBrsm1GuFeCL1cmDl0DQ6DoM+/0BN6h 3PhNZRrUAvv6wgGpW98e7270YpfktIPbTKBCC3w= X-Google-Smtp-Source: APBJJlF68bOyI6KwCiPfUhhK1PCEm+xddvTEFcD0RiAahu5NPsEq8f6ldPPuUKoCLu200pcHwHr6KA== X-Received: by 2002:a5d:518f:0:b0:313:f9a0:c530 with SMTP id k15-20020a5d518f000000b00313f9a0c530mr5029553wrv.52.1689374132345; Fri, 14 Jul 2023 15:35:32 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id k10-20020a5d66ca000000b00313f9085119sm12029734wrw.113.2023.07.14.15.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:35:32 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.9 Date: Fri, 14 Jul 2023 23:34:44 +0100 Message-Id: <20230714223447.1092828-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-1-luca.boccassi@gmail.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 20.11.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9c69847ee4a2326aa11634f133d867c6e0270a88 Thanks. Luca Boccassi --- >From 9c69847ee4a2326aa11634f133d867c6e0270a88 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 f746812980..6b22a8633c 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -698,7 +698,7 @@ prepare_aead_op(void) RTE_LOG(ERR, USER1, "Not enough memory\n"); return -ENOMEM; } - env.digest_len = vec.cipher_auth.digest.len; + env.digest_len = vec.aead.digest.len; sym->aead.data.length = vec.pt.len; sym->aead.digest.data = env.digest; @@ -707,7 +707,7 @@ prepare_aead_op(void) ret = prepare_data_mbufs(&vec.ct); 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; sym->aead.digest.phys_addr = rte_malloc_virt2iova( @@ -1835,6 +1835,7 @@ error_one_case: if (env.digest) { rte_free(env.digest); env.digest = NULL; + env.digest_len = 0; } if (env.mbuf) rte_pktmbuf_free(env.mbuf); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:09.183172980 +0100 +++ 0015-examples-fips_validation-fix-digest-length-in-AES-GC.patch 2023-07-14 23:33:08.507305494 +0100 @@ -1 +1 @@ -From 94dfc563b620b2f04db7c59b6fdee458a9e1d481 Mon Sep 17 00:00:00 2001 +From 9c69847ee4a2326aa11634f133d867c6e0270a88 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 f746812980..6b22a8633c 100644 @@ -27 +28 @@ -@@ -834,7 +834,7 @@ prepare_aead_op(void) +@@ -698,7 +698,7 @@ prepare_aead_op(void) @@ -36 +37 @@ -@@ -843,7 +843,7 @@ prepare_aead_op(void) +@@ -707,7 +707,7 @@ prepare_aead_op(void) @@ -45 +46 @@ -@@ -2618,6 +2618,7 @@ error_one_case: +@@ -1835,6 +1835,7 @@ error_one_case: @@ -51,2 +52,2 @@ - rte_pktmbuf_free(env.mbuf); - + if (env.mbuf) + rte_pktmbuf_free(env.mbuf);