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 B7DDDA0518 for ; Fri, 24 Jul 2020 14:10:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A607D1C20A; Fri, 24 Jul 2020 14:10:30 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 9AC771C20A for ; Fri, 24 Jul 2020 14:10:28 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id t142so1691061wmt.4 for ; Fri, 24 Jul 2020 05:10:28 -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=tb4VOKjPgGUY9LVWZjC3eFfrAUjF2hb4aTIT6tYw5PA=; b=JWLDTcHfRVeM51f2m9UOSVQiTBJCqX7guQqo6RLjO99S/FvmX+9jcsgFYRyCfGUK6z W4TUuMN+570yZOg+RhZrIJ1jrc7GAuvmFBdzdlTWV4wBypAUfzdKSUQn4IW0Fc5nxe7w sJE/uo33b9gGjHhZlbg+5yTgbVQdMK/5QZ0ZD4cr2GG+x/71KrtUJTr1woKAEDix/PN7 aLJz47PqROSDtfL9dd6Tyw+sJ5J1blsA7OEWHNaMjI4+HXbkq2GYuuI+W9c3db7A1cqN H8ntAoEBD7v+9Rh6LxQ80pe/4V9q4jqBnNGb0v3iKCrNZCywoaYQpjlqEwnsWS964kyn PsWw== 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=tb4VOKjPgGUY9LVWZjC3eFfrAUjF2hb4aTIT6tYw5PA=; b=EKC3nz4KrBGv1PchunfmblgotEowoDvNlmwJXHKetghhQWtbibO1rvD9El57b4lUwu rnUn6bgqvfkbasMlWrxW1OZBdSHG434YwJZK/xUNxy/kUs3eC/fEz+cckuv8FdK5fHJp pMKbsCeGFyuh1rm2HbftZABbCFW2lOy5Kd5rMSIchH2L6/lqU9WBfRm5Oi8s8i1pPZ57 ZG9pNnneToVPiEfd8karVxrnDhtxSjWSpnQAJTFd4cWc8cUNgA6fQ+6eDNoh3LcKOobW XAh6EPPNYsx/bwtz5hd5FiG6y9Dkf97kAMeiLoQRCNFaV/Al9id1OIFJJvDfFi6XAKsU O0mA== X-Gm-Message-State: AOAM53251DSj37C3G+3lxFv529W1RJQbStK/zflrkDoQnuDz3sP91yv5 448JT4LEwLHQmFC4l974WfM= X-Google-Smtp-Source: ABdhPJzBzC4DQwaLN9J1clJm6cdG/zGXnBRwAI6YnV9T9WOS8EXexwv1UxUE5UYT/QlRaEwhpcruTw== X-Received: by 2002:a1c:2e17:: with SMTP id u23mr8318303wmu.142.1595592628320; Fri, 24 Jul 2020 05:10:28 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n5sm7037455wmi.34.2020.07.24.05.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:10:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Archana Muniganti Cc: Kanaka Durga Kotamarthy , dpdk stable Date: Fri, 24 Jul 2020 12:59:49 +0100 Message-Id: <20200724120030.1863487-151-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' has been queued to stable release 19.11.4 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.4 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/26/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 c60c846704d54c8456446f308b5065c08cde4772 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 bffc682de..303f03495 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -634,6 +634,14 @@ 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); for (i = 1; i < info.nb_vec_lines; i++) { diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 9a2c8da61..693ad9b48 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -1030,7 +1030,10 @@ fips_mct_tdes_test(void) int test_mode = info.interim_info.tdes_data.test_mode; 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); fips_test_write_one_case(); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.393053800 +0100 +++ 0151-examples-fips_validation-fix-count-overwrite-for-TDE.patch 2020-07-24 12:53:48.515010708 +0100 @@ -1,8 +1,10 @@ -From 2b84d2bd47df6545797ed9841636eb8023c4db7b Mon Sep 17 00:00:00 2001 +From c60c846704d54c8456446f308b5065c08cde4772 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 @@ -10,7 +12,6 @@ other data. Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing") -Cc: stable@dpdk.org Signed-off-by: Archana Muniganti Signed-off-by: Kanaka Durga Kotamarthy @@ -20,10 +21,10 @@ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c -index 3aaec20fb..9bdf257b8 100644 +index bffc682de..303f03495 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c -@@ -640,6 +640,14 @@ update_info_vec(uint32_t count) +@@ -634,6 +634,14 @@ update_info_vec(uint32_t count) cb = &info.writeback_callbacks[0]; @@ -39,10 +40,10 @@ for (i = 1; i < info.nb_vec_lines; i++) { diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c -index f9b2056bf..efd32a86a 100644 +index 9a2c8da61..693ad9b48 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c -@@ -1070,7 +1070,10 @@ fips_mct_tdes_test(void) +@@ -1030,7 +1030,10 @@ fips_mct_tdes_test(void) int test_mode = info.interim_info.tdes_data.test_mode; for (i = 0; i < TDES_EXTERN_ITER; i++) {