From patchwork Sat Dec 2 02:45:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 109 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director5.mail.ord1d.rsapps.net ([172.27.255.51]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id +8Q5DgKvIlq6FwAAgoeIoA for ; Sat, 02 Dec 2017 08:47:46 -0500 Received: from proxy15.mail.iad3a.rsapps.net ([172.27.255.51]) by director5.mail.ord1d.rsapps.net (Dovecot) with LMTP id /XoiBgKvIlqjDQAAsdCWiw ; Sat, 02 Dec 2017 08:47:46 -0500 Received: from smtp23.gate.iad3a ([172.27.255.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.iad3a.rsapps.net (Dovecot) with LMTP id mTY8BAKvIlpJRQAAHi9b9g ; Sat, 02 Dec 2017 08:47:46 -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.34.181.88] Authentication-Results: smtp23.gate.iad3a.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; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Classification-ID: 604dbd1c-d767-11e7-9c2d-bc305bf48fd8-1-1 Received: from [216.34.181.88] ([216.34.181.88:59999] helo=lists.sourceforge.net) by smtp23.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id FC/B0-31381-10FA22A5; Sat, 02 Dec 2017 08:47:45 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1eL883-0002bT-P7; Sat, 02 Dec 2017 13:46:51 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eL882-0002bJ-HA for openvpn-devel@lists.sourceforge.net; Sat, 02 Dec 2017 13:46:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sRhFrU4rHb75KDEZyiPz/DYBI7gX1btNawq/DqVeBh0=; b=f0lyHRouIyfTN/hdfaCEHj9EuM ORHSQz7/G7MKJxxFVggIVhLlJldV4FBivzeFG+4as5odyZiIXpmB98sg3n+zBsBp0U6RFtFhj8qeS 9H+noV1tizyGWkv9syIwLDiqkEX2qjJavggpsPzgrCLjpSm1HYoivVH1nL6LDcspcSYA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=sRhFrU4rHb75KDEZyiPz/DYBI7gX1btNawq/DqVeBh0=; b=EIE+RFuMJq5thUAad672XJ9/RF WCqucZ+EqxJEr4rwgMnsEPx5J4L1pKuZFAL6cPD7M59s+P6KH+ju8xDx+vPKwz8uOats+4l3bIE8v +TPvxoOE70Vuwo4jOBclGqRtcLV28+38bAyReIAoTeX9eo1EE5kZJkGIlQz85Lnkq9rI=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) id 1eL881-0005bX-LM for openvpn-devel@lists.sourceforge.net; Sat, 02 Dec 2017 13:46:50 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Sat, 2 Dec 2017 21:45:38 +0800 Message-Id: <20171202134541.7688-4-a@unstable.cc> In-Reply-To: <20171202134541.7688-1-a@unstable.cc> References: <20171202134541.7688-1-a@unstable.cc> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.org] -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1eL881-0005bX-LM Subject: [Openvpn-devel] [PATCH 4/7] Remove SSL_LIB_VER_STR 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: , Cc: Antonio Quartulli MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox SSL_LIB_VER_STR made sense only when ENABLE_CRYPTO also existed. It can now be removed and thus simplify the code. Signed-off-by: Antonio Quartulli Acked-by: Steffan Karger --- src/openvpn/options.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 9d9798f7..3f9ca710 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -4087,16 +4087,15 @@ show_windows_version(const unsigned int flags) void show_library_versions(const unsigned int flags) { -#define SSL_LIB_VER_STR get_ssl_library_version() #ifdef ENABLE_LZO #define LZO_LIB_VER_STR ", LZO ", lzo_version_string() #else #define LZO_LIB_VER_STR "", "" #endif - msg(flags, "library versions: %s%s%s", SSL_LIB_VER_STR, LZO_LIB_VER_STR); + msg(flags, "library versions: %s%s%s", get_ssl_library_version(), + LZO_LIB_VER_STR); -#undef SSL_LIB_VER_STR #undef LZO_LIB_VER_STR }