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 C3075428F8 for ; Sun, 9 Apr 2023 17:28:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB8B94114A; Sun, 9 Apr 2023 17:28:04 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2084.outbound.protection.outlook.com [40.107.102.84]) by mails.dpdk.org (Postfix) with ESMTP id 0252340A80 for ; Sun, 9 Apr 2023 17:28:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DoS0hoUf73Ev04h9CVUw11O7Lre8YuqPBsjtCTNMkVQh5jDM4qR1EuWRmMnZ8i3BY24ymFG5FYx7n05BEFfDaZdMZLQUQ56sJhXV6Vx+tEkRnqaAVy8RXw14rq613IY+abnK15wh//soItVMQfCJl0DeuBABE9QYOP4s4XAK3sRCip8NztSFSIrwuSiCY09f2oVj6nDNPZcWour0/zRwQUE/eyNOZArqiywrvlrfljahEfFAXP3bH1d1yTS1p9s7E2z8rW94EEySc9YKjIkwVs3RU8Wn4Pyjedu0zWYXCh4J7wc6W/uzAZxXGwmG4zJYKgI99LJqaIU8qcSLhHBg/A== 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=2hqx2QKD7fDk9M3ySCH6WI9FilUjKT5Duo32Xr25jAU=; b=LjR4YdYphq5zTL7uJJekXBv/EO5F3yo8sYZge9EGRLo+Sklv3sX36QD7G1lcoqncdpqsMMNxbCSTkds7/DHcRtIF63sL48d5ffD8nAadRlf/z2osdMcl8mzHIz/nQVT8pV+YNElwtvqgkWEQh6sS2Vfa17N+Cw/Gv1AUTfq5+PUdzxKK1DhETKTKTjSWBccQ8GwV0gZrPiOfMW8l889Ei9+Cs55TL7y9C+qWYMxdpGkUh3L+y+ncOLxgX/vyv/c2yMXF7dhM5/ej1mQGbcNjBNIm66Q2IZxvr6IkPJAVbv5dydOq8bJmMY9b4lKOsjUA2oYy4SvEBxiqGktyLqooiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com 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=2hqx2QKD7fDk9M3ySCH6WI9FilUjKT5Duo32Xr25jAU=; b=fPo51pQcggwr32Vcrp3WVBx4bqnGNJMSoVe1rgz/J/fwihbsHDm/kopv9hyMD9aShaeRO4/WBDIe3rF5026KyUDXp6+PhvNkj1yHi6V6ZcFwRFKcyNB5PE8P7J+IMdc4cg4C77Jx3DTq9UEulHGB3zB5VCQyw6RRVxd7mcCgR7bYYG5MfHZnCSul0EBE530KJq9GNDrZJUJmhIqgky/UcKd5jvGBEs9p4zHQxNHihMSVppiNYXPO33T/HNhsLDN7ftieWVU8Lzk/dYsaH3bcuK0CxhwsoVGU4g/eaGXq6v0GbkIx2QPiaboHr7DnWoomVlrsNWBZLszpPEsQUJ2msQ== Received: from DM6PR12CA0028.namprd12.prod.outlook.com (2603:10b6:5:1c0::41) by DM4PR12MB7527.namprd12.prod.outlook.com (2603:10b6:8:111::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Sun, 9 Apr 2023 15:28:01 +0000 Received: from DM6NAM11FT103.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1c0:cafe::3d) by DM6PR12CA0028.outlook.office365.com (2603:10b6:5:1c0::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.39 via Frontend Transport; Sun, 9 Apr 2023 15:28:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT103.mail.protection.outlook.com (10.13.172.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:28:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:27:54 -0700 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 9 Apr 2023 08:27:53 -0700 From: Xueming Li To: Gowrishankar Muthukrishnan CC: Brian Dooley , dpdk stable Subject: patch 'examples/fips_validation: fix AES-XTS sequence number' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:34 +0800 Message-ID: <20230409152529.5308-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT103:EE_|DM4PR12MB7527:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d7b64c6-7f7c-40c5-f8f0-08db390f0143 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VwY0aXgySBf4wC/SBbFFAxdPIETHdkWehbIhOka+KGV8iS5d7+vHNyP+3W0y4bRsDqoqHELokp+tLbd9hs4cCP0XjfNvYUj0A7UrKkqVz9TkcNZ1U2Wvs4y2Oi2NQRP5E+V7xKPL0ArFAcLz2S6RaQDyVMHqCuGDzZk4r5JUAYlzF4iuskvFxopvkCFQ59YGM9BAWeYB+4oW97zHMZIyHdVd5glRdhl6114QsC7s/ebG9BgoX5bRnNDfF3FtC5NiQkAW5dPybacbrTLtz+YQ28/ne4evro6cYmduMQ/Q5BKga4tZnKawJOykClOBvQmL+BF8sZPmMh4t+Nm6G6Z4HtIouKQNF2HDAkLBUvagS78LyJHbs809y3pSAGdmkFIi0muVldaMIZa8cnpSCRyUOzMpwdl1U0pAEk3P7+L+qx2hOGJJUZyxaUmmlXMQjyWzBDEVNlrFXkrO9Z7CSa2BpZ+zYaJ1iNkvTqgCq9bdM16+OxQWtBjRr7A/lEM28TcD/rWyXYmaQA1fvu8TZXh59sjoHSmUhKdeq8jjXX3LQMfBDrOU27vfc3jnozBOywgguKyFsYPRk3ekYLMQTUw14p5+4yoo18oNe8HDEGCigjLcCr3dkCfNxkEsRsIyB+LPbc+h35pQkC7OORLYR7zTkfvNuJCgHaW2LXRxQrQqyOTCYW5MlOIt/mx2v2pf/l2XlNlio4JIpfuqK4vLGZqSFaSeoS4siWt5dosbjB1hgkIXK6rprn08wbTETGdBgs8PMpW6VDsBOU82ShIqxYwK0GgWk27rHS1z7lmbiaf+1JZFZCYfW8wwmcoYTBgS/Tq87LyX0ARPGjfHJJNOEg/16A== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(136003)(346002)(396003)(376002)(451199021)(36840700001)(40470700004)(46966006)(7696005)(478600001)(86362001)(55016003)(40480700001)(83380400001)(47076005)(36756003)(40460700003)(82740400003)(7636003)(356005)(2616005)(36860700001)(426003)(336012)(6666004)(966005)(2906002)(54906003)(316002)(16526019)(6286002)(186003)(1076003)(53546011)(26005)(8676002)(6916009)(41300700001)(8936002)(5660300002)(82310400005)(4326008)(70586007)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:28:01.0019 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d7b64c6-7f7c-40c5-f8f0-08db390f0143 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT103.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7527 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 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/903f4ee07da15770a9185c900a21b883b1ddae96 Thanks. Xueming Li --- >From 903f4ee07da15770a9185c900a21b883b1ddae96 Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Tue, 28 Feb 2023 22:58:55 +0530 Subject: [PATCH] examples/fips_validation: fix AES-XTS sequence number Cc: Xueming Li [ upstream commit 6e27b74b0e324fb966c8d10d1006b68089c2a806 ] Fix AES XTS test to read sequence number correctly. Fixes: f8e431ed8f6 ("examples/fips_validation: add parsing for AES-XTS") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Brian Dooley --- examples/fips_validation/fips_validation_xts.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/fips_validation/fips_validation_xts.c b/examples/fips_validation/fips_validation_xts.c index 531e3c688e..530df78ab4 100644 --- a/examples/fips_validation/fips_validation_xts.c +++ b/examples/fips_validation/fips_validation_xts.c @@ -34,6 +34,7 @@ #define DATAUNITLEN_JSON_STR "dataUnitLen" #define PAYLOADLEN_JSON_STR "payloadLen" #define TWEAKVALUE_JSON_STR "tweakValue" +#define SEQNUMBER_JSON_STR "sequenceNumber" #define PT_JSON_STR "pt" #define CT_JSON_STR "ct" @@ -95,14 +96,17 @@ parser_xts_read_keylen(const char *key, char *src, struct fips_val *val) static int parser_xts_read_tweakval(const char *key, char *src, struct fips_val *val) { + char num_str[4] = {0}; int ret; - if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_HEX) + if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_HEX) { ret = parse_uint8_hex_str(key, src, val); - else if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_NUMBER) - ret = parser_read_uint32_bit_val(key, src, val); - else + } else if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_NUMBER) { + snprintf(num_str, RTE_DIM(num_str), "%x", atoi(src)); + ret = parse_uint8_hex_str(key, num_str, val); + } else { ret = -1; + } return ret; } @@ -122,6 +126,7 @@ struct fips_test_callback xts_interim_json_vectors[] = { struct fips_test_callback xts_enc_json_vectors[] = { {KEY_JSON_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.key}, {TWEAKVALUE_JSON_STR, parser_xts_read_tweakval, &vec.iv}, + {SEQNUMBER_JSON_STR, parser_xts_read_tweakval, &vec.iv}, {PT_JSON_STR, parse_uint8_hex_str, &vec.pt}, {NULL, NULL, NULL} /**< end pointer */ }; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.484726000 +0800 +++ 0026-examples-fips_validation-fix-AES-XTS-sequence-number.patch 2023-04-09 21:45:38.609042200 +0800 @@ -1 +1 @@ -From 6e27b74b0e324fb966c8d10d1006b68089c2a806 Mon Sep 17 00:00:00 2001 +From 903f4ee07da15770a9185c900a21b883b1ddae96 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6e27b74b0e324fb966c8d10d1006b68089c2a806 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org