diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-03-20 23:21:10 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-03-20 23:21:10 +0000 |
| commit | 0f3879455bab6f06457685fc80748bcbb545439b (patch) | |
| tree | d0ec11549bbe882a5486fbd3c0562e533dddb2a5 /crypto/des | |
| parent | 0c7d61ee0e742adf90e8c815c52eee181cd89dea (diff) | |
Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,
DES_LONG and OPENSSL_NO_DESCBCM.
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/des.h | 6 | ||||
| -rw-r--r-- | crypto/des/des_old.h | 4 | ||||
| -rw-r--r-- | crypto/des/ede_cbcm_enc.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/crypto/des/des.h b/crypto/des/des.h index daaf239dbe..4475143db5 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -59,13 +59,13 @@ #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 */ + #ifdef OPENSSL_NO_DES #error DES is disabled. #endif -#include <openssl/opensslconf.h> /* DES_LONG */ -#include <openssl/e_os2.h> /* OPENSSL_EXTERN */ - #ifdef OPENSSL_BUILD_SHLIBCRYPTO # undef OPENSSL_EXTERN # define OPENSSL_EXTERN OPENSSL_EXPORT diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h index 1d840b474a..8a238d1ce1 100644 --- a/crypto/des/des_old.h +++ b/crypto/des/des_old.h @@ -91,6 +91,8 @@ #ifndef HEADER_DES_H #define HEADER_DES_H +#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */ + #ifdef OPENSSL_NO_DES #error DES is disabled. #endif @@ -103,8 +105,6 @@ #error <openssl/des_old.h> replaces <kerberos/des.h>. #endif -#include <openssl/opensslconf.h> /* DES_LONG */ -#include <openssl/e_os2.h> /* OPENSSL_EXTERN */ #include <openssl/symhacks.h> #ifdef OPENSSL_BUILD_SHLIBCRYPTO diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c index fa45aa272b..adfcb75cf3 100644 --- a/crypto/des/ede_cbcm_enc.c +++ b/crypto/des/ede_cbcm_enc.c @@ -68,6 +68,8 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz */ +#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_DESCBCM is defined */ + #ifndef OPENSSL_NO_DESCBCM #include "des_locl.h" |