From patchwork Fri Aug 21 10:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yang Xu X-Patchwork-Id: 1349013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BXyCN3VPHz9sPB for ; Fri, 21 Aug 2020 20:18:23 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 168E43C2F83 for ; Fri, 21 Aug 2020 12:18:20 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id 2BDC43C12A1 for ; Fri, 21 Aug 2020 12:18:17 +0200 (CEST) Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by in-5.smtp.seeweb.it (Postfix) with ESMTP id 2A18C6007A3 for ; Fri, 21 Aug 2020 12:18:08 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.76,335,1592841600"; d="scan'208";a="98387573" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 21 Aug 2020 18:18:07 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 691AB48990CB for ; Fri, 21 Aug 2020 18:18:02 +0800 (CST) Received: from localhost.localdomain (10.167.220.84) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 21 Aug 2020 18:18:03 +0800 From: Yang Xu To: Date: Fri, 21 Aug 2020 18:18:39 +0800 Message-ID: <1598005119-2147-1-git-send-email-xuyang2018.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.220.84] X-ClientProxiedBy: G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) To G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) X-yoursite-MailScanner-ID: 691AB48990CB.AC298 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xuyang2018.jy@cn.fujitsu.com X-Spam-Status: No, score=0.4 required=7.0 tests=KHOP_HELO_FCRDNS, SPF_HELO_NONE, SPF_NONE autolearn=disabled version=3.4.4 X-Virus-Scanned: clamav-milter 0.102.4 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH] tst_af_alg: fix build error when ALG_SET_AEAD_ASSOCLEN undefined X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" On older kernel such as 3.10.0-1136.el7.x86_64, compile failed as below: tst_af_alg.c: In function ‘tst_alg_sendmsg’: tst_af_alg.c:205:21: error: ‘ALG_SET_AEAD_ASSOCLEN’ undeclared (first use in this function) cmsg->cmsg_type = ALG_SET_AEAD_ASSOCLEN; ^ tst_af_alg.c:205:21: note: each undeclared identifier is reported only once for each function it appears in make: *** [tst_af_alg.o] Error 1 It compile failed because ltp lapi/if_alg.h can't handle fallback logic, so corret it. The ALG_SET_AEAD_ASSOCLEN flag was introduced since kernel commit af8e80731a ("crypto: af_alg - add user space interface for AEAD") in 2014. Fixes: 3cbb963abb ("lib/tst_af_alg: add tst_alg_sendmsg()") Signed-off-by: Yang Xu Reviewed-by: Petr Vorel --- configure.ac | 6 ++++++ include/lapi/if_alg.h | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 382963d8b..f711ac123 100644 --- a/configure.ac +++ b/configure.ac @@ -193,6 +193,12 @@ AC_CHECK_TYPES([struct xt_entry_match, struct xt_entry_target],,,[ #include ]) +AC_CHECK_TYPES([struct sockaddr_alg, struct af_alg_iv],,,[ +#ifdef HAVE_LINUX_IF_ALG_H +# include +#endif +]) + # Tools knobs # Expect diff --git a/include/lapi/if_alg.h b/include/lapi/if_alg.h index 5a74df99b..9c04a444c 100644 --- a/include/lapi/if_alg.h +++ b/include/lapi/if_alg.h @@ -8,9 +8,10 @@ #ifdef HAVE_LINUX_IF_ALG_H # include -#else +#endif # include +#ifndef HAVE_STRUCT_SOCKADDR_ALG struct sockaddr_alg { uint16_t salg_family; uint8_t salg_type[14]; @@ -18,21 +19,41 @@ struct sockaddr_alg { uint32_t salg_mask; uint8_t salg_name[64]; }; +#endif +#ifndef HAVE_STRUCT_AF_ALG_IV struct af_alg_iv { uint32_t ivlen; uint8_t iv[0]; }; +#endif -#define ALG_SET_KEY 1 -#define ALG_SET_IV 2 -#define ALG_SET_OP 3 -#define ALG_SET_AEAD_ASSOCLEN 4 -#define ALG_SET_AEAD_AUTHSIZE 5 +#ifndef ALG_SET_KEY +# define ALG_SET_KEY 1 +#endif -#define ALG_OP_DECRYPT 0 -#define ALG_OP_ENCRYPT 1 +#ifndef ALG_SET_IV +# define ALG_SET_IV 2 +#endif -#endif /* !HAVE_LINUX_IF_ALG_H */ +#ifndef ALG_SET_OP +# define ALG_SET_OP 3 +#endif + +#ifndef ALG_SET_AEAD_ASSOCLEN +# define ALG_SET_AEAD_ASSOCLEN 4 +#endif + +#ifndef ALG_SET_AEAD_AUTHSIZE +# define ALG_SET_AEAD_AUTHSIZE 5 +#endif + +#ifndef ALG_OP_DECRYPT +# define ALG_OP_DECRYPT 0 +#endif + +#ifndef ALG_OP_ENCRYPT +# define ALG_OP_ENCRYPT 1 +#endif #endif /* IF_ALG_H__ */