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 44DBEA0543 for ; Tue, 21 Jun 2022 10:09:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FD394069C; Tue, 21 Jun 2022 10:09:01 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2058.outbound.protection.outlook.com [40.107.243.58]) by mails.dpdk.org (Postfix) with ESMTP id 4943F427E9 for ; Tue, 21 Jun 2022 10:08:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IOQIDuGEiaJNxHJ1jtujWtQHbNarOiahN6wZxPw6M2Xv1sJ2kksBMomiMZc6Ro2pMvtkoQaY6P9lgl3NksTUJBIiq7eFCWkRMrawgVq1cLRmoen7e4gw7eov0XvNWS0b5d0hkoE32mEeyWfNQ+/xwkripkEEoAadMoIRpIR245AKTERJTJcEYvExfICvtH/rKQiQR1ytjBKnSOFk9wfItwgE/TL20E3xEgP7+GGZ81JkAaK0cICUckGEhxOaq3cbGuGhkZWl4rbBZS8gHHptZP6y2TdMvtGBecoY2BSN5Lyh8ry7tDYvxSJqGocGjjXMa6ETy0P2wrrKbXbNDQjpaQ== 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=u3zjU8Y3L7ozLErojtE8tQZWORMB74e0Y+g32sBLZPc=; b=SR0NN4kpitTcfRrf6q9f/Q9mw169jz4SDOX4iMdlYCriqs96LSo3fCkjtLjdfOMLd2qSGpPlBuOHDZ7TUyT/5M4EU0n3znhre9usKakts/rwU6xnYGdOhFnpW0C7fNDcLBZ0jWq79oLCEK5HSoyCMrT+HVBdy7oNcgEJUEuwzSnqI/lKoewHcSI+lMFKMjN+fZac1e9FwDdk99v6eYBRTGkZhbOYtFQLSTL5Ad16/j/mYYW0qAVLdDLKv0xzG5/7rNx1iNMaKHzDsO5JbF77/kfiSj8J8Y0bpA5iPjEODXac4IhsHItzQzdqsBFFpDM92LOwEDga7ibbv0Vdzf/SKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=intel.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=u3zjU8Y3L7ozLErojtE8tQZWORMB74e0Y+g32sBLZPc=; b=kUZQWwiXIwQsJv43kp/II/tjnTaWX5/23AJTNSRtJjZj4xe1ndkSyumZDiVW8y+33zp6e9L+v9CZEg5OjLdBOwZ18EvGPLXFbHUCqABw5dn8USDsFwwS95MmaxyphzHtdQD24qECvD426+V/T90wppXr6Las53/OwEcJav9vtLH29bWLGFjCCMDPA735fy5OHUDonUBRI6VJCMtHhp4Pz8lATohZYlAnqUQkq5uHQcdYr1T75zj53wS7+JJRk2Ce3JTHwDMHPchPOdT3ngpwU3kFY2+mI/o4LwskR/JR9fZFwJiA/bvQwkJf+c/myzqACwGUIALi/iihWD299OInzg== Received: from BN9PR03CA0887.namprd03.prod.outlook.com (2603:10b6:408:13c::22) by DM4PR12MB6471.namprd12.prod.outlook.com (2603:10b6:8:ba::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.17; Tue, 21 Jun 2022 08:08:57 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13c:cafe::f8) by BN9PR03CA0887.outlook.office365.com (2603:10b6:408:13c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16 via Frontend Transport; Tue, 21 Jun 2022 08:08:57 +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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:08:57 +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; Tue, 21 Jun 2022 08:08:56 +0000 Received: from nvidia.com (10.126.230.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.22; Tue, 21 Jun 2022 01:08:54 -0700 From: Xueming Li To: Heinrich Schuchardt CC: Daxue Gao , David Marchand , Kai Ji , dpdk stable Subject: patch 'drivers/crypto: fix warnings for OpenSSL version' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:12 +0300 Message-ID: <20220621080301.2315720-67-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.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: fd3d0c35-1c37-4b4a-a856-08da535d4a97 X-MS-TrafficTypeDiagnostic: DM4PR12MB6471:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AOnYDUqm8lIrQ17aYKkL6lctlDDcwVn2LUOV3DXBIAkQCom2R3nfigXpO6xQlCWOkwLC7Bp8s9iFfgk0JnMXtgU5hY4Xl9tq7vxoS8COfjTyXNxMUb4dy6IfE0BVtTc151ahaXungh3peftb/ihWGGNL+0ty/EWjRT+GP3h1pTbVObykBcyhKNSXeMBc+SgZ8oSDiVRwlZPAA6uNlfgukhYxL/Z396wuKNoPwLKosOQWQ8vR8bch1EVEWmdZ2Cu2M/G9XXJtdyn5WuRk8xoVq2TVPD+fLVq9tmArKk4Q7YCCZ0PeoD6BPhLrlvfZ2ui0o4rjjhjUAVeMrec2VvBP4wkW7FTOc5i7Nudur1eLSq4aN6sZPSU8pf3js2gc9021IeGodjuLY3PpgKKCD+L2vZkJzpXxKtYBWo2boEkvnMCcz+itZWIuancfA7Ql0mA1UhmbKY6SRGL+LE3yuURJfuN4tzn4dIRbBaN/RJSzg23/mDcv0sGCX4EGckCSj/Fq0BM8Q/2ArD/nc1SeYIrsKdSu8D2hMDqRjjyz9hQ/IirclJAvYgpQJ6b1+gSArz4pFk7TQhPj7df5QJ5HXhOCsetI0BZ9pCkRBqNglPZHv00sOl+FId4/OoJA/H+jxjc+ZPk4jR91oGgWosfgwo+hJYgQxU2gGXgLDUReehC7HMxFuP88wpmmkSIr5ryTBGX5f5bp82brG0H57Y2nekSUpaf9jFTIem1gg9cukdqCiXse8zyXGEftUNcZBvMRF5ZLCY7n02gsL7H4AbH0Whsya+z1UbV17FPRhgltSSH8JbDQMWJJMXfv0aDJxNvrX56zeXfg5Y43O710c+L2igaLXho+SlzMTkCgb8wVJbTuoS0= 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)(396003)(136003)(39860400002)(346002)(376002)(36840700001)(40470700004)(46966006)(1076003)(53546011)(86362001)(16526019)(26005)(82740400003)(81166007)(186003)(6916009)(47076005)(336012)(41300700001)(7696005)(356005)(6666004)(426003)(6286002)(36860700001)(55016003)(40460700003)(2616005)(5660300002)(8936002)(2906002)(40480700001)(8676002)(36756003)(70586007)(83380400001)(70206006)(316002)(54906003)(966005)(4326008)(478600001)(82310400005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:08:57.3144 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd3d0c35-1c37-4b4a-a856-08da535d4a97 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6471 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 06/23/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/5e4a008e4e1442c7f3d7d1e6808dad8b87fd9029 Thanks. Xueming Li --- >From 5e4a008e4e1442c7f3d7d1e6808dad8b87fd9029 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 10 May 2022 17:06:35 +0200 Subject: [PATCH] drivers/crypto: fix warnings for OpenSSL version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 7360749f167b9039f549818700db3f57d6f8a9fd ] The API of the OpenSSL library has changed with version 3.0. This results in a lot of compiler warnings like ../dpdk/drivers/crypto/ccp/ccp_crypto.c:182:9: warning: ‘SHA256_Transform’ is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations] As many Linux distributions still use elder OpenSSL libraries we cannot change the used API now. Instead define OPENSSL_API_COMPAT to indicate that we are using the OpenSSL 1.1.0 API. OPENSSL_API_COMPAT is introduced in *.c files and not in *.h files as some *.c files directly include OpenSSL headers. Fixes: d61f70b4c918 ("crypto/libcrypto: add driver for OpenSSL library") Signed-off-by: Heinrich Schuchardt Tested-by: Daxue Gao Tested-by: David Marchand Acked-by: Kai Ji --- drivers/crypto/ccp/ccp_crypto.c | 2 ++ drivers/crypto/openssl/rte_openssl_pmd.c | 2 ++ drivers/crypto/openssl/rte_openssl_pmd_ops.c | 2 ++ drivers/crypto/qat/qat_sym.c | 2 ++ drivers/crypto/qat/qat_sym_session.c | 2 ++ 5 files changed, 10 insertions(+) diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c index 9fb03cc244..e66aa98e2a 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -2,6 +2,8 @@ * Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved. */ +#define OPENSSL_API_COMPAT 0x10100000L + #include #include #include diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index ca4265d2be..786c87baed 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -2,6 +2,8 @@ * Copyright(c) 2016-2017 Intel Corporation */ +#define OPENSSL_API_COMPAT 0x10100000L + #include #include #include diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index ed75877581..1b075fd847 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -2,6 +2,8 @@ * Copyright(c) 2016-2017 Intel Corporation */ +#define OPENSSL_API_COMPAT 0x10100000L + #include #include diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c index f7992a0a33..86fc7aff38 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -2,6 +2,8 @@ * Copyright(c) 2015-2019 Intel Corporation */ +#define OPENSSL_API_COMPAT 0x10100000L + #include #include diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 6e2193fb69..aa9ce1236b 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -2,6 +2,8 @@ * Copyright(c) 2015-2019 Intel Corporation */ +#define OPENSSL_API_COMPAT 0x10100000L + #include /* Needed to calculate pre-compute values */ #include /* Needed to calculate pre-compute values */ #include /* Needed to calculate pre-compute values */ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:52.299524004 +0800 +++ 0066-drivers-crypto-fix-warnings-for-OpenSSL-version.patch 2022-06-21 15:37:49.094451453 +0800 @@ -1 +1 @@ -From 7360749f167b9039f549818700db3f57d6f8a9fd Mon Sep 17 00:00:00 2001 +From 5e4a008e4e1442c7f3d7d1e6808dad8b87fd9029 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 7360749f167b9039f549818700db3f57d6f8a9fd ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -39 +41 @@ -index 4ed91a7436..4bab18323b 100644 +index 9fb03cc244..e66aa98e2a 100644 @@ -52 +54 @@ -index d80e1052e2..4f331af157 100644 +index ca4265d2be..786c87baed 100644 @@ -65 +67 @@ -index 1cb07794bd..87c395a836 100644 +index ed75877581..1b075fd847 100644 @@ -78 +80 @@ -index ca8c9a8124..3a6c9dcc0a 100644 +index f7992a0a33..86fc7aff38 100644 @@ -82 +84 @@ - * Copyright(c) 2015-2022 Intel Corporation + * Copyright(c) 2015-2019 Intel Corporation @@ -91 +93 @@ -index 9d6a19c0be..737a180810 100644 +index 6e2193fb69..aa9ce1236b 100644 @@ -95 +97 @@ - * Copyright(c) 2015-2022 Intel Corporation + * Copyright(c) 2015-2019 Intel Corporation