From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9F2D8A0C3F for ; Sat, 12 Jun 2021 01:13:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81F954003F; Sat, 12 Jun 2021 01:13:35 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2055.outbound.protection.outlook.com [40.107.212.55]) by mails.dpdk.org (Postfix) with ESMTP id 652E44003F for ; Sat, 12 Jun 2021 01:13:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lJWF8mZZqNsYT+ldhvqKu+46s2ufMN8B7PoSG1EtnCID5DMeMiOBSPo+Be3RPBDFNZIGQFc6tXdeBPj4ABdhZrBQczUVPwMnsObp8O8X9QWVIYwAbWAJeFvMD3WRGEPyFB/Er14q/65QQqyLOA8pBIKzGOfnmS3yAAjs3uJph8LBDfauzAMvagjQQb3tmj0GpghFlqPJtOdgAZRfIt61SN5eU64DwlBAq9ITMJVy7NdWPjKfKtZtEg8gcQK637dkk8WuBicLthb88trCZ1PZ/umdZKNCl6mMWmQQ0SPf+vKqRke8NYljNQzw1oYb8OsArFzhpiZE1pKOhIOHF1JkOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uAo8j0/icXYi8A7pho9dbvCbnExLc+gPxFEuoMfwAJA=; b=m3Y44gXyV8sh8yLN7M4zsR0okx042CQNqqBl+C0vbcna/Di2IH9WYU18Unn1Ja3DASHzTweoaq7a4jk8uZDUnP9Gr5aMtMsUouB0dvX2wMVbxwtNfdt8iC0miukagTuUA28K7woDc+JxoVQPHbIgFeKIwxSOhyjohmZI70mteLp/qLPY9a/+u/UcE8PvKX3a523WzDWwLlPLgsklXHd3KIEXNcH+cCjA2aqwNPpnVvFVj/FlxgRvsr3J62x5cRQJlbtTf67AJWEpySxlnkhzXB+0K7cGi7sgbkR2szN0mlbmP47BCfoR0tByZqJmDPMUI8RtJZxuk6zCDP2lowvBTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uAo8j0/icXYi8A7pho9dbvCbnExLc+gPxFEuoMfwAJA=; b=tb9ndg7jSr2M2diGE40+eOq4tP+cL9AC1kgB0hGwl6eroIKdf65NvjeyCPKK5iT78Mh/fCbeuHlejcrMRMQyxJwX/z/A6GcmJ1aL0K3CsKCrFTvjbzJ0ATRKVTVXzvBAg0RMcLcFKLZqb98dOj37ZkuJGQx1S0FeiLhhBrNjJTgu1UrOe9qFt6LM3eHnYrv21sH+Id6i21E7nT5e8j9jjgwxZT9wOYWFKO9Q/30hvvOuMWcg7xpWLQR97Uqzm3mFpyqBJdOIMx3GfYq4JKa4LuB4M3uefdorCy7iCSE/ucph0num/d9aU+HOBifZdRruaJnSSOflwDMCY9PLw1K+SQ== Received: from CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) by BN6PR12MB1521.namprd12.prod.outlook.com (2603:10b6:405:f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Fri, 11 Jun 2021 23:13:32 +0000 Received: from CO1NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:104:3:cafe::30) by CO2PR06CA0060.outlook.office365.com (2603:10b6:104:3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:13:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT054.mail.protection.outlook.com (10.13.174.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:13:32 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:13:30 +0000 From: Xueming Li To: Kai Ji CC: Luca Boccassi , Damian Nowak , Fan Zhang , dpdk stable Date: Sat, 12 Jun 2021 07:03:05 +0800 Message-ID: <20210611230433.8208-91-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 029f9f12-db1b-4c29-52d4-08d92d2e883c X-MS-TrafficTypeDiagnostic: BN6PR12MB1521: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Uzfv1O2/zcPcKWl0uqCeN79BlHxMX5/rjfWthvPWUN28tr7fvTy4i/brDfa/tpVBglwQvkVc2uCHMur/EVmD4s9cF7MFCWwhHHR+Y2W0v+Y0pfOjs1TIUI7Q51CfYNyAPeXV622T9VcrxNAblJ1Y4Kf+03ZYgjD/VKqyChUelyBYIfmIKFOYHuo/yAAwvyt7smVBwHPYG9i0/Z9/jpKxYtqUqtutxl6Mn3KoJyABXd4xGa6S0aOXGkCqFZSs3cK9+u11FFS0M0pdx4zQbn3bGdXkbw4zPBTsLPfAV9uxPrGjDREXs4+3YcZfngfjFzEgjuwfwnYp3FyToPDrwO+95XtBDeVElBnAsjwLcA3N0lbhK2YPltOBKHOEYQHY1NcZiyCRTk2t0yoanjLZqu8Hg88wpm3fWpt2tjESG7aKagSv0BZQWFmSxbuFU4y9n6XzIhzPNNc0WaiAnN/jUdrQpCthMN3cIvzS14OAf9o4DjE+I21QUnLSGPczW+I0cKzbNdRE+3/vbMZbaCcYzGiWMM1C49pngS9ZSylgaIY1+APkJCaZt3Z3cNIujfroPY4YOkmZCY/v3oasZNpztZmYzJ7oGKk1Afs4uO0jP2aEA72T0yla/aM+KE0YEhjzb0YWui3DshrqDkV6wUEq+/9VKLiQi8IgUe3EMItE8XYQDXjv55ycioC+T+P0kiafThch2mxkOByfqubK6QGVIRSU3LA2fHB4FsI40jdl5FfbCAiu1JzHRL0ICKH5GA4VXlXXZ7sCM1Ge0J2piXRaSNgbaLiWCsTlkuWH6G8VG0dP9y0ylMIDKjviuuow60TgI58W X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(376002)(136003)(39860400002)(346002)(36840700001)(46966006)(6286002)(36756003)(8676002)(2616005)(54906003)(6916009)(36860700001)(83380400001)(47076005)(82310400003)(55016002)(26005)(7696005)(426003)(2906002)(5660300002)(8936002)(16526019)(356005)(1076003)(478600001)(186003)(70206006)(36906005)(966005)(6666004)(70586007)(7636003)(82740400003)(336012)(4326008)(86362001)(316002)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:13:32.5916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 029f9f12-db1b-4c29-52d4-08d92d2e883c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1521 Subject: [dpdk-stable] patch 'test/crypto: fix auth-cipher compare length in OOP' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/8038030f29b3e5067e60eaa612f21398a19cb1ee Thanks. Xueming Li --- >From 8038030f29b3e5067e60eaa612f21398a19cb1ee Mon Sep 17 00:00:00 2001 From: Kai Ji Date: Tue, 4 May 2021 15:19:41 +0100 Subject: [PATCH] test/crypto: fix auth-cipher compare length in OOP Cc: Luca Boccassi [ upstream commit 91317c0155662fcf188fac2152f33c79f90c6433 ] For out-of-place operations, comparing expected ciphertext with the operation result should skip cipher_offset bytes, as those will not be copied from source to the destination buffer, making the tests fail. Fixes: 02ed7b3871d6 ("test/crypto: add SNOW3G test cases for auth-cipher") Signed-off-by: Kai Ji Signed-off-by: Damian Nowak Acked-by: Fan Zhang --- app/test/test_cryptodev.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 8189053c13..093324ce73 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -4672,16 +4672,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, /* Validate obuf */ if (verify) { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET( plaintext, tdata->plaintext.data, - tdata->plaintext.len >> 3, + (tdata->plaintext.len - tdata->cipher.offset_bits - + (tdata->digest.len << 3)), + tdata->cipher.offset_bits, "SNOW 3G Plaintext data not as expected"); } else { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET( ciphertext, tdata->ciphertext.data, - tdata->validDataLenInBits.len, + (tdata->validDataLenInBits.len - + tdata->cipher.offset_bits), + tdata->cipher.offset_bits, "SNOW 3G Ciphertext data not as expected"); TEST_ASSERT_BUFFERS_ARE_EQUAL( @@ -4883,16 +4887,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata, /* Validate obuf */ if (verify) { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET( plaintext, tdata->plaintext.data, - tdata->plaintext.len >> 3, + (tdata->plaintext.len - tdata->cipher.offset_bits - + (tdata->digest.len << 3)), + tdata->cipher.offset_bits, "SNOW 3G Plaintext data not as expected"); } else { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET( ciphertext, tdata->ciphertext.data, - tdata->validDataLenInBits.len, + (tdata->validDataLenInBits.len - + tdata->cipher.offset_bits), + tdata->cipher.offset_bits, "SNOW 3G Ciphertext data not as expected"); TEST_ASSERT_BUFFERS_ARE_EQUAL( -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.950342900 +0800 +++ 0091-test-crypto-fix-auth-cipher-compare-length-in-OOP.patch 2021-06-12 06:53:56.430000000 +0800 @@ -1 +1 @@ -From 91317c0155662fcf188fac2152f33c79f90c6433 Mon Sep 17 00:00:00 2001 +From 8038030f29b3e5067e60eaa612f21398a19cb1ee Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 91317c0155662fcf188fac2152f33c79f90c6433 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 32e64e2dd1..a677a21e36 100644 +index 8189053c13..093324ce73 100644 @@ -25 +27 @@ -@@ -4671,16 +4671,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, +@@ -4672,16 +4672,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata, @@ -50 +52 @@ -@@ -4882,16 +4886,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata, +@@ -4883,16 +4887,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,