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 EB625A0561 for ; Thu, 27 Feb 2020 18:38:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E22161BF76; Thu, 27 Feb 2020 18:38:39 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 9CEF11BF76 for ; Thu, 27 Feb 2020 18:38:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582825118; 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=LHQlESSJwVcgBZpZlplTvzTdOdQEMPl0fEK2/SN75rI=; b=KrrP9vILtKk32b7ZN5wW8LADefVDRM7Oty98izcu6KIim5sJWkSQi2R4pt0DYfkqus57g+ 5470pB41OhCoeeDl0FrZE2eNSs2FHT/5sIFJeLddmkmy+fuDZZm1DJ9D8ZUg76yv6NP7lR 2ei7dk2qfqcQkcyp2TWhwLv1KKdJQsQ= 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-167-EiuOr3uFOD69XWhuxC0bUw-1; Thu, 27 Feb 2020 12:38:32 -0500 X-MC-Unique: EiuOr3uFOD69XWhuxC0bUw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 294C618C35A0; Thu, 27 Feb 2020 17:38:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1A3D8C087; Thu, 27 Feb 2020 17:38:26 +0000 (UTC) From: Kevin Traynor To: Anoob Joseph Cc: Akhil Goyal , dpdk stable Date: Thu, 27 Feb 2020 17:37:53 +0000 Message-Id: <20200227173807.28004-2-ktraynor@redhat.com> In-Reply-To: <20200227173807.28004-1-ktraynor@redhat.com> References: <20200227173807.28004-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'examples/fips_validation: fix string token for CT length' has been queued to LTS release 18.11.7 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.7 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/02/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 rebasi= ng (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/6e62eeab5dfbfcf019= 3284495de7d16fa3330181 Thanks. Kevin. --- >From 6e62eeab5dfbfcf0193284495de7d16fa3330181 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Tue, 18 Feb 2020 16:01:12 +0530 Subject: [PATCH] examples/fips_validation: fix string token for CT length [ upstream commit b1ea86a07cbce6d5b0a9b05a4e0c0fbbe56ad20d ] The NIST test vectors use the string 'PTlen' to denote text lengths in case of encrypt & decrypt operations. So the same string needs to be used while parsing PT and CT. Fixes: 2adb3b4e7e54 ("examples/fips_validation: fix AES-GCM cipher length p= arsing") Signed-off-by: Anoob Joseph Acked-by: Akhil Goyal --- examples/fips_validation/fips_validation_gcm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/fips_validation/fips_validation_gcm.c b/examples/fips= _validation/fips_validation_gcm.c index f134c9cbbb..769617b640 100644 --- a/examples/fips_validation/fips_validation_gcm.c +++ b/examples/fips_validation/fips_validation_gcm.c @@ -20,5 +20,4 @@ #define AADLEN_STR=09"AADlen =3D " #define TAGLEN_STR=09"Taglen =3D " -#define CTLEN_STR=09"CTlen =3D " =20 #define COUNT_STR=09"Count =3D " @@ -48,5 +47,8 @@ struct fips_test_callback gcm_interim_vectors[] =3D { =09=09{IVLEN_STR, parser_read_uint32_bit_val, &vec.iv}, =09=09{PTLEN_STR, parser_read_uint32_bit_val, &vec.pt}, -=09=09{CTLEN_STR, parser_read_uint32_bit_val, &vec.ct}, +=09=09{PTLEN_STR, parser_read_uint32_bit_val, &vec.ct}, +=09=09/**< The NIST test vectors use 'PTlen' to denote input text +=09=09 * length in case of decrypt & encrypt operations. +=09=09 */ =09=09{AADLEN_STR, parser_read_uint32_bit_val, &vec.cipher_auth.aad}, =09=09{TAGLEN_STR, parser_read_uint32_bit_val, --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-27 17:26:23.784830999 +0000 +++ 0002-examples-fips_validation-fix-string-token-for-CT-len.patch=092020-= 02-27 17:26:23.583832489 +0000 @@ -1 +1 @@ -From b1ea86a07cbce6d5b0a9b05a4e0c0fbbe56ad20d Mon Sep 17 00:00:00 2001 +From 6e62eeab5dfbfcf0193284495de7d16fa3330181 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b1ea86a07cbce6d5b0a9b05a4e0c0fbbe56ad20d ] + @@ -19 +21 @@ -index bc2d37dcbf..47576e9a38 100644 +index f134c9cbbb..769617b640 100644 @@ -36 +38 @@ - =09=09{AADLEN_STR, parser_read_uint32_bit_val, &vec.aead.aad}, + =09=09{AADLEN_STR, parser_read_uint32_bit_val, &vec.cipher_auth.aad},