From patchwork Sun Oct 29 04:34:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 38 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director1.mail.ord1d.rsapps.net ([172.28.255.1]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id 6098BT/19VmKKgAAgoeIoA for ; Sun, 29 Oct 2017 11:35:27 -0400 Received: from director4.mail.ord1c.rsapps.net ([172.28.255.1]) by director1.mail.ord1d.rsapps.net (Dovecot) with LMTP id YV82Az/19VmVUQAANGzteQ ; Sun, 29 Oct 2017 11:35:27 -0400 Received: from smtp38.gate.ord1a ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director4.mail.ord1c.rsapps.net (Dovecot) with LMTP id YjPIAz/19VklPgAAsEL7Xg ; Sun, 29 Oct 2017 11:35:27 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1064-1276-w 0-298-1064-1640-w 0-298-0-8871-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=de/C5jfe c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=bLk-5xynAAAA:8 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=25X3OO5E2RtFR1QocKgA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=zSyb8xVVt2t83sZkrLMb:22 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp38.gate.ord1a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=hansenpartnership.com; dmarc=fail (p=none; dis=none) header.from=hansenpartnership.com X-Classification-ID: c94bfeb4-bcbe-11e7-898c-002219028271-1-1 Received: from [216.34.181.88] ([216.34.181.88:10868] helo=lists.sourceforge.net) by smtp38.gate.ord1a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 87/BB-09157-E35F5F95; Sun, 29 Oct 2017 11:35:26 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e8pc6-0007qk-08; Sun, 29 Oct 2017 15:35:02 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e8pc5-0007qG-9I for openvpn-devel@lists.sourceforge.net; Sun, 29 Oct 2017 15:35:01 +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:Content-Type:Date:To:From:Subject:Message-ID; bh=zmdq5+pUg8phnSv7bymPdGhqNv9u2c6w9T0HLG1WXZ8=; b=FLeLsXis3jNSHW4oeUbUvvj/pH8o2m+JQcYtXcVxMAuNULC6eQB5kNWUgLpfB0r+LZVoPcgtfOf62lZCMvFgk4r6BcvcUk/cL07j4bzOJGwu+EfVSZkfgZWkwWzn6k5o2iVI5o+6LtsjJgVR9se82jwgSD9NZ7pxDFIngzAGxhc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Content-Transfer-Encoding:Mime-Version:Content-Type:Date:To:From:Subject:Message-ID; bh=zmdq5+pUg8phnSv7bymPdGhqNv9u2c6w9T0HLG1WXZ8=; b=czylHEUjKa/dMldcqf7XuFOvETcLMFxQ17zN1945kpYakC1JjPGtvM3vlqIkG69zPrTBSrfiHfBkms0EvK2SmZ6eJeE67Xg91zeMw5Qb1cE1oDQD1cosBHj9efblUm2tIAle/ad0unhGpbVmqmr+8Hs4oNVM4zyuqfz48OkCHHI=; Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of HansenPartnership.com designates 66.63.167.143 as permitted sender) client-ip=66.63.167.143; envelope-from=James.Bottomley@HansenPartnership.com; helo=bedivere.hansenpartnership.com; Received: from bedivere.hansenpartnership.com ([66.63.167.143]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e8pc3-0002PJ-44 for openvpn-devel@lists.sourceforge.net; Sun, 29 Oct 2017 15:35:01 +0000 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 0EEDA8EE0DC for ; Sun, 29 Oct 2017 08:34:53 -0700 (PDT) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RCAlHqVE8YJn for ; Sun, 29 Oct 2017 08:34:52 -0700 (PDT) Received: from [192.168.1.74] (host86-167-222-165.range86-167.btcentralplus.com [86.167.222.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id E00D08EE07E for ; Sun, 29 Oct 2017 08:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=hansenpartnership.com; s=20151216; t=1509291292; bh=0HBpqtJ2ZIB6tiYDGiv2Q8Rm45+h7itdHq92tCcMnck=; h=Subject:From:To:Date:From; b=l9/Ynn/gvFF50mt2iO4XerJrCSczf42o53O0JJtCIxkI1p10RgINQQleaLcIGHcrf 4JYjPQ9oDuhNDttPjMMfLPAmrd/Tey/Ug0X8az2H/8f9MTtIcdl7sen7O8E9wAGEdG 23yXe1jfiT0foM7ES/B+Tl4DaOcU/b52H3tJkJOA= Message-ID: <1509291288.3116.14.camel@HansenPartnership.com> From: James Bottomley To: openvpn-devel@lists.sourceforge.net Date: Sun, 29 Oct 2017 15:34:48 +0000 X-Mailer: Evolution 3.20.5 Mime-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e8pc3-0002PJ-44 Subject: [Openvpn-devel] [PATCH] autoconf: Fix engine checks for openssl 1.1 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 In openssl 1.1, ENGINE_cleanup became a #define instead of a function (because it's no longer needed as engines are self cleaning). Update the autoconf.ac script to check for ENGINE_cleanup as a declaration to avoid falsely underfinig HAVE_OPENSSL_ENGINE in openssl 1.1+ Signed-off-by: James Bottomley --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 6f59baef..45aa5017 100644 --- a/configure.ac +++ b/configure.ac @@ -899,6 +899,13 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then , [have_openssl_engine="no"; break] ) + if test "${have_openssl_engine}" = "no"; then + AC_CHECK_DECL( [ENGINE_cleanup], [have_openssl_engine="yes"],, + [[ + #include + ]] + ) + fi if test "${have_openssl_engine}" = "yes"; then AC_DEFINE([HAVE_OPENSSL_ENGINE], [1], [OpenSSL engine support available]) fi