DPDK patches and discussions
 help / color / mirror / Atom feed
* [PATCH] crypto/qat: fix build
@ 2022-12-30 21:07 Thomas Monjalon
  2022-12-30 21:38 ` Tyler Retzlaff
  0 siblings, 1 reply; 15+ messages in thread
From: Thomas Monjalon @ 2022-12-30 21:07 UTC (permalink / raw)
  To: Kai Ji; +Cc: dev, pablo.de.lara.guarch, David Marchand

When trying to compile on a fresh system, I hit this error:

intel-ipsec-mb.h:333: error: "AES_BLOCK_SIZE" redefined
  333 | #define AES_BLOCK_SIZE          IMB_AES_BLOCK_SIZE
In file included from drivers/crypto/qat/qat_sym_session.c:8:
/usr/include/openssl/aes.h:26: previous definition
   26 | # define AES_BLOCK_SIZE 16

I don't know why it was not seen before.
Is it because of a change in intel-ipsec-mb.h or in OpenSSL?

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 drivers/crypto/qat/qat_sym_session.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index 0ebc66f89e..37bde297c0 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -10,6 +10,7 @@
 #include <openssl/evp.h>	/* Needed for bpi runt block processing */
 
 #ifdef RTE_QAT_LIBIPSECMB
+#undef AES_BLOCK_SIZE
 #if defined(RTE_ARCH_ARM)
 #include <ipsec-mb.h>
 #else
-- 
2.39.0


^ permalink raw reply	[flat|nested] 15+ messages in thread
* [PATCH] crypto/qat: fix build
@ 2023-01-12 19:30 Pablo de Lara
  2023-01-12 20:39 ` Thomas Monjalon
  0 siblings, 1 reply; 15+ messages in thread
From: Pablo de Lara @ 2023-01-12 19:30 UTC (permalink / raw)
  To: kai.ji, akhil.goyal; +Cc: dev, Pablo de Lara, stable

Instead of undefining AES_BLOCK_SIZE, define NO_COMPAT_IMB_API_053,
which prevents legacy macros like AES_BLOCK_SIZE from being defined
from IPSec MB library.

Fixes: 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")
Cc: stable@dpdk.org
Cc: kai.ji@intel.com

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/crypto/qat/qat_sym_session.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index 978ee49dce..7f18e9875d 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -10,6 +10,7 @@
 #include <openssl/evp.h>	/* Needed for bpi runt block processing */
 
 #ifdef RTE_QAT_LIBIPSECMB
+#define NO_COMPAT_IMB_API_053
 #if defined(RTE_ARCH_ARM)
 #include <ipsec-mb.h>
 #else
-- 
2.34.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-01-18  9:51 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-30 21:07 [PATCH] crypto/qat: fix build Thomas Monjalon
2022-12-30 21:38 ` Tyler Retzlaff
2023-01-04 11:56   ` [EXT] " Akhil Goyal
2023-01-11  9:03     ` Thomas Monjalon
2023-01-11 23:20       ` Thomas Monjalon
2023-01-12 10:32         ` Ji, Kai
2023-01-12 10:40           ` Thomas Monjalon
2023-01-12 13:22             ` De Lara Guarch, Pablo
2023-01-12 15:00               ` Thomas Monjalon
2023-01-12 16:16                 ` De Lara Guarch, Pablo
2023-01-12 16:28                   ` Thomas Monjalon
2023-01-12 16:56                     ` [EXT] " Akhil Goyal
2023-01-12 16:34               ` Tyler Retzlaff
2023-01-12 19:30 Pablo de Lara
2023-01-12 20:39 ` Thomas Monjalon
2023-01-17  8:22   ` [EXT] " Akhil Goyal
2023-01-18  9:51     ` De Lara Guarch, Pablo

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).