diff options
| author | jsing <> | 2014-05-24 10:10:11 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-24 10:10:11 +0000 |
| commit | 769f240a1b7fd5885baae234f0c63255b93da7fa (patch) | |
| tree | 0cdfd45f8c2dc6fd3880454827376dbf76a7501f /src | |
| parent | ea9d79c4cd69bfc81e564708ee81e8e5285d79e2 (diff) | |
| download | openbsd-769f240a1b7fd5885baae234f0c63255b93da7fa.tar.gz openbsd-769f240a1b7fd5885baae234f0c63255b93da7fa.tar.bz2 openbsd-769f240a1b7fd5885baae234f0c63255b93da7fa.zip | |
Explicitly include <openssl/openssl.conf>. des.h still needs e_os2.h (at
least for a little while longer...)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/des/des.h | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/des/des.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h index 3eff114102..19a9918766 100644 --- a/src/lib/libcrypto/des/des.h +++ b/src/lib/libcrypto/des/des.h | |||
| @@ -59,8 +59,9 @@ | |||
| 59 | #ifndef HEADER_NEW_DES_H | 59 | #ifndef HEADER_NEW_DES_H |
| 60 | #define HEADER_NEW_DES_H | 60 | #define HEADER_NEW_DES_H |
| 61 | 61 | ||
| 62 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, | 62 | #include <openssl/opensslconf.h> |
| 63 | DES_LONG (via openssl/opensslconf.h */ | 63 | |
| 64 | #include <openssl/e_os2.h> /* OPENSSL_DECLARE_GLOBAL, OPENSSL_GLOBAL_REF */ | ||
| 64 | 65 | ||
| 65 | #ifdef OPENSSL_NO_DES | 66 | #ifdef OPENSSL_NO_DES |
| 66 | #error DES is disabled. | 67 | #error DES is disabled. |
diff --git a/src/lib/libssl/src/crypto/des/des.h b/src/lib/libssl/src/crypto/des/des.h index 3eff114102..19a9918766 100644 --- a/src/lib/libssl/src/crypto/des/des.h +++ b/src/lib/libssl/src/crypto/des/des.h | |||
| @@ -59,8 +59,9 @@ | |||
| 59 | #ifndef HEADER_NEW_DES_H | 59 | #ifndef HEADER_NEW_DES_H |
| 60 | #define HEADER_NEW_DES_H | 60 | #define HEADER_NEW_DES_H |
| 61 | 61 | ||
| 62 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, | 62 | #include <openssl/opensslconf.h> |
| 63 | DES_LONG (via openssl/opensslconf.h */ | 63 | |
| 64 | #include <openssl/e_os2.h> /* OPENSSL_DECLARE_GLOBAL, OPENSSL_GLOBAL_REF */ | ||
| 64 | 65 | ||
| 65 | #ifdef OPENSSL_NO_DES | 66 | #ifdef OPENSSL_NO_DES |
| 66 | #error DES is disabled. | 67 | #error DES is disabled. |