From patchwork Wed Feb 16 01:56:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2292 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.28.255.1]) by backend41.mail.ord1d.rsapps.net with LMTP id iAjBMNz0DGKGLQAAqwncew (envelope-from ) for ; Wed, 16 Feb 2022 07:58:04 -0500 Received: from proxy5.mail.ord1c.rsapps.net ([172.28.255.1]) by director13.mail.ord1d.rsapps.net with LMTP id WG1RDN30DGKpRQAA91zNiA (envelope-from ) for ; Wed, 16 Feb 2022 07:58:05 -0500 Received: from smtp17.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1c.rsapps.net with LMTPS id sHQBDN30DGKpBAAAPBRIyg (envelope-from ) for ; Wed, 16 Feb 2022 07:58:05 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp17.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 14305bc4-8f28-11ec-b257-bc305beffb0c-1-1 Received: from [216.105.38.7] ([216.105.38.7:56800] helo=lists.sourceforge.net) by smtp17.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id AE/8E-23559-CD4FC026; Wed, 16 Feb 2022 07:58:04 -0500 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nKJrv-0004ZG-Ko; Wed, 16 Feb 2022 12:57:14 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nKJru-0004Yy-1A for openvpn-devel@lists.sourceforge.net; Wed, 16 Feb 2022 12:57:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jXtovL/1moL/vgeWF4DUDIWvdekmz0Kt6uZWi1jl5fg=; b=apK1XHqVeTNa/bpWj9t33V83Bl E3+D5yR7kdDrHFgYvNdkvginTiFTux/3jhNw3655ITV2YUvn0pE/gzCB5ymGTz+BzzPYr91ZKZnCA 4lApFbfHU/1k2z78368c+bHu0co5VCg6838WC0nYVzaolFN9TB64zKwJz4R2YvSwFSTo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=jXtovL/1moL/vgeWF4DUDIWvdekmz0Kt6uZWi1jl5fg=; b=R v5D+Y8Hh3h4Jo+j0CCasSt/9kHdnF7qg5jeM8fWjHKkf0byA8/i4r6s37jzWmtuVTHIbQWsa3vpNV Msi7fn36zZzrt51Nu6QMcRmtfnckgwc/elT4QkgzbYjbSfxkEUAI40n7JP3pW6EQJMBix3VbUQ3K/ jcEeG52YNlxEMVEk=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nKJrn-003kqR-EH for openvpn-devel@lists.sourceforge.net; Wed, 16 Feb 2022 12:57:12 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1nKJra-000A6X-2F for openvpn-devel@lists.sourceforge.net; Wed, 16 Feb 2022 13:56:54 +0100 Received: (nullmailer pid 4080993 invoked by uid 10006); Wed, 16 Feb 2022 12:56:53 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 16 Feb 2022 13:56:53 +0100 Message-Id: <20220216125653.4080943-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: We unconditionally include openssl/opensslv.h which fails if OpenSSL header are not available. Signed-off-by: Arne Schwabe --- src/openvpn/xkey_common.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1nKJrn-003kqR-EH Subject: [Openvpn-devel] [PATCH] Fix mbed TLS compile if OpenSSL headers are not available X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox We unconditionally include openssl/opensslv.h which fails if OpenSSL header are not available. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/xkey_common.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openvpn/xkey_common.h b/src/openvpn/xkey_common.h index e58748b4..67c888be 100644 --- a/src/openvpn/xkey_common.h +++ b/src/openvpn/xkey_common.h @@ -25,11 +25,14 @@ #ifndef XKEY_COMMON_H_ #define XKEY_COMMON_H_ +/* Guard to only enable if OpenSSL is used and not trigger an error if mbed + * TLS is compiled without OpenSSL being installed */ +#if defined(ENABLE_CRYPTO_OPENSSL) #include #if OPENSSL_VERSION_NUMBER >= 0x30000010L && !defined(DISABLE_XKEY_PROVIDER) #define HAVE_XKEY_PROVIDER 1 #include -#include +#include /** * Initialization function for OpenVPN external key provider for OpenSSL @@ -169,4 +172,6 @@ xkey_max_saltlen(int modBits, int hLen) } #endif /* HAVE_XKEY_PROVIDER */ +#endif /* ENABLE_CRYPTO_OPENSSL */ + #endif /* XKEY_COMMON_H_ */