1. openvpn
  2. Commit 1987498271abadf042d8bb3feee1fe0d877a9d55
Browse code

openssl: add missing #include statements

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 <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20171126154912.13283-1-steffan@karger.me>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15936.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Steffan Karger authored on 2017/11/27 00:49:12
Showing 3 changed files
src/openvpn/openssl_compat.h
History View file @ 1987498
... ... 
@@ -42,6 +42,7 @@
42 42
43 43 
 #include "buffer.h"
44 44
45 
+#include <openssl/rsa.h>
45 46 
 #include <openssl/ssl.h>
46 47 
 #include <openssl/x509.h>
47 48
src/openvpn/ssl_openssl.c
History View file @ 1987498
... ... 
@@ -52,10 +52,14 @@
52 52
53 53 
 #include "ssl_verify_openssl.h"
54 54
55 
+#include <openssl/bn.h>
56 
+#include <openssl/crypto.h>
57 
+#include <openssl/dh.h>
58 
+#include <openssl/dsa.h>
55 59 
 #include <openssl/err.h>
56 60 
 #include <openssl/pkcs12.h>
61 
+#include <openssl/rsa.h>
57 62 
 #include <openssl/x509.h>
58 
-#include <openssl/crypto.h>
59 63 
 #ifndef OPENSSL_NO_EC
60 64 
 #include <openssl/ec.h>
61 65 
 #endif
src/openvpn/ssl_verify_openssl.c
History View file @ 1987498
... ... 
@@ -44,8 +44,9 @@
44 44 
 #include "ssl_verify_backend.h"
45 45 
 #include "openssl_compat.h"
46 46
47 
-#include <openssl/x509v3.h>
47 
+#include <openssl/bn.h>
48 48 
 #include <openssl/err.h>
49 
+#include <openssl/x509v3.h>
49 50
50 51 
 int
51 52 
 verify_callback(int preverify_ok, X509_STORE_CTX *ctx)