Make all configuration macros available for application by making

sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.

I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.

4 files changed, 11 insertions, 10 deletions

diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index 0aa1cbc55a..5a1fa47886 100644
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -12,7 +12,8 @@ INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=		make -f Makefile.ssl
-MAKEDEPEND=	$(TOP)/util/domd $(TOP)
+MAKEDEPPROG=	makedepend
+MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=	Makefile.ssl
 AR=		ar r
 
@@ -110,16 +111,16 @@ clean:
 
 c_cfb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
 c_cfb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-c_cfb64.o: cast_lcl.h
+c_cfb64.o: c_cfb64.c cast_lcl.h
 c_ecb.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
 c_ecb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-c_ecb.o: ../../include/openssl/opensslv.h cast_lcl.h
+c_ecb.o: ../../include/openssl/opensslv.h c_ecb.c cast_lcl.h
 c_enc.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
 c_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-c_enc.o: cast_lcl.h
+c_enc.o: c_enc.c cast_lcl.h
 c_ofb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
 c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-c_ofb64.o: cast_lcl.h
+c_ofb64.o: c_ofb64.c cast_lcl.h
 c_skey.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
 c_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-c_skey.o: cast_lcl.h cast_s.h
+c_skey.o: c_skey.c cast_lcl.h cast_s.h
diff --git a/crypto/cast/cast.h b/crypto/cast/cast.h
index e24e133099..b28e4e4f3b 100644
--- a/crypto/cast/cast.h
+++ b/crypto/cast/cast.h
@@ -63,7 +63,7 @@
 extern "C" {
 #endif
 
-#ifdef NO_CAST
+#ifdef OPENSSL_NO_CAST
 #error CAST is disabled.
 #endif
 
diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index 6bd25628d9..7a4daf1e29 100644
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifdef WIN32
+#ifdef OPENSSL_SYS_WIN32
 #include <stdlib.h>
 #endif
 
@@ -156,7 +156,7 @@
                          *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
                          *((c)++)=(unsigned char)(((l)     )&0xff))
 
-#if defined(WIN32) && defined(_MSC_VER)
+#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
 #define ROTL(a,n)     (_lrotl(a,n))
 #else
 #define ROTL(a,n)     ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n))))
diff --git a/crypto/cast/casttest.c b/crypto/cast/casttest.c
index ab2aeac606..099e790886 100644
--- a/crypto/cast/casttest.c
+++ b/crypto/cast/casttest.c
@@ -60,7 +60,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef NO_CAST
+#ifdef OPENSSL_NO_CAST
 int main(int argc, char *argv[])
 {
     printf("No CAST support\n");