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 84208A00C5 for ; Wed, 20 Jul 2022 10:26:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B8464280D; Wed, 20 Jul 2022 10:26:06 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2083.outbound.protection.outlook.com [40.107.243.83]) by mails.dpdk.org (Postfix) with ESMTP id 5162440697 for ; Wed, 20 Jul 2022 10:26:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cOnlQF03zoK60LspuzoGmzHlR1I7vyAQPnjiCGEFNHDzlkj6dsOtY69Prh+HNZVv88mf7xmv7NUClVdtOqXtswZsFtgC252oDHZlAYJqrAXODXOh4ixnGOBBDGldxhnEIZdU/b7JK10d1XncJbUYXzP35qa8gOcXDty2aaX5xWFLfkNfEjce+x1QXztdoVLFzenBTNJHG9APZI3i3mrBup6B0W/AM9M2vIKqStT23zQhreEHOcQ0uP7GpNSHDCIAwaELETtpcOFc90lFRNsYI7XMrIoLbeiGttDQsvFVw2rjmJ6bGh3DlcFDxuN2TWHMm2B0pXS2d4Sp08QxsdjnFg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gGE+q57NeRtpEWS1AwORnOk0tLW8KM7MTX7psL8WSnA=; b=cCJv4aCx3UVHpoLK+CFs7ArGgqOF/dG6yQYszRawkumq8uDSKxIcWQlWq2z3Q+yXTGEjmfN3rykXnFkPwoU8Hg6C2qgbw5ik+qyIL1OnWHdZTosWlQ23ayJ49Yj8+TEzXZDK+4f4+kJhl07YULcYbHs3qEkhL2PsvjItPJpml7yGSrVeRgDIQLT6qPYrhzsp4l/wKNjzQ1K4sTREuE2FsJ1xf7/tGmpmE4yEt58jxEs3Z0yPL7u4q7YgOXQDKcDiEc/Iz+u0ActZKeKn/SDiRYv7IKo97Plt/CwMZVgLdFqJEbtRUA9wx3jNzr/pkGxhuU71Mo9fjiPvlHhKJGnaug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=gGE+q57NeRtpEWS1AwORnOk0tLW8KM7MTX7psL8WSnA=; b=DT8hSFWUYrEdvMRwMtA51fzjXNljTJ70S8pXz/jRXyS/BODK7aGMF1tfMiV6Puj2dd4JgN/SkYe3m4PAAPSGz30h03IZD25vo3jn+tHp+z2uleCp1MEtFBJpwt1b1QSULRpk66N6W9qsns2aCp8Hq+9tjWo3DBesjcY3HutwIhitHfn0Z/SJqrZS5GsvWd6wYR4LzloFvpH/K37qltS6HYDb/rwS582uQWIpJvAmbO488VoFlS8xyrwcHL+bmXmEmmUVNCxHlSbOgnREGF2SdAgNiP5spqp60kdaqQ89AO+rtuVXb4lL8iV6BNKmJmJEltlT7OCI2CykSWEVNEeNYQ== Received: from BN0PR03CA0037.namprd03.prod.outlook.com (2603:10b6:408:e7::12) by DM6PR12MB5023.namprd12.prod.outlook.com (2603:10b6:5:1b6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Wed, 20 Jul 2022 08:26:02 +0000 Received: from BN8NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e7:cafe::6) by BN0PR03CA0037.outlook.office365.com (2603:10b6:408:e7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21 via Frontend Transport; Wed, 20 Jul 2022 08:26:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT024.mail.protection.outlook.com (10.13.177.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:26:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:26:01 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 20 Jul 2022 01:25:59 -0700 From: Xueming Li To: Ciara Power CC: , Tejasree Kondoj , "dpdk stable" Subject: patch 'test/crypto: fix SNOW3G vector IV format' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:21:17 +0300 Message-ID: <20220720082132.3954126-48-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd2cbabf-c4d0-4a5c-0320-08da6a297b74 X-MS-TrafficTypeDiagnostic: DM6PR12MB5023:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?C1jFsr0Q1tH2sS0tWLaPxG2QizslvtbZbp7Rvy8euxoNqDLL+K4YUJ1LkrYr?= =?us-ascii?Q?np8rWLYu+OP8v1ZW+fl0YBi4rbcg+4eEgttO+pQBpe6bKxLjnH9XqK/yvYLg?= =?us-ascii?Q?+xX4vTfcZ0F0h96kwldBbq+IScZiaddmDg8GleaRKUjktbHZRiSugP9sBmj0?= =?us-ascii?Q?MDnV3cJ9I9pP+o9jBKNn0/fKY9LP0ZhOtUlnWdWY2tzgbyDZNdyO0OprGNsh?= =?us-ascii?Q?+OXFrGbKDehF9iXwSiiqeP0pJTIk6eL96u6LW7bBN5gsIPIrr8Ltn9KBYPCL?= =?us-ascii?Q?OObr2wKX6QBf5m7KYzStdPoqat//aZudTyWNKFxbWAanoLYEA70UIeSncZFt?= =?us-ascii?Q?LxOY8reokqoUR3fwQDDfOgOqHAxyfmXKld+DILnwkyz667dW7/k8EBeugUoT?= =?us-ascii?Q?uZ139wrMxGQfA8aR043cmcEByyc4sFpieByQoiDRUYw5mK1z/Y/iWGFDbMld?= =?us-ascii?Q?k5UYe7FrtD0XZ3JajZIF2hGHmL0hUCraf4RT2DYJN0zeaiKpGs7rHqvLyKSr?= =?us-ascii?Q?TB+g/d5DOsTB31Z+kak0x+jANOTxaBNriq4xBkjmmpvZciloZT6lRZgFrX+b?= =?us-ascii?Q?lRVCZzSMsEke/qpreRzqZcAuAK4Jq3y2irQtADCQ+Wx+qmGL+fMrJ/mNMCDa?= =?us-ascii?Q?/UxeZU88qXjRLQOrz6UmJPzmzYtCgStfuHT/Vz+Q2/EH8Fa90FvuwTPI8J7a?= =?us-ascii?Q?EBNeVpCjcnY+i4M7Z23cbQ7fAkqORGeRvK2nzQaKanWII8Z8dsE9V2mQfHik?= =?us-ascii?Q?PrI6S/yzic1Qkk/PNi9AKi7qbqJh9Jc5CwIJ0dqRVxI+7ew5/0x1QZ0iBsTV?= =?us-ascii?Q?5joBqxrgcVO1cZjqXf/x+WOx2icZZpkovCXO5QQsNm2slxEgZNCIrwV5Nore?= =?us-ascii?Q?3P8QShiR9TaatjFgEEEkOG4OmV8PTt3yvFQvkX5Td8eNLW5vFp7361A1Z6SB?= =?us-ascii?Q?3XiNcJKRJlmnZXN5bFTAGxXgJE6O3MiN+amsfEcXUvXLE3VcT+fSvbi1U1UN?= =?us-ascii?Q?A21L?= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(396003)(136003)(39860400002)(346002)(46966006)(36840700001)(40470700004)(8936002)(2906002)(47076005)(426003)(336012)(81166007)(5660300002)(30864003)(186003)(16526019)(86362001)(70586007)(70206006)(36860700001)(4326008)(8676002)(82310400005)(1076003)(55016003)(40480700001)(36756003)(54906003)(966005)(7696005)(83380400001)(316002)(41300700001)(6666004)(478600001)(40460700003)(6916009)(2616005)(356005)(19627235002)(82740400003)(26005)(53546011)(6286002)(32563001)(15398625002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:26:02.1250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd2cbabf-c4d0-4a5c-0320-08da6a297b74 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB5023 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 Hi, FYI, your patch has been queued to stable release 20.11.6 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/22/22. 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/ff55658ad7c9e2492f0c8ff025e9c183a9936c01 Thanks. Xueming Li --- >From ff55658ad7c9e2492f0c8ff025e9c183a9936c01 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Thu, 23 Jun 2022 14:42:50 +0000 Subject: [PATCH] test/crypto: fix SNOW3G vector IV format Cc: Xueming Li [ upstream commit 3271c24b295caa7ee3fe227225a2ce962757d9c4 ] Some of the cipher and authentication IVs did not follow the spec for SNOW3G algorithm [1]. Cipher IVs must have the last 3 bytes of each 8 byte block as 0x0. IV[4] and IV[12] must have the last 2 bits set to 0. Each 8 byte block is repeated. Auth IVs must also have a repeated 8 byte block. IV[8] and IV[14] may have a flipped bit based on direction. [1] https://www.gsma.com/aboutus/wp-content/uploads/2014/12/uea2uia2d1v21.pdf Fixes: 8bdf665fe6c0 ("app/test: add SNOW 3G") Fixes: 24342ade2c9d ("test/crypto: check SNOW3G when digest is encrypted") Fixes: 02ed7b3871d6 ("test/crypto: add SNOW3G test cases for auth-cipher") Fixes: 11c5485bb276 ("test/crypto: add scatter-gather tests for IP and OOP") Signed-off-by: Ciara Power Acked-by: Tejasree Kondoj --- app/test/test_cryptodev_snow3g_test_vectors.h | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/app/test/test_cryptodev_snow3g_test_vectors.h b/app/test/test_cryptodev_snow3g_test_vectors.h index bbe05662be..b49a07bcf2 100644 --- a/app/test/test_cryptodev_snow3g_test_vectors.h +++ b/app/test/test_cryptodev_snow3g_test_vectors.h @@ -138,11 +138,11 @@ struct snow3g_test_data snow3g_test_case_2 = { .len = 16 }, .cipher_iv = { - .data = { + .data = { 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00 }, - .len = 16 + .len = 16 }, .plaintext = { .data = { @@ -359,8 +359,8 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_1 = { }, .cipher_iv = { .data = { - 0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD, - 0x94, 0x79, 0x3E, 0x41, 0x03, 0x97, 0x68, 0xFD + 0x72, 0xA4, 0xF2, 0x0F, 0x48, 0x00, 0x00, 0x00, + 0x72, 0xA4, 0xF2, 0x0F, 0x48, 0x00, 0x00, 0x00 }, .len = 16 }, @@ -383,13 +383,13 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_1 = { .len = 384 }, .ciphertext = { - .data = { - 0x95, 0x2E, 0x5A, 0xE1, 0x50, 0xB8, 0x59, 0x2A, - 0x9B, 0xA0, 0x38, 0xA9, 0x8E, 0x2F, 0xED, 0xAB, - 0xFD, 0xC8, 0x3B, 0x47, 0x46, 0x0B, 0x50, 0x16, - 0xEC, 0x88, 0x45, 0xB6, 0x05, 0xC7, 0x54, 0xF8, - 0xBD, 0x91, 0xAA, 0xB6, 0xA4, 0xDC, 0x64, 0xB4, - 0xCB, 0xEB, 0x97, 0x06, 0x4C, 0xF7, 0x02, 0x3D + .data = { + 0x86, 0x4F, 0x4D, 0xE8, 0x86, 0xE6, 0x3E, 0x66, + 0x52, 0x97, 0xC7, 0x62, 0xAE, 0x8E, 0xA2, 0xDB, + 0x01, 0xD6, 0x33, 0xA9, 0xA4, 0xCE, 0x02, 0xD5, + 0xC2, 0xC5, 0x5F, 0x90, 0xE0, 0x89, 0x48, 0xD4, + 0x92, 0xF4, 0xE5, 0x9A, 0xDA, 0x13, 0x76, 0xFF, + 0x6E, 0x76, 0x6B, 0x71, 0x62, 0x28, 0xB2, 0xEC }, .len = 384 }, @@ -428,15 +428,15 @@ struct snow3g_test_data snow3g_test_case_7 = { }, .cipher_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 + 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00, + 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00 }, .len = 16 }, .auth_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x36, 0xAF, 0x61, 0x44, 0x98, 0x38, 0xF0, 0x3A, + 0x36, 0xAF, 0x61, 0x44, 0x98, 0x38, 0xF0, 0x3A }, .len = 16 }, @@ -457,28 +457,28 @@ struct snow3g_test_data snow3g_test_case_7 = { 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, - 0x5A, 0x5A, 0x5A, 0x5A, 0xF1, 0x9E, 0x2B, 0x6F, + 0x5A, 0x5A, 0x5A, 0x5A, 0xBB, 0x2B, 0x8B, 0x15, }, .len = 128 << 3 }, .ciphertext = { .data = { - 0x5A, 0x5A, 0xE4, 0xAD, 0x29, 0xA2, 0x6A, 0xA6, - 0x20, 0x1D, 0xCD, 0x08, 0x50, 0xD6, 0xE6, 0x47, - 0xBC, 0x88, 0x08, 0x01, 0x17, 0xFA, 0x47, 0x5B, - 0x90, 0x40, 0xBA, 0x0C, 0xB5, 0x58, 0xF3, 0x0C, - 0xA0, 0xD4, 0x98, 0x83, 0x1B, 0xCE, 0x54, 0xE3, - 0x29, 0x00, 0x3C, 0xA4, 0xAD, 0x74, 0xEE, 0x05, - 0xA3, 0x6C, 0xD4, 0xAC, 0xC6, 0x30, 0x33, 0xC9, - 0x37, 0x57, 0x41, 0x9B, 0xD4, 0x73, 0xB9, 0x77, - 0x70, 0x8B, 0x63, 0xDD, 0x22, 0xB8, 0xE1, 0x85, - 0xB2, 0x92, 0x7C, 0x37, 0xD3, 0x2E, 0xD9, 0xF4, - 0x4A, 0x69, 0x25, 0x30, 0xE3, 0x5B, 0x8B, 0xF6, - 0x0F, 0xDE, 0x0B, 0x92, 0xD5, 0x25, 0x52, 0x6D, - 0x26, 0xEB, 0x2F, 0x8A, 0x3B, 0x8B, 0x38, 0xE2, - 0x48, 0xD3, 0x4A, 0x98, 0xF7, 0x3A, 0xC2, 0x46, - 0x69, 0x8D, 0x73, 0x3E, 0x57, 0x88, 0x2C, 0x80, - 0xF0, 0xF2, 0x75, 0xB8, 0x7D, 0x27, 0xC6, 0xDA, + 0x5A, 0x5A, 0x8A, 0x35, 0xF7, 0x36, 0xDA, 0xD7, + 0xC4, 0x2C, 0x10, 0xEA, 0x92, 0x9C, 0x00, 0xF0, + 0xAE, 0x35, 0x5E, 0x8D, 0xB6, 0x88, 0x30, 0x66, + 0x74, 0x8B, 0xA2, 0x82, 0x5C, 0xA7, 0xF3, 0x54, + 0x75, 0x02, 0xA9, 0x90, 0x6B, 0x4B, 0x6A, 0x63, + 0xFF, 0x4B, 0x08, 0xFE, 0x11, 0x3C, 0x5A, 0x53, + 0xEE, 0x68, 0x14, 0x41, 0x17, 0xCD, 0x7B, 0x27, + 0x88, 0xAF, 0x99, 0xE2, 0x9C, 0x86, 0x42, 0x12, + 0x97, 0x93, 0xF0, 0xE6, 0xE2, 0xB2, 0x2D, 0xDA, + 0x2C, 0x59, 0xB0, 0xA7, 0x09, 0xF6, 0x32, 0xC0, + 0x35, 0x9A, 0xD3, 0xBA, 0xDC, 0x8F, 0x2E, 0x18, + 0x97, 0x87, 0x44, 0xD6, 0x43, 0xFA, 0x86, 0x5A, + 0xB0, 0xA2, 0x5A, 0xB8, 0x5F, 0x57, 0xE3, 0x2F, + 0x73, 0x9C, 0x01, 0x3A, 0x02, 0x08, 0x8C, 0xEB, + 0xA0, 0x5D, 0x74, 0x58, 0x5A, 0xA1, 0x58, 0x17, + 0x5E, 0x86, 0x96, 0xE6, 0x9C, 0xEE, 0x8C, 0xA8 }, .len = 128 << 3 @@ -493,7 +493,7 @@ struct snow3g_test_data snow3g_test_case_7 = { }, .digest = { .data = { - 0x7D, 0x27, 0xC6, 0xDA + 0x9C, 0xEE, 0x8C, 0xA8 }, .len = 4, .offset_bytes = 124 @@ -520,15 +520,15 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_2 = { }, .cipher_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 + 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 }, .len = 16 }, .auth_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x3E, 0xDC, 0x87, 0xE2, 0xA4, 0xF2, 0xD8, 0xE2, + 0x3E, 0xDC, 0x87, 0xE2, 0xA4, 0xF2, 0xD8, 0xE2 }, .len = 16 }, @@ -556,22 +556,22 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_2 = { }, .ciphertext = { .data = { - 0x5A, 0x5A, 0xE4, 0xAD, 0x29, 0xA2, 0x6A, 0xA6, - 0x20, 0x1D, 0xCD, 0x08, 0x50, 0xD6, 0xE6, 0x47, - 0xBC, 0x88, 0x08, 0x01, 0x17, 0xFA, 0x47, 0x5B, - 0x90, 0x40, 0xBA, 0x0C, 0xB5, 0x58, 0xF3, 0x0C, - 0xA0, 0xD4, 0x98, 0x83, 0x1B, 0xCE, 0x54, 0xE3, - 0x29, 0x00, 0x3C, 0xA4, 0xAD, 0x74, 0xEE, 0x05, - 0xA3, 0x6C, 0xD4, 0xAC, 0xC6, 0x30, 0x33, 0xC9, - 0x37, 0x57, 0x41, 0x9B, 0xD4, 0x73, 0xB9, 0x77, - 0x70, 0x8B, 0x63, 0xDD, 0x22, 0xB8, 0xE1, 0x85, - 0xB2, 0x92, 0x7C, 0x37, 0xD3, 0x2E, 0xD9, 0xF4, - 0x4A, 0x69, 0x25, 0x30, 0xE3, 0x5B, 0x8B, 0xF6, - 0x0F, 0xDE, 0x0B, 0x92, 0xD5, 0x25, 0x52, 0x6D, - 0x26, 0xEB, 0x2F, 0x8A, 0x3B, 0x8B, 0x38, 0xE2, - 0x48, 0xD3, 0x4A, 0x98, 0xF7, 0x3A, 0xC2, 0x46, - 0x69, 0x8D, 0x73, 0x3E, 0x57, 0x88, 0x2C, 0x80, - 0xF0, 0xF2, 0x75, 0xB8, 0x7D, 0x27, 0xC6, 0xDA, + 0x5A, 0x5A, 0xCF, 0xCF, 0x3D, 0x11, 0xBF, 0xD9, + 0xC3, 0x7F, 0x7C, 0xA8, 0x1A, 0x9F, 0x9F, 0x34, + 0xC5, 0x6E, 0x1B, 0x2C, 0xE0, 0x81, 0x4B, 0x66, + 0x87, 0xCB, 0xD5, 0x61, 0x04, 0xED, 0xBC, 0x69, + 0x79, 0x86, 0x73, 0x48, 0x69, 0x4A, 0xBA, 0x55, + 0x44, 0x6C, 0xEF, 0xD9, 0x34, 0x61, 0x59, 0x67, + 0x80, 0x4E, 0x03, 0x95, 0x0A, 0xA1, 0x6C, 0xBA, + 0x74, 0xBD, 0xAF, 0x11, 0x4B, 0xE6, 0x98, 0x61, + 0x4E, 0xD4, 0x3E, 0xE4, 0x99, 0x55, 0x5C, 0x3A, + 0x8C, 0x3E, 0xC0, 0x01, 0x6E, 0x15, 0xE1, 0x0E, + 0x71, 0x4C, 0x89, 0x43, 0x8A, 0x48, 0x69, 0x6D, + 0x02, 0x10, 0xC6, 0x54, 0x37, 0x18, 0xAA, 0x10, + 0x90, 0x80, 0x0B, 0x69, 0x08, 0xB4, 0xF9, 0x4D, + 0xD1, 0x2E, 0x43, 0xD9, 0x92, 0xAF, 0x06, 0x4A, + 0xAF, 0x26, 0x25, 0x77, 0x37, 0xD0, 0xFC, 0x3C, + 0xA0, 0xCB, 0xAF, 0x06, 0x95, 0x26, 0x30, 0x38, }, .len = 128 << 3 @@ -586,7 +586,7 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_2 = { }, .digest = { .data = { - 0x7D, 0x27, 0xC6, 0xDA + 0x95, 0x26, 0x30, 0x38 }, .len = 4, .offset_bytes = 124 @@ -613,15 +613,15 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_3 = { }, .cipher_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 + 0x39, 0x8A, 0x59, 0xB4, 0x2C, 0x00, 0x00, 0x00, + 0x39, 0x8A, 0x59, 0xB4, 0x2C, 0x00, 0x00, 0x00 }, .len = 16 }, .auth_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x29, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0x77, 0x37, + 0x29, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0x77, 0x37 }, .len = 16 }, @@ -636,10 +636,10 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_3 = { }, .ciphertext = { .data = { - 0x5A, 0x5A, 0xE4, 0xAD, 0x29, 0xA2, 0x6A, 0xA6, - 0x20, 0x1D, 0xCD, 0x08, 0x50, 0xD6, 0xE6, 0x47, - 0xBC, 0x88, 0x08, 0x01, 0x17, 0xFA, 0x47, 0x5B, - 0x90, 0x40, 0xBA, 0x0C, 0xBA, 0x6D, 0x6A, 0x5E, + 0x5A, 0x5A, 0x93, 0xB0, 0x3F, 0xA4, 0xEB, 0xD4, + 0x51, 0x12, 0x3B, 0x95, 0x93, 0x12, 0xBF, 0xBE, + 0xF2, 0xFE, 0xA5, 0xAE, 0xE7, 0xF4, 0x80, 0x3E, + 0xB2, 0xD1, 0xFF, 0x5F, 0xD9, 0x32, 0x72, 0xFE, }, .len = 32 << 3 }, @@ -653,7 +653,7 @@ struct snow3g_test_data snow3g_auth_cipher_test_case_3 = { }, .digest = { .data = { - 0xBA, 0x6D, 0x6A, 0x5E + 0xD9, 0x32, 0x72, 0xFE }, .len = 4, .offset_bytes = 28 @@ -680,15 +680,15 @@ struct snow3g_test_data snow3g_auth_cipher_partial_digest_encryption = { }, .cipher_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 + 0x72, 0xA4, 0xF2, 0x0F, 0x48, 0x00, 0x00, 0x00, + 0x72, 0xA4, 0xF2, 0x0F, 0x48, 0x00, 0x00, 0x00 }, .len = 16 }, .auth_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD, + 0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD }, .len = 16 }, @@ -704,9 +704,9 @@ struct snow3g_test_data snow3g_auth_cipher_partial_digest_encryption = { .ciphertext = { .data = { 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, - 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0xE4, 0xAD, - 0x29, 0xA2, 0x6A, 0xA6, 0x20, 0x1D, 0xCD, 0x08, - 0x50, 0xD6, 0xE6, 0x47, 0xB3, 0xBD, 0xC3, 0x08 + 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0xA2, 0xB7, + 0xDF, 0xA7, 0x98, 0xA1, 0xD8, 0xD4, 0x9B, 0x6E, + 0x2C, 0x7A, 0x66, 0x15, 0xCC, 0x4C, 0xE5, 0xE0 }, .len = 32 << 3 }, @@ -720,7 +720,7 @@ struct snow3g_test_data snow3g_auth_cipher_partial_digest_encryption = { }, .digest = { .data = { - 0xB3, 0xBD, 0xC3, 0x08 + 0xCC, 0x4C, 0xE5, 0xE0 }, .len = 4, .offset_bytes = 28 -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:01:01.057631478 +0800 +++ 0048-test-crypto-fix-SNOW3G-vector-IV-format.patch 2022-07-20 15:00:58.781000383 +0800 @@ -1 +1 @@ -From 3271c24b295caa7ee3fe227225a2ce962757d9c4 Mon Sep 17 00:00:00 2001 +From ff55658ad7c9e2492f0c8ff025e9c183a9936c01 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3271c24b295caa7ee3fe227225a2ce962757d9c4 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org