From patchwork Sun Nov 26 04:49:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 100 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director5.mail.ord1d.rsapps.net ([172.28.255.1]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id K6UHF6niGloHXwAAgoeIoA for ; Sun, 26 Nov 2017 10:50:01 -0500 Received: from director5.mail.ord1c.rsapps.net ([172.28.255.1]) by director5.mail.ord1d.rsapps.net (Dovecot) with LMTP id MwkFF6niGlqRGQAAsdCWiw ; Sun, 26 Nov 2017 10:50:01 -0500 Received: from smtp32.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director5.mail.ord1c.rsapps.net (Dovecot) with LMTP id qBteFaniGloWOgAAH8LYwg ; Sun, 26 Nov 2017 10:50:01 -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: smtp32.gate.ord1c.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=karger-me.20150623.gappssmtp.com; dmarc=none (p=nil; dis=none) header.from=karger.me X-Classification-ID: 75b2e790-d2c1-11e7-9c42-842b2b572c6a-1-1 Received: from [216.34.181.88] ([216.34.181.88:23265] helo=lists.sourceforge.net) by smtp32.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 B3/ED-14149-8A2EA1A5; Sun, 26 Nov 2017 10:50:00 -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 1eIzBN-0005YT-NE; Sun, 26 Nov 2017 15:49:25 +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 1eIzBM-0005YN-Go for openvpn-devel@lists.sourceforge.net; Sun, 26 Nov 2017 15:49:24 +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=hZCB+f+jDeZZsM7KRimCLlO/iT657d1lUO8bDfHZtvA=; b=XiktOrksMQiIRwG6VG02JZB39n vMsivoRTVpzq1aMCHPjoe477cYAIfIjTE1gOo8e256WMZFnpmdhrMuouSZR6eEcjObGFXXDiUudoI MgubWJtJwmi6u9Hg8hLklh5YyKiMTN77F3jG27RRBOX2+ABM9/xLJj5AD3JwfpJna1kE=; 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=hZCB+f+jDeZZsM7KRimCLlO/iT657d1lUO8bDfHZtvA=; b=KHAMTTBNbUNSbc9RW0w0iSo7oA ctzkcyCTPo4ow6Bss3UmCoe0Ry1/CfOMYcn+QNZQeGC9Ik3RkFpQqWKklZsSlD9mgaFI4gQafcl9U exJG5NRupCCCz6DcHYz4aKkpElA4p8w3KBzPqBgzqnwRVcYayUicSovtEeSRu3gGsPqo=; Received: from mail-wm0-f66.google.com ([74.125.82.66]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1eIzBL-0003Tf-0S for openvpn-devel@lists.sourceforge.net; Sun, 26 Nov 2017 15:49:24 +0000 Received: by mail-wm0-f66.google.com with SMTP id r68so29907537wmr.3 for ; Sun, 26 Nov 2017 07:49:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hZCB+f+jDeZZsM7KRimCLlO/iT657d1lUO8bDfHZtvA=; b=pmwc5qwv14PllAFH1OYi6hzujrqdD9nXPCDHHQcly3fvmyJ14MRbaDdyMGb5L12GFt h2PM4g0cMmgYV+/fhhQQxZ3B7yJL0lVtE0pIJum6MsiW9Wda0Ci6Pxh59AqV/98NUwco IU2oDn/Mwz4I684Jvd3kDQEizm4pdWC+KWdkN/32wi89VihrgULh5sHr8ZQXci8DCxRs DQ4YGBcES92NeIe880+dlChr8B1uZEgNeU8F53ubQMh0IUhLnh3Rhd8V/6gflLF8eh3U bbGcXw+cvKhj6A4+DODn1Kr/ULUq2gOa3PenRHIE/Uq4Hv968jLrkcjw/i3BwYyhrHJ1 rnkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hZCB+f+jDeZZsM7KRimCLlO/iT657d1lUO8bDfHZtvA=; b=qSvXiMek/UQ8ewz+Jaabd59F29ckUKdN7AV3KD7FS+hhoc3n3aE4im5ziiUSkf7ZZ7 da3EisVjuy5zoOvfVifyrSZ9x4Ho7fmf1O3uId2Us7rfi3f61eJ1SBFqtDjcknjK7tEi vQpE9PfYngxp3zFTkn+AWfUw6PvIRujxNXzmWAn9e5n8L/p9TnZWF00fQK1jOwZYJv8I mgOqPVK7AVQVtPcMzWq/t9N9lLuDflivSwwkQVEPF9zkHZi/A2hDxrtj+KuJNvaUqFLO gSTVfzSRzE3xRFjkLEwe8Tla+D7f5GS0YtgUvmxxZmLMnj9Nl4Mo+j3rRuGPSf6FKi+2 LK2g== X-Gm-Message-State: AJaThX5D3/hecSXX5P+vpXkCEan1ykL0Xa/BOyk6/oCxyc9w0Eb55Fsg NcTAiBLKV3PWOVmL/UQHCoDhh+w+obw= X-Google-Smtp-Source: AGs4zMYQ2XvXTAgXhAn0+wxttQyc5AyhRoS/KT1bB1Qs0lPqcWUDTcPoCxOF4GhhSW/dnqFJyW80pA== X-Received: by 10.80.165.41 with SMTP id y38mr23349196edb.72.1511711356766; Sun, 26 Nov 2017 07:49:16 -0800 (PST) Received: from vesta.fritz.box ([2001:985:e54:1:d42a:81d4:ce94:db48]) by smtp.gmail.com with ESMTPSA id j39sm16377142ede.38.2017.11.26.07.49.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 07:49:15 -0800 (PST) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Sun, 26 Nov 2017 16:49:12 +0100 Message-Id: <20171126154912.13283-1-steffan@karger.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171126150401.28565-2-steffan@karger.me> References: <20171126150401.28565-2-steffan@karger.me> 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 [74.125.82.66 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 X-Headers-End: 1eIzBL-0003Tf-0S Subject: [Openvpn-devel] [PATCH 2/2 v2] openssl: add missing #include statements 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 Compiling our current master against OpenSSL 1.1 with -DOPENSSL_API_COMPAT=0x10100000L screams bloody murder. This patch fixes the errors caused by missing includes. Previous openssl versions would usually include 'the rest of the world', but they're fixing that. So we should no longer rely on it. (And sneaking in alphabetic ordering of the includes while touching them.) Signed-off-by: Steffan Karger Acked-by: Gert Doering --- v2: rsaerr.h only exists in openssl's master branch, use rsa.h instead. src/openvpn/openssl_compat.h | 1 + src/openvpn/ssl_openssl.c | 6 +++++- src/openvpn/ssl_verify_openssl.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index 9eb427da..6c2b9904 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -42,6 +42,7 @@ #include "buffer.h" +#include #include #include diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 18ceecb4..79121049 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -52,10 +52,14 @@ #include "ssl_verify_openssl.h" +#include +#include +#include +#include #include #include +#include #include -#include #ifndef OPENSSL_NO_EC #include #endif diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c index 2f3b10b9..4a1d1cf8 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -44,8 +44,9 @@ #include "ssl_verify_backend.h" #include "openssl_compat.h" -#include +#include #include +#include int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)