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 6D7D6A04DD for ; Wed, 18 Nov 2020 17:38:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 37E2CC922; Wed, 18 Nov 2020 17:37:42 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 6C568C9A0 for ; Wed, 18 Nov 2020 17:37:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717457; 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=WxZkcSRofVIdO9ZeZcGUL0AdGkKMYpzECJRD8J3NRRo=; b=OaPTJ+kolElzGoJ5v0SUsNhQPEgRDnfL4s6535j2D8gwFu+zDMoNfgnkjtFwMOfiyATohz lUiVNopTjdprw4uyrDvQ7kNLcB8qlLGg9UNnAw5sih6SSdmnALtXj9K43W+CK2kP62wXSR IyO1dS5EInaNL9X46j9HX5gAowFevRQ= 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-423-rpFxRGPVN2KH-E5zfiFgJQ-1; Wed, 18 Nov 2020 11:37:35 -0500 X-MC-Unique: rpFxRGPVN2KH-E5zfiFgJQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF28B10766BA; Wed, 18 Nov 2020 16:37:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBA965C1A3; Wed, 18 Nov 2020 16:37:32 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: dpdk stable Date: Wed, 18 Nov 2020 16:35:32 +0000 Message-Id: <20201118163558.1101823-46-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'examples/fips_validation: fix missed version line' has been queued to LTS release 18.11.11 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.11 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/24/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/459faf05d3533a11aff082c933ae4bc21cc2c8d8 Thanks. Kevin. --- >From 459faf05d3533a11aff082c933ae4bc21cc2c8d8 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 22 Oct 2020 10:59:26 +0100 Subject: [PATCH] examples/fips_validation: fix missed version line [ upstream commit ecc3356fed449f0245127655aefb30844c1889c4 ] This patch fixes the missing version line in the response file. Fixes: 793650184099 ("examples/fips_validation: fix version compatibility") Signed-off-by: Fan Zhang --- examples/fips_validation/fips_validation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 489c8bac98..d46f72d9b8 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -106,5 +106,5 @@ fips_test_parse_header(void) return ret; - for (i = 0; i < info.nb_vec_lines; i++) { + for (i = 1; i < info.nb_vec_lines; i++) { if (strstr(info.vec[i], "AESVS")) { info.algo = FIPS_TEST_ALGO_AES; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.796132599 +0000 +++ 0046-examples-fips_validation-fix-missed-version-line.patch 2020-11-18 16:33:37.946215073 +0000 @@ -1 +1 @@ -From ecc3356fed449f0245127655aefb30844c1889c4 Mon Sep 17 00:00:00 2001 +From 459faf05d3533a11aff082c933ae4bc21cc2c8d8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ecc3356fed449f0245127655aefb30844c1889c4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 7454a03b16..4c3ed80c82 100644 +index 489c8bac98..d46f72d9b8 100644 @@ -20,2 +21,2 @@ -@@ -119,5 +119,5 @@ fips_test_parse_header(void) - fips_test_parse_version(); +@@ -106,5 +106,5 @@ fips_test_parse_header(void) + return ret; @@ -23,4 +24,4 @@ -- for (i = 1; i < info.nb_vec_lines; i++) { -+ for (i = 0; i < info.nb_vec_lines; i++) { - if (!algo_parsed) { - if (strstr(info.vec[i], "AESVS")) { +- for (i = 0; i < info.nb_vec_lines; i++) { ++ for (i = 1; i < info.nb_vec_lines; i++) { + if (strstr(info.vec[i], "AESVS")) { + info.algo = FIPS_TEST_ALGO_AES;