From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14D6CA04AF for ; Thu, 20 Aug 2020 17:35:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DC5C1BEC3; Thu, 20 Aug 2020 17:35:09 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 9811A1E2B for ; Thu, 20 Aug 2020 17:35:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937707; 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=C6lxDZQxhfZz6To9VsD4xGpYz2eSHvrQ9Ufw87/qpfQ=; b=OK+vkyPPFTzg8cLZSu21+thUOieu9iIeozrSRWB1jBBT4E5JVaI63oRoesftWgNJ1w6rpH rlNYjGC1wVh6H7ALxOlQgFbxNR+2fRP2qr3vMDRXpzsim+7lBaRKlFFPsEKdo5kmETVPBs v8eVe2uwckK41jHsyUzSVrVKZgS5WWI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-403-r9El5mKBPg2XA9F2eHJWSg-1; Thu, 20 Aug 2020 11:35:03 -0400 X-MC-Unique: r9El5mKBPg2XA9F2eHJWSg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7499D1084C82; Thu, 20 Aug 2020 15:35:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6739F100AE53; Thu, 20 Aug 2020 15:35:01 +0000 (UTC) From: Kevin Traynor To: Archana Muniganti Cc: Kanaka Durga Kotamarthy , dpdk stable Date: Thu, 20 Aug 2020 16:33:41 +0100 Message-Id: <20200820153341.171927-36-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Thanks. Kevin. --- >From 65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Thu, 11 Jun 2020 19:14:17 +0530 Subject: [PATCH] examples/fips_validation: fix count overwrite for TDES [ upstream commit 2b84d2bd47df6545797ed9841636eb8023c4db7b ] Application updates first line of each test vector with COUNT = i(where i = 1,2,3..) assuming first line contains COUNT string. But few of the TDES input test vectors don't contain COUNT string and thus COUNT is getting overwritten on other data. Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing") Signed-off-by: Archana Muniganti Signed-off-by: Kanaka Durga Kotamarthy --- examples/fips_validation/fips_validation.c | 8 ++++++++ examples/fips_validation/main.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 6d14fe8ed4..489c8bac98 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -589,4 +589,12 @@ update_info_vec(uint32_t count) cb = &info.writeback_callbacks[0]; + if (!(strstr(info.vec[0], cb->key))) { + fprintf(info.fp_wr, "%s%u\n", cb->key, count); + i = 0; + } else { + snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key, + count); + i = 1; + } snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key, count); diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 27558baa4a..d28569d23c 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -871,5 +871,8 @@ fips_mct_tdes_test(void) for (i = 0; i < TDES_EXTERN_ITER; i++) { - if (i != 0) + if (i == 0) { + if (!(strstr(info.vec[0], "COUNT"))) + fprintf(info.fp_wr, "%s%u\n", "COUNT = ", 0); + } else update_info_vec(i); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:17.073237627 +0100 +++ 0036-examples-fips_validation-fix-count-overwrite-for-TDE.patch 2020-08-20 16:26:15.832324397 +0100 @@ -1 +1 @@ -From 2b84d2bd47df6545797ed9841636eb8023c4db7b Mon Sep 17 00:00:00 2001 +From 65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2b84d2bd47df6545797ed9841636eb8023c4db7b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3aaec20fb4..9bdf257b8b 100644 +index 6d14fe8ed4..489c8bac98 100644 @@ -26 +27 @@ -@@ -641,4 +641,12 @@ update_info_vec(uint32_t count) +@@ -589,4 +589,12 @@ update_info_vec(uint32_t count) @@ -40 +41 @@ -index f9b2056bfc..efd32a86a5 100644 +index 27558baa4a..d28569d23c 100644 @@ -43 +44 @@ -@@ -1071,5 +1071,8 @@ fips_mct_tdes_test(void) +@@ -871,5 +871,8 @@ fips_mct_tdes_test(void)