From patchwork Sun Nov 26 04:04:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 99 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director5.mail.ord1d.rsapps.net ([172.30.191.6]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id kwY0NSnYGlrcdAAAgoeIoA for ; Sun, 26 Nov 2017 10:05:13 -0500 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director5.mail.ord1d.rsapps.net (Dovecot) with LMTP id cahGCynYGlpGGAAAsdCWiw ; Sun, 26 Nov 2017 10:05:13 -0500 Received: from smtp18.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net (Dovecot) with LMTP id 1CVyASnYGlohbAAA8Zzt7w ; Sun, 26 Nov 2017 10:05:13 -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: smtp18.gate.ord1d.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: 344a2bc0-d2bb-11e7-87ad-5254005167a7-1-1 Received: from [216.34.181.88] ([216.34.181.88:1842] helo=lists.sourceforge.net) by smtp18.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 2A/46-03993-928DA1A5; Sun, 26 Nov 2017 10:05:13 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1eIyTj-0007hM-OX; Sun, 26 Nov 2017 15:04:19 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eIyTh-0007hG-N2 for openvpn-devel@lists.sourceforge.net; Sun, 26 Nov 2017 15:04:17 +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=evjwnCk/KIoNuQjgc2qFpQ1ZPGyeIPGdKaeoZ7B9s/Q=; b=H9nOdK6Gu1C1kpPKpSW/9XeiXN rRf2l0Bi7hjp9OOZB1Q+7ib5lOvVUMJ/LgqLHW0SW2OlJbOMS+8E3eaJ7J74uNxAEjd3V1JMPmeuE eKX+wCY6jmSBtXXD9dJKzTPAcZHV0hgWwldR9VGrcEi7iaGr3HYtcTfBKQlHZOWuiSYk=; 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=evjwnCk/KIoNuQjgc2qFpQ1ZPGyeIPGdKaeoZ7B9s/Q=; b=KvmaGvMt43Rw3ZthsUZBw2maO4 9JmQfdFXg6sZpEoa0gS3YMICG8qkruizrwiB/ZLl+W1/w6/ksktyGJ5exRmtgweAoVzlp7LUTIpnN xmilN5a9Ap76BN7WeDXpJQFmLjB8HJ89kQ7GukODqYfp/ABISnhdoT1LCWp0Z2Y/Dz0k=; Received: from mail-wm0-f65.google.com ([74.125.82.65]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1eIyTg-0000zB-UU for openvpn-devel@lists.sourceforge.net; Sun, 26 Nov 2017 15:04:17 +0000 Received: by mail-wm0-f65.google.com with SMTP id x63so30096872wmf.4 for ; Sun, 26 Nov 2017 07:04:16 -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=evjwnCk/KIoNuQjgc2qFpQ1ZPGyeIPGdKaeoZ7B9s/Q=; b=ricHMCbl5iIHj4wtyF+OthbI+eSBV++sx7WKKFzFNkD0/bAc/QeoHrYd5lh3SBKcZn ymaN/HyO0lZ2xsTbWD++0kHad9eAuBz+4osIcttW6lxSGGdORbjIOrxVDArnWi1yWbe0 uGdB61coJ1y23XHlsUmOfXYi8OVOiqteTC4Vg38G5S+I6dFlIxaVD+SvNLYyqKbFExdJ xEJxm6x2SNn9XmlQRVuNcP9SYMSK2x2k/c+MFtqZSJ05lr+97MccBw4E97hC4rD6bPYC xchcyjp0Fq5x4yt2hZtl9kzR5QG/5DYdWWrQCOlVTmG5AiZpkJaX2dXrf8VUJlylowLJ 2p3w== 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=evjwnCk/KIoNuQjgc2qFpQ1ZPGyeIPGdKaeoZ7B9s/Q=; b=pWbsfdbbxz77XK1cjenS34RwtIROa6MxMJQK/TbXw1yKCrnFyBRQGwcLEYpcQm5WGV 5eq8Mmb+BGMlfHMfZo3Xlf9rgeuohRC71T8SumWz6cyA5SMhA+GvB4sXeS6Ix7hIMGQ0 00IPs5t3USMdeNHKOA2mXfP59qDA6T69Bpi2JS92TiFWUpo2ZEEuoVV4Cgd8+NYnLcTI 3DwbX1kLLOsdHKizOj97h48HVUE2YJgJsdemfxS3ELakVLnmYplkfnWshUErLvAZzp3z A6ocJAeGoP3kIH1m8/DDiJ5QRrW2b8lxLc0rHzZoAxB4/WPIICENWR86Mhl+8Xf9vYkY yikQ== X-Gm-Message-State: AJaThX401vmc8ZbKvvE9HHtLuUwvApXOSLjv1IdT01i2x9i6hFHw+vsj 4ByUYAoR5WieHAK/zt5sVtzbZbome6w= X-Google-Smtp-Source: AGs4zMZSP7IZVa9UlhujLSWXE2OSkmJj5bbThJAaX2bEIDPGywHVhm6rxedxzk8tg2Oukkg1iW50yw== X-Received: by 10.80.151.178 with SMTP id e47mr47819201edb.196.1511708650743; Sun, 26 Nov 2017 07:04:10 -0800 (PST) Received: from vesta.fritz.box ([2001:985:e54:1:d42a:81d4:ce94:db48]) by smtp.gmail.com with ESMTPSA id s14sm2520059eds.78.2017.11.26.07.04.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 07:04:09 -0800 (PST) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Sun, 26 Nov 2017 16:04:01 +0100 Message-Id: <20171126150401.28565-2-steffan@karger.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171126150401.28565-1-steffan@karger.me> References: <20171126150401.28565-1-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.65 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: 1eIyTg-0000zB-UU Subject: [Openvpn-devel] [PATCH 2/2] 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 --- 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..6d7f7d02 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)