From patchwork Wed Feb 19 21:38:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1015 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id CNOYLPBFTl5OXQAAIUCqbw for ; Thu, 20 Feb 2020 03:40:16 -0500 Received: from proxy4.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id mIaMLPBFTl7sOwAAalYnBA ; Thu, 20 Feb 2020 03:40:16 -0500 Received: from smtp18.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1d.rsapps.net with LMTP id yDsvLPBFTl64UAAAiYrejw ; Thu, 20 Feb 2020 03:40:16 -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: smtp18.gate.ord1d.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: 9d43003c-53bc-11ea-b1e9-5254005167a7-1-1 Received: from [216.105.38.7] ([216.105.38.7:51632] helo=lists.sourceforge.net) by smtp18.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 13/35-11877-FE54E4E5; Thu, 20 Feb 2020 03:40:15 -0500 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1j4hMF-0007cb-VF; Thu, 20 Feb 2020 08:38:55 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1j4hM9-0007c6-RU for openvpn-devel@lists.sourceforge.net; Thu, 20 Feb 2020 08:38:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding: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=BoBv58CX5LwiAqzaX9KLTlE17N0oX3hmL+mbnfaz8JA=; b=bRh3CZOlQEgAUvl2ftJoM5FGPP AM9SanawVBJfmhPchXwzUghFYBOZMFm1kykox1MzQ7ih/2N2Z1zsWGqVdskz8T3x7iX5DNljAGJe5 761r4fGrKRbU+pJ30qdOdxrEaLZW8H9BGkMjUZJZzQd1lNEdQU9rhGY3clWCuKx7WAo8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding: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=BoBv58CX5LwiAqzaX9KLTlE17N0oX3hmL+mbnfaz8JA=; b=OSDqgNo9iaJmSgtpjOjQa1m+l5 SlPn4ZKnSb7jFNTnk+AUSuwMTBu905QDbXqTSlCkYxI1WuS8GloSi/8MgCAk5XKXTNZBRFzq1VUn1 i0n/7G0lfegEXLnjHzcnVGu+dZHE0W6mYkHqZ/6SBb+bSAqNM6uX6vW+G5LGyN+hC5UQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1j4hM0-000fAc-HS for openvpn-devel@lists.sourceforge.net; Thu, 20 Feb 2020 08:38:49 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.92.3 (FreeBSD)) (envelope-from ) id 1j4hLl-000Nsw-D9 for openvpn-devel@lists.sourceforge.net; Thu, 20 Feb 2020 09:38:25 +0100 Received: (nullmailer pid 29176 invoked by uid 10006); Thu, 20 Feb 2020 08:38:25 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 20 Feb 2020 09:38:25 +0100 Message-Id: <20200220083825.29131-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1j4hM0-000fAc-HS Subject: [Openvpn-devel] [PATCH] Fix float comparisons of OPENVPN_VERSION_NUMBER 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox These checks are probably the result of copying a check from the LibreSSL and modifying it to be a OpenSSL check. For some arcane reason LibreSSL decided that its version number should be a long float (double) rather than an integer. Signed-off-by: Arne Schwabe --- src/openvpn/ssl_openssl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 21651a3e..bcdfb543 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -231,7 +231,7 @@ tls_version_max(void) * We only need to check this for OpenSSL versions that can be * upgraded to 1.1.1 without recompile (>= 1.1.0) */ - if (OpenSSL_version_num() >= 0x1010100fL) + if (OpenSSL_version_num() >= 0x1010100L) { return TLS_VER_1_3; } @@ -2104,7 +2104,7 @@ show_available_tls_ciphers_list(const char *cipher_list, crypto_msg(M_FATAL, "Cannot create SSL object"); } -#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) \ +#if (OPENSSL_VERSION_NUMBER < 0x1010000L) \ || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER <= 0x2090000fL) STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); #else @@ -2134,7 +2134,7 @@ show_available_tls_ciphers_list(const char *cipher_list, printf("%s\n", pair->iana_name); } } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) +#if (OPENSSL_VERSION_NUMBER >= 0x1010000L) sk_SSL_CIPHER_free(sk); #endif SSL_free(ssl);