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 45555A0093 for ; Tue, 19 May 2020 15:15:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3D4E21D92E; Tue, 19 May 2020 15:15:15 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 045C21D923 for ; Tue, 19 May 2020 15:15:13 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id w7so15807909wre.13 for ; Tue, 19 May 2020 06:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hg1XpEGDh/hGC1SsUtaQPMYH20TmomQ7wqibqwZB3F4=; b=oQ0bJTCHPdzYNHZLNxxQ9c8Nz3f7QC/ZJvWh3PK+2387D5ig91Cjj48TOlqOR2Tvot ciC9RFwa51Q3bScP2GopjR68M509GfErX3Lp+5MYJwbQFuHFGk/eRhLvlusVVqB0sUkb o8U0yoHUJgjMFaT7ka/tvq8cHmyzZfaWJltC5kJf2R2EP+hbwx3b8w83+7LPuzKWsd7K jio6wDgW5CK6PhKvWiMmYD39lVuqTgBmTY1MUFgRf43GQpe3wCAGmJN33+lNbbeDQs5J PcSs8agu2T3Xb7YFP0LEMK/2dKRdsok52dIzXjENKK8sGkLNKi6SnklK3vGczls8ettw 0dIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hg1XpEGDh/hGC1SsUtaQPMYH20TmomQ7wqibqwZB3F4=; b=s7w4tEKXoPeGsWXXqhDCxfgVjGLYH8VE35rjE0AGCXAbLjF3QekY8pbK+KrxLiIbOH bOwvSEFDjdLQmhN79Bz6tNK/xa1LtcCRYBU+UlHnNAawcxBzajuq8oxWfh5eX11XLtlQ 6J7l5tzGaFEUXLJX42B9KoHefpkl1HAn56rFnsmaWCbj4FlbGwPtXmmcvc7jw8DI+5UQ PHGuKbLm6QbhB2Qd/ID9CcyI5W7etzrgxpQNVKzpTpcRK74Lw/78ajujDIiX5T5VGFi1 jLNXtUoWQ+LQvE9WHf4mu3YL8JLU+UvsGMOIZmx8qHOYaJ+KLclqZIY/vwTrS+Yo2otE v5Ag== X-Gm-Message-State: AOAM531J+pOAyAmH3tTfhYJAMO15vM6TYgQpTTp3CDQqwEERQmaHRS14 +YuIticFu7+ITUZD1D/cPjaRP5nlVOyzRbLO X-Google-Smtp-Source: ABdhPJzJErOuPVJANoryI6Y/8VsjfZ6uk1oymq5+bgZ2YQGjxOu6oqxO0hIgjcnxq5fSbPnf66EvtQ== X-Received: by 2002:a5d:510f:: with SMTP id s15mr27555819wrt.103.1589894112727; Tue, 19 May 2020 06:15:12 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 18sm3727812wmj.19.2020.05.19.06.15.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:12 -0700 (PDT) From: luca.boccassi@gmail.com To: Archana Muniganti Cc: Ayuj Verma , Anoob Joseph , dpdk stable Date: Tue, 19 May 2020 14:05:13 +0100 Message-Id: <20200519130549.112823-178-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/fips_validation: fix parsing of algorithms' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From b64337ffa33f3afb40026230ad19484e58196640 Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Fri, 17 Apr 2020 20:38:40 +0530 Subject: [PATCH] examples/fips_validation: fix parsing of algorithms [ upstream commit 90ecace4f6d741c944243dda3ae88c882d4ac12d ] Few of the NIST TDES test files don't contain TDES string. Added indicators to identify such files. These indicators are part of only NIST TDES test vector files. Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing") Signed-off-by: Archana Muniganti Signed-off-by: Ayuj Verma Acked-by: Anoob Joseph --- examples/fips_validation/fips_validation.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 07ffa62e9e..b79a095aca 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -144,6 +144,24 @@ fips_test_parse_header(void) ret = parse_test_tdes_init(); if (ret < 0) return 0; + } else if (strstr(info.vec[i], "PERMUTATION")) { + algo_parsed = 1; + info.algo = FIPS_TEST_ALGO_TDES; + ret = parse_test_tdes_init(); + if (ret < 0) + return 0; + } else if (strstr(info.vec[i], "VARIABLE")) { + algo_parsed = 1; + info.algo = FIPS_TEST_ALGO_TDES; + ret = parse_test_tdes_init(); + if (ret < 0) + return 0; + } else if (strstr(info.vec[i], "SUBSTITUTION")) { + algo_parsed = 1; + info.algo = FIPS_TEST_ALGO_TDES; + ret = parse_test_tdes_init(); + if (ret < 0) + return 0; } else if (strstr(info.vec[i], "SHA-")) { algo_parsed = 1; info.algo = FIPS_TEST_ALGO_SHA; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:51.787690209 +0100 +++ 0178-examples-fips_validation-fix-parsing-of-algorithms.patch 2020-05-19 14:04:44.520653884 +0100 @@ -1,14 +1,15 @@ -From 90ecace4f6d741c944243dda3ae88c882d4ac12d Mon Sep 17 00:00:00 2001 +From b64337ffa33f3afb40026230ad19484e58196640 Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Fri, 17 Apr 2020 20:38:40 +0530 Subject: [PATCH] examples/fips_validation: fix parsing of algorithms +[ upstream commit 90ecace4f6d741c944243dda3ae88c882d4ac12d ] + Few of the NIST TDES test files don't contain TDES string. Added indicators to identify such files. These indicators are part of only NIST TDES test vector files. Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing") -Cc: stable@dpdk.org Signed-off-by: Archana Muniganti Signed-off-by: Ayuj Verma @@ -18,7 +19,7 @@ 1 file changed, 18 insertions(+) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c -index ef24b72037..a34e34d25a 100644 +index 07ffa62e9e..b79a095aca 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -144,6 +144,24 @@ fips_test_parse_header(void)