From patchwork Fri Dec 30 21:07:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 121488 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6B828A0032; Fri, 30 Dec 2022 22:07:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06F6F410D0; Fri, 30 Dec 2022 22:07:47 +0100 (CET) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mails.dpdk.org (Postfix) with ESMTP id 359FC40141 for ; Fri, 30 Dec 2022 22:07:45 +0100 (CET) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id E30DF3200319; Fri, 30 Dec 2022 16:07:43 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 30 Dec 2022 16:07:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm2; t=1672434463; x=1672520863; bh=Xsw94y0uUuyxaaNDcoD4MImC5 /FUydGL7lCa3n/tWUE=; b=Bb2AnyosUJVRkti7JOdMNPodDiJ0v0IXF2SWgFqmS dq02f3Toqn+tWLQJXchN13r3qFYz/oqLgsT6JXtaitst5W9YXqTEW0PSKjZ8Pgn5 DDdlz7cri+gqIGAwIFHGzDEa0jz1APAqalE9BIYSraNKzGUQAlrRU6S4Q7bFE0Gd VpXOQm8So+E+AwOVdkL7wthgOuUiHh8fq55m5oLClleUYTjNlh1n+3TK6++1BgVE 9DeyDLyc+1XyESWVvRcGHgxGwlXKmHQXmfDjcRcEli4+BDbxkWlbASirUu5F8OSR QH96YXLZSM/5O2hmLu29fuFqXq8ZueYgzm1QUt1We+QHw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1672434463; x=1672520863; bh=Xsw94y0uUuyxaaNDcoD4MImC5/FUydGL7lC a3n/tWUE=; b=sIMZWeILMSgFGF29wMrQcpBTl472uWWUt6gYJ73FLbS0RD3+0b6 SgbUbVe/WZSiFAMgp2EZmD8be2HQ9NU0L4bbdwsikjQ9mqLmXob74O6dVKNST1lj nJaahet44xp34tdYI3ejROROp1BYFm6zQJwUxDECn4rjax90fwKXlqmDSAjSAG13 8UdnlqwwRVSo1mNkL41qMR63EIafepZOhmDR3IY5ty4tePHBRVkZN0lRHQH7Fr5R v0/zAfTOc8ySgIyUG7Ppxvxl7YhRLSk1QzJbq5nuRSlwEhlI2gTsvo/jvfNHQb+4 EF9NNVrZ2UM7ZS5VKU7JTKThu/7W0IEfFbw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrieeigddugeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf frrghtthgvrhhnpeevveefveeiiefhtedukeegkeelieegffeukeevudetueffieduveet iedukeefleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 30 Dec 2022 16:07:42 -0500 (EST) From: Thomas Monjalon To: Kai Ji Cc: dev@dpdk.org, pablo.de.lara.guarch@intel.com, David Marchand Subject: [PATCH] crypto/qat: fix build Date: Fri, 30 Dec 2022 22:07:28 +0100 Message-Id: <20221230210728.86920-1-thomas@monjalon.net> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Acked-by: Tyler Retzlaff --- 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 /* Needed for bpi runt block processing */ #ifdef RTE_QAT_LIBIPSECMB +#undef AES_BLOCK_SIZE #if defined(RTE_ARCH_ARM) #include #else