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 91B91A0555 for ; Thu, 9 Jun 2022 13:37:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D6D1427EC; Thu, 9 Jun 2022 13:37:40 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6AE2A4280E for ; Thu, 9 Jun 2022 13:37:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XO2fsZ/QsiVABOLLz1jVbi2NyymLvOlnpzRX7WcxZ6c=; b=WnZryx7F4ik6EXnKFssZUI6uCA0GpAeji1s1WtwsFfcLLxy1atZ+YrhFTh51cPDwSJoiSu wvNskqnWb/77K9/unG6weW4n6WJV96w5tYTQyFE+hM0jGP0daXhmWHR9o+dNe1Erqh4buY 3B3U8DIxZNa368Lh6+vDXoU138D52gw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-14b79IMGPsuAIqrrZK5QfQ-1; Thu, 09 Jun 2022 07:37:31 -0400 X-MC-Unique: 14b79IMGPsuAIqrrZK5QfQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B329294EDD6; Thu, 9 Jun 2022 11:37:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 674AB18EA3; Thu, 9 Jun 2022 11:37:30 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Thu, 9 Jun 2022 12:36:02 +0100 Message-Id: <20220609113701.386938-15-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 21.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 06/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ef06b4307eb59be8ef67eb4cdfcdb12992051e0e Thanks. Kevin --- >From ef06b4307eb59be8ef67eb4cdfcdb12992051e0e 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 4ed91a7436..4bab18323b 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -3,4 +3,6 @@ */ +#define OPENSSL_API_COMPAT 0x10100000L + #include #include diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 5794ed8159..5977bc746c 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -3,4 +3,6 @@ */ +#define OPENSSL_API_COMPAT 0x10100000L + #include #include diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index 52715f86f8..35c4ad13ba 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -3,4 +3,6 @@ */ +#define OPENSSL_API_COMPAT 0x10100000L + #include diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c index 00ec703754..0dd83ee2ee 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -3,4 +3,6 @@ */ +#define OPENSSL_API_COMPAT 0x10100000L + #include diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 8ca475ca8b..f439bbd0f1 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -3,4 +3,6 @@ */ +#define OPENSSL_API_COMPAT 0x10100000L + #include /* Needed to calculate pre-compute values */ #include /* Needed to calculate pre-compute values */ -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.126109737 +0100 +++ 0015-drivers-crypto-fix-warnings-for-OpenSSL-version.patch 2022-06-09 12:34:29.640980462 +0100 @@ -1 +1 @@ -From 7360749f167b9039f549818700db3f57d6f8a9fd Mon Sep 17 00:00:00 2001 +From ef06b4307eb59be8ef67eb4cdfcdb12992051e0e Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 7360749f167b9039f549818700db3f57d6f8a9fd ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -50 +51 @@ -index d80e1052e2..4f331af157 100644 +index 5794ed8159..5977bc746c 100644 @@ -61 +62 @@ -index 1cb07794bd..87c395a836 100644 +index 52715f86f8..35c4ad13ba 100644 @@ -72 +73 @@ -index ca8c9a8124..3a6c9dcc0a 100644 +index 00ec703754..0dd83ee2ee 100644 @@ -83 +84 @@ -index 9d6a19c0be..737a180810 100644 +index 8ca475ca8b..f439bbd0f1 100644