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 AF5F94301E for ; Thu, 10 Aug 2023 01:50:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A97F34324E; Thu, 10 Aug 2023 01:50:39 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2078.outbound.protection.outlook.com [40.107.237.78]) by mails.dpdk.org (Postfix) with ESMTP id 9ADB140DD8 for ; Thu, 10 Aug 2023 01:50:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewSxyaYpv6PxoR/wcJi+VKVz/7c6a4SwEcixnlJD/49QuWTj8nJ4wN1yxErCKL1jDP9dEOnHba9rYo0SYiarQz+X9X3id76m7EK7+FuqJIAN2JeYZHqMiTOdBZoZDa7O8nAxZLr9Q7u7GThiUSEc8iseAYNitmX9F5ArM3za2R8m3b7325PKBj4TS1Mz95OjBoohiPkdUnM70LCbVwb+NZoRV5dFgKJeAJES9exsH3Fdin0Ns1U67GakTkb+Fbu0LRSWJM/NaeX70SSlBr+PdH4JyfCsjbGpgS1gWAsNEFOfg+tiE+Hxms12xddLGgNH1Wkv+HMJQy9eNPhYfp8W9Q== 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=Vwb5Rzike2up2edcmqK4HgfcpHScjWurwyeoLlNTcog=; b=offCr4vAaw5dAttd+ZYtwLE+JM2LxzxvVtpcL3XVyv36bg+pqRmq9jId6Y9jS+KQQ7OGXT77zDDBM81AVkGMd+OlxQAwOMHJd0Cfab+DRtDN07CXVuI8f/RwAhNVjlVSvM/xfNvJZtVvGQe/WLMti+hPrNmL02kmF2OI4np5kfWK1ira0NPf+Mau6+WI7NivO+NHGhq8uoJ3shSAtleF2JYIx5kqI9fJMFQGD8arT1xOgkkoy8EgMiyEGvqeCzEkhqyQbPORoUmPUigv186ygQZDpBrw1S6Vz7H16D4Q+Vn1LYYdtMMUL1nkPVNYSR6UV84/fC4z9iVKuHwHQpu/Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=6wind.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=Vwb5Rzike2up2edcmqK4HgfcpHScjWurwyeoLlNTcog=; b=KlfMJfQEFmpJT1f8D1cP10YOzsEbfM4EDudBzIXM3VWm+RIAmZVut1cfqq7dAWJb5yqscHI/BqqTF7/Gre+nD/8n9n0DjRA0FH7L6GclOYJHzbbos9eKUFAj9+85cg8eKsVeq+sDjI0DdHCHFdFCQobfZSnNRCvCyY9UKwn5sUUgzwQ09F1thxejCHDGjyhrUetkKaMZHvRY3CPX23isabOFO0r1LlHX7rQcWrWzSrCmh/R0ffypC3kkcZpT7mswBPZC4A4bFmwpVRiDbpEj8o0K5ySxvN7APOI+C0CD1MhX5yX+FSo6cIlmWfUQdHHt32N5/O1DptmI0ktwcw+5Zg== Received: from CY5PR19CA0088.namprd19.prod.outlook.com (2603:10b6:930:83::7) by MW3PR12MB4538.namprd12.prod.outlook.com (2603:10b6:303:55::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:50:35 +0000 Received: from CY4PEPF0000E9DA.namprd05.prod.outlook.com (2603:10b6:930:83:cafe::63) by CY5PR19CA0088.outlook.office365.com (2603:10b6:930:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:50:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9DA.mail.protection.outlook.com (10.167.241.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Wed, 9 Aug 2023 23:50:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:50:21 -0700 Received: from nvidia.com (10.126.230.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; Wed, 9 Aug 2023 16:50:19 -0700 From: Xueming Li To: Didier Pallard CC: Kai Ji , dpdk stable Subject: patch 'crypto/openssl: skip workaround at compilation time' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:31 +0800 Message-ID: <20230809234930.32424-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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-TrafficTypeDiagnostic: CY4PEPF0000E9DA:EE_|MW3PR12MB4538:EE_ X-MS-Office365-Filtering-Correlation-Id: f8d1d352-9c12-4af4-9421-08db99336be6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fGYC5C3flHwHdUKNvJikce1opasDHVURed8cL4B6XUNc8PkdHUL9i2Y476Ca+mWjHv7yDknMXTiRlvvLtIlrjgT+hZqH5UnRfFN9igYYCJeowVIMBfEQzEXhQbhCZF1LwuXcGTK+b3QbuEpLPdU2bEB+lFTIChl7CEI8AiiObXq9TC8XTY1Bhtnt6WMtMWrHGOglqrRDUuqrvSDSTmlS3+5yK398e/Yu7W1DGS1/Q+2/dvwG96jnLMnkY6ilmW9BgoXs9BlDnvLDqRLoppwzA7gcuRGmN77GvGFynw7IX1lYVkDm2tdc71cdksXLe5WKIR/JK56KkdaMvf9yZFRCjxoY78NUGCOHt/lS9krnGysRyhocDzXyiaWxWmnd15locJzOLw5GXhOGaYeVxy7QOuH9lDPU0dykSDpqwo/qZ996UcoFGbLXL7/hxAd/Ryjl5G8SVE7nWIdxE4HOf44vkCtLqFN3+Y8KjybSYki7AvJizbnwh7SJn5TpvIr/m9RR29UvrO4PoOttPCh7faLbC6TmtLhgCjH1r+OsvNErgXtBrQby60JTK9sGojq4LRPM2EWmdfLBu6EMpFukB/YZ/nedT1ZiE6YPploTBVkibj1OXtW2pNDHsGRX1hZW8NupC/kR0QI+qOo74TzvVf0nN5WXd/tW2JR1Bi5c+f9mEvFNhupWErvakPUw+qFc4AWSkBZHaa0pETKBGtbGsFNTtXsJh6pDUXxORz+ZrNFApwX9dBSlqVbVxDb8/IO5YVC6j5nYU8Xex+g/e/akvZnCPg== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(346002)(376002)(136003)(396003)(451199021)(82310400008)(1800799006)(186006)(40470700004)(36840700001)(46966006)(426003)(40460700003)(83380400001)(7636003)(6286002)(16526019)(2906002)(336012)(2616005)(55016003)(40480700001)(54906003)(86362001)(478600001)(36756003)(316002)(53546011)(82740400003)(1076003)(26005)(6666004)(5660300002)(41300700001)(7696005)(8936002)(8676002)(36860700001)(70586007)(966005)(356005)(6916009)(70206006)(4326008)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:50:33.4618 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8d1d352-9c12-4af4-9421-08db99336be6 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4538 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/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/commit/?h=22.11-staging&id=643423f0b7e4189c9814ade46234ec1d7b39227f Thanks. Xueming Li --- >From 643423f0b7e4189c9814ade46234ec1d7b39227f Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Tue, 18 Apr 2023 16:56:19 +0200 Subject: [PATCH] crypto/openssl: skip workaround at compilation time Cc: Xueming Li [ upstream commit 5b94ac1965620e945a3b8fcff84fab4fcb2ef801 ] This workaround was needed before version 1.0.1f. Do not build it for versions >= 1.1. Fixes: d61f70b4c918 ("crypto/libcrypto: add driver for OpenSSL library") Signed-off-by: Didier Pallard Acked-by: Kai Ji --- drivers/crypto/openssl/rte_openssl_pmd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 175b651000..6825b0469e 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1195,8 +1195,11 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, int srclen, uint8_t *aad, int aadlen, uint8_t *iv, uint8_t *dst, uint8_t *tag, EVP_CIPHER_CTX *ctx) { - int len = 0, unused = 0; + int len = 0; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + int unused = 0; uint8_t empty[] = {}; +#endif if (EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv) <= 0) goto process_auth_encryption_gcm_err; @@ -1210,9 +1213,11 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, srclen, ctx, 0)) goto process_auth_encryption_gcm_err; +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* Workaround open ssl bug in version less then 1.0.1f */ if (EVP_EncryptUpdate(ctx, empty, &unused, empty, 0) <= 0) goto process_auth_encryption_gcm_err; +#endif if (EVP_EncryptFinal_ex(ctx, dst, &len) <= 0) goto process_auth_encryption_gcm_err; @@ -1274,8 +1279,11 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, int srclen, uint8_t *aad, int aadlen, uint8_t *iv, uint8_t *dst, uint8_t *tag, EVP_CIPHER_CTX *ctx) { - int len = 0, unused = 0; + int len = 0; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + int unused = 0; uint8_t empty[] = {}; +#endif if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, 16, tag) <= 0) goto process_auth_decryption_gcm_err; @@ -1292,9 +1300,11 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, srclen, ctx, 0)) goto process_auth_decryption_gcm_err; +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* Workaround open ssl bug in version less then 1.0.1f */ if (EVP_DecryptUpdate(ctx, empty, &unused, empty, 0) <= 0) goto process_auth_decryption_gcm_err; +#endif if (EVP_DecryptFinal_ex(ctx, dst, &len) <= 0) return -EFAULT; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.537043700 +0800 +++ 0009-crypto-openssl-skip-workaround-at-compilation-time.patch 2023-08-09 21:51:18.114352000 +0800 @@ -1 +1 @@ -From 5b94ac1965620e945a3b8fcff84fab4fcb2ef801 Mon Sep 17 00:00:00 2001 +From 643423f0b7e4189c9814ade46234ec1d7b39227f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5b94ac1965620e945a3b8fcff84fab4fcb2ef801 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 9b83811d67..4569c5e62f 100644 +index 175b651000..6825b0469e 100644 @@ -22 +24 @@ -@@ -1196,8 +1196,11 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1195,8 +1195,11 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, @@ -35 +37 @@ -@@ -1211,9 +1214,11 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1210,9 +1213,11 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, @@ -47 +49 @@ -@@ -1275,8 +1280,11 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1274,8 +1279,11 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, @@ -60 +62 @@ -@@ -1293,9 +1301,11 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1292,9 +1300,11 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset,