summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-05-24 10:10:11 +0000
committerjsing <jsing@openbsd.org>2014-05-24 10:10:11 +0000
commitb1f314f8001bceb7c17d1831a3ad7b428fac2caa (patch)
tree27133c1614fedcb4d77ab9b7da0bf45a9ecb7ad8
parentregen (diff)
downloadwireguard-openbsd-b1f314f8001bceb7c17d1831a3ad7b428fac2caa.tar.xz
wireguard-openbsd-b1f314f8001bceb7c17d1831a3ad7b428fac2caa.zip
Explicitly include <openssl/openssl.conf>. des.h still needs e_os2.h (at
least for a little while longer...)
-rw-r--r--lib/libcrypto/des/des.h5
-rw-r--r--lib/libssl/src/crypto/des/des.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/libcrypto/des/des.h b/lib/libcrypto/des/des.h
index 3eff114102f..19a9918766d 100644
--- a/lib/libcrypto/des/des.h
+++ b/lib/libcrypto/des/des.h
@@ -59,8 +59,9 @@
#ifndef HEADER_NEW_DES_H
#define HEADER_NEW_DES_H
-#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES,
- DES_LONG (via openssl/opensslconf.h */
+#include <openssl/opensslconf.h>
+
+#include <openssl/e_os2.h> /* OPENSSL_DECLARE_GLOBAL, OPENSSL_GLOBAL_REF */
#ifdef OPENSSL_NO_DES
#error DES is disabled.
diff --git a/lib/libssl/src/crypto/des/des.h b/lib/libssl/src/crypto/des/des.h
index 3eff114102f..19a9918766d 100644
--- a/lib/libssl/src/crypto/des/des.h
+++ b/lib/libssl/src/crypto/des/des.h
@@ -59,8 +59,9 @@
#ifndef HEADER_NEW_DES_H
#define HEADER_NEW_DES_H
-#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES,
- DES_LONG (via openssl/opensslconf.h */
+#include <openssl/opensslconf.h>
+
+#include <openssl/e_os2.h> /* OPENSSL_DECLARE_GLOBAL, OPENSSL_GLOBAL_REF */
#ifdef OPENSSL_NO_DES
#error DES is disabled.