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 7953FA0540 for ; Thu, 7 Jul 2022 09:59:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73CC140DDE; Thu, 7 Jul 2022 09:59:24 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id E0E3B406B4 for ; Thu, 7 Jul 2022 09:59:20 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id AA25F3F1AA for ; Thu, 7 Jul 2022 07:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180760; bh=p8vVnR2x/U+BuCRjl8NDOxKCSnOUxYNUSJ2l6PSAunU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ugslIuj/cIKS8rkWoBPoyAavDLoKrBhohBagCmOHRnBi33nFfHlGufkUb+8im4EsV DaL0Uimf4Bo7bj0g8kCPoU/hWKeDIpenL5PgshUXt0p5vuU769/WTC3b5qmAivKP+7 gcbSIaSaKzqTR6ShWGzjfkIMscaoBMDDfk/jo03iJY5QzTDh/yXzFEOg2N2ZIopxP0 3ucvRYvK+YGqPD6wsLiVAdjsW/+UzLdTPdFaqIrE08K8B6xPezuqdj5r4o3AImaXeu IBAKD5M2qQocHaInccevyI4SR/7bOzCX/ZM1gyudNNZ1HDzKBjRAMdbfOJH22CvxQQ g2UFOo+DJCBNw== Received: by mail-ed1-f72.google.com with SMTP id b7-20020a056402350700b00435bd1c4523so13368501edd.5 for ; Thu, 07 Jul 2022 00:59:20 -0700 (PDT) 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=p8vVnR2x/U+BuCRjl8NDOxKCSnOUxYNUSJ2l6PSAunU=; b=dtO1eFrjJPhiEKi7tlaFH/hFzP74dIHdi+NOKMvC7wtE79rYwJoI5rtnybagif3VHv CYxQOYJt+LsOkkiOWzRFWXFy1axH3ASnoNlXJVSoqUnpq/ZDsUmZr65W10MvXxstIEeI rSFYDyG7YwIX9VoZ07C36INFyKM07xBNKeMGHzv4T6BQn2ONkSu6PTFhLDOaRDKlEftO cJD/ELKsDOHCIH1QgV5o6qf8xFnIKGMfoIk0YULbYugxM/2/R1ytkjLa8RQu7jEbP797 707vaQcR9eY3hUmGJI0jMrKiIf1TCadzHoLtdzlvhM+Oh4uiu9QMF/M690R6FlLP/L4B /hvw== X-Gm-Message-State: AJIora/cYsS2HncnyQL/AtV3Gy9Wbj80y3kV58wY4FMRFzRjDKbUKgHM v6xnw27W8ji0+2paTUl7DM7/TGddFVhA0ZO2nZq7cVPuSrpm0BL0pBYmu1shfyZC+XYG8GtUyq/ 5BnWGg7HPN6A73DpwuVN8hi0z X-Received: by 2002:a17:906:d550:b0:726:2b34:2fd6 with SMTP id cr16-20020a170906d55000b007262b342fd6mr42804244ejc.311.1657180760245; Thu, 07 Jul 2022 00:59:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1urUFa4jjQYki/zPnzeUBoFEJSpQDZiekaZ0Z3Lx3yS96M8Yj/4vPAz8oYGKDfCMVhTJsSiWA== X-Received: by 2002:a17:906:d550:b0:726:2b34:2fd6 with SMTP id cr16-20020a170906d55000b007262b342fd6mr42804232ejc.311.1657180759993; Thu, 07 Jul 2022 00:59:19 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id p27-20020a1709060ddb00b00722e559ee66sm18232090eji.62.2022.07.07.00.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:59:19 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Ciara Power Cc: Tejasree Kondoj , dpdk stable Subject: patch 'test/crypto: fix ZUC vector IV format' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:55:13 +0200 Message-Id: <20220707075522.194223-78-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f2a1d83ee7902a0f890fcedaf0b3baf78e060eed Thanks. Christian Ehrhardt --- >From f2a1d83ee7902a0f890fcedaf0b3baf78e060eed 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 cc2338e107..067fb5eb34 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 = { @@ -1056,15 +1056,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 }, @@ -1091,22 +1091,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 }, @@ -1123,7 +1123,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.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:14.386156932 +0200 +++ 0078-test-crypto-fix-ZUC-vector-IV-format.patch 2022-07-07 09:54:11.017824938 +0200 @@ -1 +1 @@ -From 3025fe291015686f3e954dd520e7cbc130439d33 Mon Sep 17 00:00:00 2001 +From f2a1d83ee7902a0f890fcedaf0b3baf78e060eed Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3025fe291015686f3e954dd520e7cbc130439d33 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 5d1d264579..299d7649fe 100644 +index cc2338e107..067fb5eb34 100644 @@ -67 +68 @@ -@@ -1166,15 +1166,15 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { +@@ -1056,15 +1056,15 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { @@ -87 +88 @@ -@@ -1201,22 +1201,22 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { +@@ -1091,22 +1091,22 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { @@ -126 +127 @@ -@@ -1233,7 +1233,7 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = { +@@ -1123,7 +1123,7 @@ struct wireless_test_data zuc_auth_cipher_test_case_1 = {