Make sure we get the definition of OPENSSL_EXTERN, OPENSSL_NO_DES,

DES_LONG and OPENSSL_NO_DESCBCM.

diff --git a/crypto/des/des.h b/crypto/des/des.h
index daaf239dbe54219ebea2235a8788dbcc7c0ce5c3..4475143db55d8041c3154722dda355da2cb7865e 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -59,13 +59,13 @@
 #ifndef HEADER_NEW_DES_H
 #define HEADER_NEW_DES_H
 
 #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
 
 #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
 #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 1d840b474a64f6cc68b7a15ff4ca11c9f12b7f85..8a238d1ce1b48de947e3f095dd67a64bec411e08 100644 (file)
--- a/crypto/des/des_old.h
+++ b/crypto/des/des_old.h
@@ -91,6 +91,8 @@
 #ifndef HEADER_DES_H
 #define HEADER_DES_H
 
 #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
 #ifdef OPENSSL_NO_DES
 #error DES is disabled.
 #endif


@@ -103,8 +105,6 @@
 #error <openssl/des_old.h> replaces <kerberos/des.h>.
 #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
 #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 fa45aa272ba51f59ce83171d23534f123441627c..adfcb75cf3878f53f86f5759ca8210871166be4b 100644 (file)
--- 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"
 
 #ifndef OPENSSL_NO_DESCBCM
 #include "des_locl.h"