From patchwork Thu Mar 1 00:14:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Matter X-Patchwork-Id: 256 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.1]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id RJzxG8vgl1pnDAAAIUCqbw for ; Thu, 01 Mar 2018 06:15:23 -0500 Received: from proxy2.mail.iad3a.rsapps.net ([172.27.255.1]) by director9.mail.ord1d.rsapps.net (Dovecot) with LMTP id PVSzB8vgl1p0SwAAalYnBA ; Thu, 01 Mar 2018 06:15:23 -0500 Received: from smtp8.gate.iad3a ([172.27.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3a.rsapps.net with LMTP id 6P+2Lsvgl1rnHQAABcWvHw ; Thu, 01 Mar 2018 06:15:23 -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: smtp8.gate.iad3a.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=invoca.ch X-Classification-ID: d4da1796-1d41-11e8-9d49-525400b8fe03-1-1 Received: from [216.105.38.7] ([216.105.38.7:57272] helo=lists.sourceforge.net) by smtp8.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 EA/A3-21054-AC0E79A5; Thu, 01 Mar 2018 06:15:22 -0500 Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1erMAE-0009nR-2Y; Thu, 01 Mar 2018 11:14:18 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1erMAC-0009nL-BU for openvpn-devel@lists.sourceforge.net; Thu, 01 Mar 2018 11:14:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:To:From:Subject:Date: Message-ID:Sender:Reply-To:Cc: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=dpr5rJ0FwJaxv0brmOqelNHINEqd6DxSYtcKIR+3+h4=; b=WCVu34kkEukQSXYSQoFKStTRn/ RhLUVrspWhwfq4qfLBOG3AJz41Ozi8oeK4Xt+PthCbgzM6qOuUAmp4rF7sFSps4KjZcUlQIP0G6BY wKLTBMHasmMMUf6wQc7COcyihyV1j1XWMZZwNFS4uA7SjM5KoMCQMhk7cyy4If5ec3Ss=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:To:From:Subject:Date:Message-ID:Sender:Reply-To :Cc: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=dpr5rJ0FwJaxv0brmOqelNHINEqd6DxSYtcKIR+3+h4=; b=m Iss27S9kTi4t8njJu5TJrYAAJKR/Pav3OUfbCnN+h/659EIBZIn8crdlp0gKqGtyk37IEX7G3Z8Ra 6UD+c3qH6J15Xs6Ub0xPEzBr4SPb+EEN+UY/dNd4tPPixWzAifeCya9Pj5dNgtH03d0bgXGqKBvwl RgjJZkSCDPRmpclQ=; Received: from sfi-lb-mx.v20.lw.sourceforge.com ([172.30.20.201] helo=ns1.invoca.ch) by sfi-mx-1.v28.lw.sourceforge.com with esmtp (Exim 4.89) id 1erMA8-000Kz3-Br for openvpn-devel@lists.sourceforge.net; Thu, 01 Mar 2018 11:14:16 +0000 Received: from xxl.bi.corp.invoca.ch (pub151248199126.dh-hfc.datazug.ch [151.248.199.126]) by ns1.invoca.ch (Postfix) with ESMTP id BB6D53CF5 for ; Thu, 1 Mar 2018 12:14:06 +0100 (CET) Received: from webmail.bi.invoca.ch (localhost [127.0.0.1]) by xxl.bi.corp.invoca.ch (Postfix) with ESMTP id 6085542CEF for ; Thu, 1 Mar 2018 12:14:06 +0100 (CET) Received: from 157.161.91.32 (SquirrelMail authenticated user simix) by webmail.bi.invoca.ch with HTTP; Thu, 1 Mar 2018 12:14:06 +0100 Message-ID: <52e860ea74ac958309368374049f14bd.squirrel@webmail.bi.invoca.ch> Date: Thu, 1 Mar 2018 12:14:06 +0100 From: "Simon Matter" To: openvpn-devel@lists.sourceforge.net User-Agent: SquirrelMail/1.4.22 MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 1.3 RCVD_IN_RP_RNBL RBL: Relay in RNBL, https://senderscore.org/blacklistlookup/ [151.248.199.126 listed in bl.score.senderscore.com] 3.6 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [151.248.199.126 listed in zen.spamhaus.org] X-Headers-End: 1erMA8-000Kz3-Br Subject: [Openvpn-devel] tls fix for upcoming 2.4.5 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 Hi, I've just done some test builds with 2.4.5 tagged version. Attached patch makes it build with older systems. Do you see any issue with the change? Regards, Simon ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot Acked-by: Selva Nair --- openvpn-2.4.5/src/openvpn/openssl_compat.h.orig 2018-02-28 21:56:54.000000000 +0100 +++ openvpn-2.4.5/src/openvpn/openssl_compat.h 2018-03-01 11:44:57.000000000 +0100 @@ -672,14 +672,18 @@ { return TLS1_VERSION; } +#ifdef SSL_OP_NO_TLSv1_1 if (!(sslopt & SSL_OP_NO_TLSv1_1)) { return TLS1_1_VERSION; } +#endif +#ifdef SSL_OP_NO_TLSv1_2 if (!(sslopt & SSL_OP_NO_TLSv1_2)) { return TLS1_2_VERSION; } +#endif return 0; } #endif /* SSL_CTX_get_min_proto_version */