patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Cc: Daxue Gao <daxuex.gao@intel.com>,
	David Marchand <david.marchand@redhat.com>,
	Kai Ji <kai.ji@intel.com>, dpdk stable <stable@dpdk.org>
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	[thread overview]
Message-ID: <20220609113701.386938-15-ktraynor@redhat.com> (raw)
In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com>

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 <heinrich.schuchardt@canonical.com>
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 <heinrich.schuchardt@canonical.com>
Tested-by: Daxue Gao <daxuex.gao@intel.com>
Tested-by: David Marchand <david.marchand@redhat.com>
Acked-by: Kai Ji <kai.ji@intel.com>
---
 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 <dirent.h>
 #include <fcntl.h>
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 <rte_common.h>
 #include <rte_hexdump.h>
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 <string.h>
 
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 <openssl/evp.h>
 
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 <openssl/sha.h>	/* Needed to calculate pre-compute values */
 #include <openssl/aes.h>	/* 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


  parent reply	other threads:[~2022-06-09 11:37 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-09 11:35 patch 'examples/l3fwd: fix scalar LPM' " Kevin Traynor
2022-06-09 11:35 ` patch 'test/ring: remove excessive inlining' " Kevin Traynor
2022-06-09 11:35 ` patch 'eal/freebsd: fix use of newer cpuset macros' " Kevin Traynor
2022-06-09 11:35 ` patch 'test: avoid hang if queues are full and Tx fails' " Kevin Traynor
2022-06-09 11:35 ` patch 'acl: fix rules with 8-byte field size' " Kevin Traynor
2022-06-09 11:35 ` patch 'rib: fix traversal with /32 route' " Kevin Traynor
2022-06-09 11:35 ` patch 'mbuf: dump outer VLAN' " Kevin Traynor
2022-06-09 11:35 ` patch 'doc: fix API index Markdown syntax' " Kevin Traynor
2022-06-09 11:35 ` patch 'devtools: fix null test for NUMA systems' " Kevin Traynor
2022-06-09 11:35 ` patch 'pipeline: fix emit instruction for invalid headers' " Kevin Traynor
2022-06-09 11:35 ` patch 'pcapng: fix timestamp wrapping in output files' " Kevin Traynor
2022-06-09 11:35 ` patch 'examples/ipsec-secgw: fix uninitialized memory access' " Kevin Traynor
2022-06-09 11:36 ` patch 'examples/ipsec-secgw: fix promiscuous mode option' " Kevin Traynor
2022-06-09 11:36 ` patch 'test/crypto: fix null check for ZUC authentication' " Kevin Traynor
2022-06-09 11:36 ` Kevin Traynor [this message]
2022-06-09 11:36 ` patch 'test/crypto: fix driver name for DPAA raw API test' " Kevin Traynor
2022-06-09 11:36 ` patch 'doc: add missing auth algo for IPsec example' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: fix port status of bonding slave device' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: perform SW IP checksum for GRO/GSO packets' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: remove useless pointer checks' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/hns3: fix xstats get return if xstats is null' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ipn3ke: " Kevin Traynor
2022-06-09 11:36 ` patch 'net/mvpp2: " Kevin Traynor
2022-06-09 11:36 ` patch 'net/axgbe: " Kevin Traynor
2022-06-09 11:36 ` patch 'ethdev: fix memory leak in xstats telemetry' " Kevin Traynor
2022-06-09 11:36 ` patch 'ethdev: fix possible null pointer access' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/cnxk: fix possible null dereference in telemetry' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: replace hardcoded min mbuf number with macro' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: fix metering and policing command for RFC4115' " Kevin Traynor
2022-06-09 11:36 ` patch 'ethdev: prohibit polling stopped queue' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: fix use of indirect action after port close' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: do not poll stopped queues' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/bonding: fix mbuf fast free usage' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/memif: fix overwriting of head segment' " Kevin Traynor
2022-06-09 11:36 ` patch 'ethdev: fix port state when stop' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ngbe: fix link speed check' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ngbe: fix reading PHY ID' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ngbe: fix PCIe related operations with bus API' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/txgbe: fix SGMII mode to link up' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/txgbe: fix max number of queues for SR-IOV' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/nfp: fix disabling VLAN stripping' " Kevin Traynor
2022-06-09 11:36 ` patch 'app/testpmd: fix help of create meter command' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/vmxnet3: fix Rx data ring initialization' " Kevin Traynor
2022-06-09 11:36 ` patch 'common/sfc_efx/base: convert EFX PCIe INTF to MCDI value' " Kevin Traynor
2022-06-09 11:36 ` patch 'ethdev: fix port close in secondary process' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/bnxt: fix compatibility with some old firmwares' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/bnxt: fix ULP parser to ignore segment offset' " Kevin Traynor
2022-06-09 11:36 ` patch 'vhost: fix async access' " Kevin Traynor
2022-06-09 11:36 ` patch 'doc: fix vhost multi-queue reconnection' " Kevin Traynor
2022-06-09 11:36 ` patch 'vhost: fix deadlock when message handling failed' " Kevin Traynor
2022-06-09 11:36 ` patch 'examples/vhost: fix crash when no VMDq' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/mlx5: fix Tx recovery' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/mlx5: fix statistics read on Linux' " Kevin Traynor
2022-06-09 11:36 ` patch 'kni: fix build with Linux 5.18' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: fix data path selection' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ixgbe: add option for link up check on pin SDP3' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ice/base: fix getting sched node from ID type' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ice/base: fix direction of flow that matches any' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/ice: fix MTU info for DCF' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/i40e: fix max frame size config at port level' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: fix queue start exception handling' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: fix mbuf release in multi-process' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: fix Rx queue interrupt setting' " Kevin Traynor
2022-06-09 11:36 ` patch 'doc: update matching versions in i40e guide' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: fix device initialization without inline crypto' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: fix device stop' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: increase reset complete wait count' " Kevin Traynor
2022-06-09 11:36 ` patch 'net/iavf: remove dead code' " Kevin Traynor
2022-06-09 11:36 ` patch 'common/mlx5: remove unused lcore check' " Kevin Traynor
2022-06-09 11:36 ` patch 'examples/dma: fix MTU configuration' " Kevin Traynor
2022-06-09 11:36 ` patch 'examples/dma: fix Tx drop statistics' " Kevin Traynor
2022-06-09 11:36 ` patch 'dma/hisilicon: fix index returned when no DMA completed' " Kevin Traynor
2022-06-09 11:37 ` patch 'dma/hisilicon: enhance CQ scan robustness' " Kevin Traynor
2022-06-09 11:37 ` patch 'eal/ppc: fix compilation for musl' " Kevin Traynor
2022-06-09 12:53 ` patch 'examples/l3fwd: fix scalar LPM' " Stanisław Kardach
2022-06-09 13:12   ` Kevin Traynor
2022-06-09 13:17     ` Kevin Traynor
2022-06-09 13:21       ` Stanisław Kardach

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220609113701.386938-15-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=david.marchand@redhat.com \
    --cc=daxuex.gao@intel.com \
    --cc=heinrich.schuchardt@canonical.com \
    --cc=kai.ji@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).