From patchwork Thu Jun 21 16:15:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 378 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id XnbWAOdbLFusIgAAIUCqbw for ; Thu, 21 Jun 2018 22:16:07 -0400 Received: from director9.mail.ord1c.rsapps.net ([172.28.255.1]) by director7.mail.ord1d.rsapps.net (Dovecot) with LMTP id 0VTED+dbLFvmegAAovjBpQ ; Thu, 21 Jun 2018 22:16:07 -0400 Received: from smtp36.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director9.mail.ord1c.rsapps.net with LMTP id ONP2KudbLFvlewAA4V03VA ; Thu, 21 Jun 2018 22:16:07 -0400 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: smtp36.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 37b4ed9a-75c2-11e8-aebd-5452006630bd-1-1 Received: from [216.105.38.7] ([216.105.38.7:28246] helo=lists.sourceforge.net) by smtp36.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 14/95-20087-6EB5C2B5; Thu, 21 Jun 2018 22:16:06 -0400 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.90_1) (envelope-from ) id 1fWBbU-00032d-Ia; Fri, 22 Jun 2018 02:15:12 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fWBbS-00032X-JS for openvpn-devel@lists.sourceforge.net; Fri, 22 Jun 2018 02:15:10 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vMDD9WeQ5pNWY8hG5wNcjaRhNNPp0o8+GY2LeFpw8Nk=; b=OONUsPnTyNG8PYfZCX+FgHDKz7 gmUA7qxayfFmR33d2kyDDRPmD3COq7J/ZWzN+523X0ak+g8zwYJMyPkqH/AoVC/bP6J5PBsokE1Gp EL9mqQgIteN3aOsgVQpg+ocNcdVqdCxwJRdUzhGe85lNGuV58bq8heduYd7SeE5CDqGY=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vMDD9WeQ5pNWY8hG5wNcjaRhNNPp0o8+GY2LeFpw8Nk=; b=ezRUnRuZpdLgyugJEbO/sX1NTX KEs5Mens+ERaTLWJ29KnA1SdOLkeh6zNhhm7TCJ64Dt6nyuiu/1TUavbqYYDztTvfAOeuKTQPI7m1 pTNelimU4vsiQa5B1Fd9hkceYlXg4+sISVAfJ2Vd1SPQMqL1LJboej5rN3MgCXN6ME6k=; Received: from mail-pf0-f174.google.com ([209.85.192.174]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1fWBbQ-005cta-NT for openvpn-devel@lists.sourceforge.net; Fri, 22 Jun 2018 02:15:10 +0000 Received: by mail-pf0-f174.google.com with SMTP id a12-v6so2437122pfi.3 for ; Thu, 21 Jun 2018 19:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=vMDD9WeQ5pNWY8hG5wNcjaRhNNPp0o8+GY2LeFpw8Nk=; b=tfhXiVx4W99Ru1nQ1Ksjpa3xEADUetkUFjnI6yIpZxPKL1Vc+ZM6QYTW6+KNQ2v2F3 Pcdn42avl29MDzXZc3oNXLrCVo5AKv2MScDh+2zdT5L7GCMchYFXGi740hY8DgHGuIVp AMnncqDM9Ny1ACRrVcDTCaBcl6e9gsme6bUKM8hSK0UXG2kRIfUUcwzIi710w7O03Fwd XJXvCoaRANQKuS6HUXJCGxgp/DExc9b4bIotj5n4cwoVCQQs08M22CqMKXE9+tASUPMQ De6X1hK90+s1KHH04O42hEgHF5j0hpNMna9Z74CmWzVLCIRpfiFXL60erfy0VPTMjSbH EKiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vMDD9WeQ5pNWY8hG5wNcjaRhNNPp0o8+GY2LeFpw8Nk=; b=qBK5LFOvk+NBZvrp1dwJZGYuJt/dZOp8s2n9u7Rktg8bATlnK2vYq35TiLXdI8ZYau U+6/fsLlFcxWShMafvl2swrmHwIAzVdWy6QPv2BtZfpy1PnmkJRUxG6dcLbAOHdaXCb4 Ji4csRXoqrJMO3l2j+MA6Ho8S9GT9xuUh7NNDJe4djzhMVPlAiGaXoC/NIV0w8Ls0hgh I7nN3Zc2d6Zt2wZ8nCIfVCvl9Qg4dIkF+IX7Bm3JsGNhThxs//ebhOxLa+37vB7huD7O CwfdXysBMUJuVVGXPym/JqWnNSljTzKZAKbQe1VI0RIWB8Zwd6otbOvc0cITVE1ir0NZ Rgnw== X-Gm-Message-State: APt69E1YsUnYhSNpL0QLozPqG2hZS4hd5aHtPZ9ISd3ihQ8daWrZ+iSw vj0a3+prDjrqzqRKTBb6jweol2xY X-Google-Smtp-Source: ADUXVKKSXsKpGvymYg6jXSi9YM4EJnJtTUKZBmeTbzK4PsYj6oV3vOukxqtUFzG//zRQXl3K+I8ynw== X-Received: by 2002:a62:21d1:: with SMTP id o78-v6mr29486322pfj.11.1529633702759; Thu, 21 Jun 2018 19:15:02 -0700 (PDT) Received: from clevo-mangix.lan (astound-69-42-1-138.ca.astound.net. [69.42.1.138]) by smtp.gmail.com with ESMTPSA id f3-v6sm9598061pfn.149.2018.06.21.19.15.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Jun 2018 19:15:02 -0700 (PDT) From: Rosen Penev To: openvpn-devel@lists.sourceforge.net Date: Thu, 21 Jun 2018 19:15:01 -0700 Message-Id: <20180622021501.23037-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622014905.21558-1-rosenp@gmail.com> References: <20180622014905.21558-1-rosenp@gmail.com> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.174 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -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: 1fWBbQ-005cta-NT Subject: [Openvpn-devel] [PATCHv2] openvpn: Add missing OpenSSL includes 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 get included when deprecated APIs are enabled. This is true on at least version 1.0.2 and 1.1.0. Without deprecated APIs, OpenVPN fails to compile. Signed-off-by: Rosen Penev --- src/openvpn/ssl_openssl.c | 9 +++++++++ src/openvpn/ssl_verify_openssl.c | 1 + 2 files changed, 10 insertions(+) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 527a600a..d9aec9bd 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -56,6 +56,15 @@ #include #include #include +#ifndef OPENSSL_NO_DH +#include +#endif +#ifndef OPENSSL_NO_DSA +#include +#endif +#ifndef OPENSSL_NO_RSA +#include +#endif #ifndef OPENSSL_NO_EC #include #endif diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c index 9b984751..82460ae7 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -46,6 +46,7 @@ #include #include +#include int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)