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 603ECA0540 for ; Thu, 7 Jul 2022 09:57:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C03E427F0; Thu, 7 Jul 2022 09:57:04 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id EA826406B4 for ; Thu, 7 Jul 2022 09:57:03 +0200 (CEST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (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-1.canonical.com (Postfix) with ESMTPS id B3EA83F04C for ; Thu, 7 Jul 2022 07:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180623; bh=PCfAJultDZwhhQHNwTJsGobe8B9C5d3F3gIQgUOs+5U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=B46T7yY51ciYfrKT9YkN3ZsHe8JCBnjFMquV60Ve9Qm+hmcyIox8eZd9dsEu7Xhjl fFTlwriKHA7KJsvsIdDwDeIzNY+r9mt2T5+a7o/Crq5ug0K1AeZ1B2+O8yU1Z447m3 xWi+g28+mnn1ieVMOxgDAs7Gs/QgB06g8/7xTEk3Lt+W63vLLeFnlk3XItMUGsJH6h Mk5R7Q7FOUvEmMZwJv20FYegfdQCLduzyV20DuLkPX+szh2+6zPaeUvhnhP980hLXF o7f+xhHQfyTujfuvsdpzFOVx47MW/bz++gtK4JHsk6w2l6nGFjM+NYO4DPv+KOJimE leWv199AOhuqA== Received: by mail-ej1-f69.google.com with SMTP id go10-20020a1709070d8a00b00722e8ee15b4so4491464ejc.22 for ; Thu, 07 Jul 2022 00:57:03 -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=PCfAJultDZwhhQHNwTJsGobe8B9C5d3F3gIQgUOs+5U=; b=zSq/xym66qkUeFoOrDY0knQSdxLxKd1jMTFV/Zav+a4ev6c09Yoi9AF57NRjn41c97 zYzU9qlsMQZPtcqsG9Re8IlNoDsfM4/LMx/LGrJx6jWLKGgTJMMTSG6IpqGQyFcNWeLN Myyfv6EQ+bArSBB5gGF1HWZrus3rxisiY9Q5UmZUH80AUrECNryCxjfcx4pXt7HnQM4P p5ErU31kU1VYkj2czOazaJ7X40BJoKWxqybHByK9Tl4eXF+YhlFfRsrp93pikphjhNxw llLjP2KsahQdkKgECyHlJoRX5d9UPwvt1H0UVuij1RDJabhYGWow3VBbOnMibHKGJJnb Ne0g== X-Gm-Message-State: AJIora8rBWKiYyDWscJL2nqQTwdwESlltQ+2F50dMj8jG7tMB4HLS90B uyfCBU6ClPd0idZmk5+8c9unxscM7GAdZ4JzELxhvrkZry1s9LRyX2EFxDpEq5StBBXHYLYlN99 bBpcPx7yWZ9QYfrIJmEeHn0pz X-Received: by 2002:a17:907:724a:b0:726:3713:cfd3 with SMTP id ds10-20020a170907724a00b007263713cfd3mr45395140ejc.460.1657180623138; Thu, 07 Jul 2022 00:57:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u3Zc72welHWQZ0a6tMIEvyWCSIbtMcuWHnAj7K1ibHjLpuObEZcGsRP2pEX7dCWkPz2acdqw== X-Received: by 2002:a17:907:724a:b0:726:3713:cfd3 with SMTP id ds10-20020a170907724a00b007263713cfd3mr45395124ejc.460.1657180622868; Thu, 07 Jul 2022 00:57:02 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id u5-20020a170906068500b00703671ebe65sm18360271ejb.198.2022.07.07.00.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:02 -0700 (PDT) From: christian.ehrhardt@canonical.com 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 19.11.13 Date: Thu, 7 Jul 2022 09:54:27 +0200 Message-Id: <20220707075522.194223-32-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-Type: text/plain; charset=UTF-8 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/57ae04724a4a45ca27f776843fca798e89f99017 Thanks. Christian Ehrhardt --- >From 57ae04724a4a45ca27f776843fca798e89f99017 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 [ 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 4256734d16..1536b1a647 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 3e0afd71a1..aee8dea0c6 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 cbfb8149f9..4dda2e0c2f 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 696b231a00..150c6a8b52 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 ab12c99716..17647ea7b5 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.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.568925220 +0200 +++ 0032-drivers-crypto-fix-warnings-for-OpenSSL-version.patch 2022-07-07 09:54:10.861823975 +0200 @@ -1 +1 @@ -From 7360749f167b9039f549818700db3f57d6f8a9fd Mon Sep 17 00:00:00 2001 +From 57ae04724a4a45ca27f776843fca798e89f99017 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 7360749f167b9039f549818700db3f57d6f8a9fd ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -39 +40 @@ -index 4ed91a7436..4bab18323b 100644 +index 4256734d16..1536b1a647 100644 @@ -52 +53 @@ -index d80e1052e2..4f331af157 100644 +index 3e0afd71a1..aee8dea0c6 100644 @@ -65 +66 @@ -index 1cb07794bd..87c395a836 100644 +index cbfb8149f9..4dda2e0c2f 100644 @@ -78 +79 @@ -index ca8c9a8124..3a6c9dcc0a 100644 +index 696b231a00..150c6a8b52 100644 @@ -82 +83 @@ - * Copyright(c) 2015-2022 Intel Corporation + * Copyright(c) 2015-2019 Intel Corporation @@ -91 +92 @@ -index 9d6a19c0be..737a180810 100644 +index ab12c99716..17647ea7b5 100644 @@ -95 +96 @@ - * Copyright(c) 2015-2022 Intel Corporation + * Copyright(c) 2015-2019 Intel Corporation