Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,
authorRichard Levitte <levitte@openssl.org>
Thu, 20 Mar 2003 23:21:10 +0000 (23:21 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 20 Mar 2003 23:21:10 +0000 (23:21 +0000)
DES_LONG and OPENSSL_NO_DESCBCM.

crypto/des/des.h
crypto/des/des_old.h
crypto/des/ede_cbcm_enc.c

index daaf239..4475143 100644 (file)
 #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
index 1d840b4..8a238d1 100644 (file)
@@ -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
 #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
index fa45aa2..adfcb75 100644 (file)
@@ -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"