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 CC9D7A0540 for ; Wed, 6 Jul 2022 22:35:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6F2340DF7; Wed, 6 Jul 2022 22:35:21 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 6040240691 for ; Wed, 6 Jul 2022 22:35:20 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id a5so8906286wrx.12 for ; Wed, 06 Jul 2022 13:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3/NxO3LQa5iCULZ9zyx25x5wrafa2O4r9fr8+VWdJTA=; b=a0ldD6/qXBglIFO9ImyZP5toWcBumDb8G84SjnHKTY0gG+7ERmUPQap6ky+D+HQIZP wN6rlWMnOKNsOiGL6BcpPIH0hnSFXgIkYuBok5f2SFwUfjuzwhdvzffBoAQm3Y+Kwkcn 7Py8GrCwCq/F04IUemItF3GxZ9A7YkPHpTscszrsawaR45KtKbh0iCzKou1UKiPyEnyZ TpovrVPXbWilY42nUZAGk6PCwo0VTi3O2hSq/lkr+o7ogsU6VouEsxtRK8PyRKANqbfQ L0MpggIw2cE0Qqlc+WSmIJKVD8uLwoEP5M6AEN1ZQ3xu+U/2XBNRoYyk5RSsRvNYFviR 24MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3/NxO3LQa5iCULZ9zyx25x5wrafa2O4r9fr8+VWdJTA=; b=Iz/SQI5DucOniX70ttSUaT/uATIlWJqV+sJkpdpADedoyITumeGY2KiBxgbVmOuNGG dDm+cLVn3RWbZda81fvMAc+Sv8ayXq6j7kXPAIBffJuP4JZm1hxE9toEpwfTKtAdBMI6 bdEIawCyCONz2GyXE31yIo4NL6mEhsuwue6uX+/5mSlv5KW8zmVcFIsGofHRjep1Z0r1 DM5BHsTLkpQxKbLoY1r1iXZGBty7dtGQMquTe+TlbZucesdGTsTwfcakgCZpZ+JKCznX vSk6esDcP1upSei0s1qSSqOTxFajx0wSrm2T1kXE7j5ns/TyNRSmDFoPBHsFiHa7ZRSk T6xg== X-Gm-Message-State: AJIora9PR5TUUlvim0/CfBvW3EqKMcRJBwGqyBP7EnafAN2mSF9/G8Tk Oxnq/wOSlHa+9ZH0tT2U4ysFxkeajUumaA== X-Google-Smtp-Source: AGRyM1sEYfTHoLjF9j2m6n40u16hYET2TLQwA0D4/aR8hOkXpCDHbEBPepwj+wn4nW8oBzHXWBb6Zg== X-Received: by 2002:adf:f746:0:b0:21d:6afd:b7d3 with SMTP id z6-20020adff746000000b0021d6afdb7d3mr16361050wrp.501.1657139720022; Wed, 06 Jul 2022 13:35:20 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id j38-20020a05600c1c2600b00397342e3830sm622272wms.0.2022.07.06.13.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:35:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Ciara Power Cc: Tejasree Kondoj , dpdk stable Subject: patch 'test/crypto: fix ZUC vector IV format' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:34:37 +0100 Message-Id: <20220706203506.3422496-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 21.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 07/08/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/35b1acf851d61291eb1ca6db8b416fbeb677e8e9 Thanks. Luca Boccassi --- >From 35b1acf851d61291eb1ca6db8b416fbeb677e8e9 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Thu, 23 Jun 2022 14:42:49 +0000 Subject: [PATCH] test/crypto: fix ZUC vector IV format [ upstream commit 3025fe291015686f3e954dd520e7cbc130439d33 ] Some authentication and cipher IV formats were not following the spec [1]. For ZUC128 cipher IV, an 8 byte block is repeated, with the last 3 bytes of each being 0x0. IV[4] and IV[12] must have the last 2 bits set to 0. Auth IVs must also have repeated bytes with the last 3 bytes containing 0x0 in each 8 byte block. IV[4] and IV[12] must have the last 3 bits set to 0. IV[8] and IV[14] may have a flipped bit based on direction. [1] https://www.gsma.com/security/wp-content/uploads/2019/05/EEA3_EIA3_specification_v1_8.pdf Fixes: a81a81850fb1 ("test/crypto: add ZUC test cases for QAT") Fixes: b1c1df46878d ("test/crypto: add ZUC test cases for auth-cipher") Signed-off-by: Ciara Power Acked-by: Tejasree Kondoj --- app/test/test_cryptodev_zuc_test_vectors.h | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/app/test/test_cryptodev_zuc_test_vectors.h b/app/test/test_cryptodev_zuc_test_vectors.h index 5d1d264579..299d7649fe 100644 --- a/app/test/test_cryptodev_zuc_test_vectors.h +++ b/app/test/test_cryptodev_zuc_test_vectors.h @@ -558,13 +558,13 @@ static struct wireless_test_data zuc_test_case_cipher_200b_auth_200b = { }, .auth_iv = { .data = { - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00 }, .len = 16 }, .digest = { - .data = {0x01, 0xFE, 0x5E, 0x38}, + .data = {0x2F, 0x45, 0x7D, 0x7B}, .len = 4 }, .validAuthLenInBits = { @@ -631,13 +631,13 @@ static struct wireless_test_data zuc_test_case_cipher_800b_auth_120b = { }, .auth_iv = { .data = { - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, - 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00 }, .len = 16 }, .digest = { - .data = {0x9D, 0x42, 0x1C, 0xEA}, + .data = {0xCA, 0xBB, 0x8D, 0x94}, .len = 4 }, .validAuthLenInBits = { @@ -1166,15 +1166,15 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { }, .cipher_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00, + 0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00 }, .len = 16 }, .auth_iv = { .data = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00, + 0xFA, 0x55, 0x6B, 0x26, 0x18, 0x00, 0x00, 0x00 }, .len = 16 }, @@ -1201,22 +1201,22 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { }, .ciphertext = { .data = { - 0x5A, 0x5A, 0xDB, 0x3D, 0xD5, 0xB7, 0xB9, 0x58, - 0xA5, 0xD3, 0xE3, 0xF9, 0x18, 0x73, 0xB4, 0x74, - 0x05, 0xF0, 0xE9, 0xB6, 0x5D, 0x9A, 0xE3, 0xFA, - 0x5D, 0xFD, 0x24, 0x51, 0xAD, 0x73, 0xCA, 0x64, - 0x91, 0xD5, 0xB3, 0x94, 0x10, 0x91, 0x89, 0xEA, - 0x73, 0x6F, 0xB0, 0x2A, 0x0A, 0x63, 0x0F, 0x8D, - 0x64, 0x87, 0xA3, 0x14, 0x6B, 0x93, 0x31, 0x0F, - 0x14, 0xAD, 0xEA, 0x62, 0x80, 0x3F, 0x44, 0xDD, - 0x4E, 0x30, 0xFA, 0xC8, 0x0E, 0x5F, 0x46, 0xE7, - 0x60, 0xEC, 0xDF, 0x8B, 0x94, 0x7D, 0x2E, 0x63, - 0x48, 0xD9, 0x69, 0x06, 0x13, 0xF2, 0x20, 0x49, - 0x54, 0xA6, 0xD4, 0x98, 0xF4, 0xF6, 0x1D, 0x4A, - 0xC9, 0xA5, 0xDA, 0x46, 0x3D, 0xD9, 0x02, 0x47, - 0x1C, 0x20, 0x73, 0x35, 0x17, 0x1D, 0x81, 0x8D, - 0x2E, 0xCD, 0x70, 0x37, 0x22, 0x55, 0x3C, 0xF3, - 0xDA, 0x70, 0x42, 0x12, 0x0E, 0xAA, 0xC4, 0xAB + 0x5A, 0x5A, 0x94, 0xE7, 0xB8, 0xD7, 0x4E, 0xBB, + 0x4C, 0xC3, 0xD1, 0x16, 0xFC, 0x8C, 0xE4, 0x27, + 0x44, 0xEC, 0x04, 0x26, 0x60, 0x9C, 0xFF, 0x81, + 0xB6, 0x2B, 0x48, 0x1D, 0xEE, 0x26, 0xF7, 0x58, + 0x40, 0x38, 0x58, 0xEA, 0x22, 0x23, 0xE6, 0x34, + 0x9A, 0x69, 0x32, 0x68, 0xBD, 0xDD, 0x7D, 0xA3, + 0xC0, 0x04, 0x79, 0xF0, 0xF1, 0x58, 0x78, 0x5E, + 0xD0, 0xDF, 0x27, 0x9A, 0x53, 0x70, 0x5D, 0xFB, + 0x1B, 0xCA, 0xBA, 0x97, 0x12, 0x1F, 0x59, 0x6B, + 0x75, 0x7B, 0x94, 0xF6, 0xE7, 0xFA, 0x49, 0x6B, + 0x7D, 0x7F, 0x8F, 0x0F, 0x78, 0x56, 0x40, 0x52, + 0x84, 0x3E, 0xA9, 0xE8, 0x84, 0x6F, 0xEF, 0xFB, + 0x4A, 0x48, 0x3A, 0x4C, 0x81, 0x98, 0xDD, 0x17, + 0x89, 0x66, 0x3B, 0xC0, 0xEC, 0x71, 0xDB, 0xF6, + 0x44, 0xDF, 0xA7, 0x97, 0xB2, 0x9B, 0x84, 0xA7, + 0x2D, 0x2D, 0xC1, 0x93, 0x12, 0x37, 0xEA, 0xD2 }, .len = 128 << 3 }, @@ -1233,7 +1233,7 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { .len = 2 << 3 }, .digest = { - .data = {0x0E, 0xAA, 0xC4, 0xAB}, + .data = {0x12, 0x37, 0xEA, 0xD2}, .len = 4, .offset_bytes = 124 } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:53.649808654 +0100 +++ 0002-test-crypto-fix-ZUC-vector-IV-format.patch 2022-07-06 21:07:53.523518323 +0100 @@ -1 +1 @@ -From 3025fe291015686f3e954dd520e7cbc130439d33 Mon Sep 17 00:00:00 2001 +From 35b1acf851d61291eb1ca6db8b416fbeb677e8e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3025fe291015686f3e954dd520e7cbc130439d33 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org