Work with -pedantic!

61 files changed, 588 insertions, 450 deletions

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 8cb6f2eb90..9e4df74f9e 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -39,8 +39,8 @@ LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o
 
 SRC= $(LIBSRC)
 
-EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h
-HEADER=	cryptlib.h date.h opensslconf.h $(EXHEADER)
+EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h opensslconf.h
+HEADER=	cryptlib.h date.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 7b6256e365..c6e1f2f8a4 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -122,13 +122,13 @@ $(ERRC).c: $(ERR).err
 
 a_bitstr.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_bitstr.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_bitstr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_bitstr.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_bmp.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_bmp.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_bmp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_bmp.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_bool.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_bool.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_bool.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_bool.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_bytes.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_bytes.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_bytes.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -138,7 +138,8 @@ a_bytes.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_bytes.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_bytes.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_bytes.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_bytes.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_bytes.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_bytes.o: asn1_mac.h
 a_d2i_fp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_d2i_fp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_d2i_fp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -148,7 +149,8 @@ a_d2i_fp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_d2i_fp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_d2i_fp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_d2i_fp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_d2i_fp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_d2i_fp.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_d2i_fp.o: asn1_mac.h
 a_digest.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_digest.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_digest.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -158,7 +160,7 @@ a_digest.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_digest.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_digest.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_digest.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_digest.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_digest.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_dup.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_dup.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_dup.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -168,13 +170,14 @@ a_dup.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_dup.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_dup.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_dup.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_dup.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_dup.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_dup.o: asn1_mac.h
 a_enum.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_enum.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_enum.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_gentm.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_gentm.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_gentm.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_gentm.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_hdr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_hdr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_hdr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -184,7 +187,8 @@ a_hdr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_hdr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_hdr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_hdr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_hdr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_hdr.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_hdr.o: asn1_mac.h
 a_i2d_fp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_i2d_fp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_i2d_fp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -194,10 +198,11 @@ a_i2d_fp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_i2d_fp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_i2d_fp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_i2d_fp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_i2d_fp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_i2d_fp.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_i2d_fp.o: asn1_mac.h
 a_int.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_int.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_int.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_int.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_meth.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_meth.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_meth.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -207,17 +212,17 @@ a_meth.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_meth.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_meth.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_meth.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_meth.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_meth.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_object.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_object.o: ../../include/e_os.h ../../include/err.h ../../include/objects.h
-a_object.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h
-a_object.o: asn1.h
+a_object.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslconf.h
+a_object.o: ../opensslv.h asn1.h
 a_octet.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_octet.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_octet.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_octet.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_print.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_print.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_print.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_print.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_set.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_set.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_set.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -227,7 +232,8 @@ a_set.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_set.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_set.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_set.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_set.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_set.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_set.o: asn1_mac.h
 a_sign.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_sign.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_sign.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -237,10 +243,10 @@ a_sign.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_sign.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_sign.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_sign.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_sign.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_sign.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_time.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_time.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_time.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_time.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_type.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_type.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_type.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -250,13 +256,14 @@ a_type.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_type.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_type.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_type.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_type.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+a_type.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+a_type.o: asn1_mac.h
 a_utctm.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_utctm.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_utctm.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_utctm.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_utf8.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_utf8.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_utf8.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_utf8.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_verify.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 a_verify.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 a_verify.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -266,11 +273,12 @@ a_verify.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 a_verify.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 a_verify.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 a_verify.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_verify.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+a_verify.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 a_vis.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 a_vis.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-a_vis.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
-asn1_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h asn1.h
+a_vis.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+asn1_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.h
+asn1_err.o: ../opensslconf.h asn1.h
 asn1_lib.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 asn1_lib.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 asn1_lib.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -280,7 +288,8 @@ asn1_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 asn1_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 asn1_lib.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 asn1_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-asn1_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+asn1_lib.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+asn1_lib.o: asn1_mac.h
 asn1_par.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 asn1_par.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 asn1_par.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -290,10 +299,10 @@ asn1_par.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 asn1_par.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 asn1_par.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 asn1_par.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-asn1_par.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+asn1_par.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 asn_pack.o: ../../include/bio.h ../../include/bn.h ../../include/buffer.h
 asn_pack.o: ../../include/e_os.h ../../include/err.h ../../include/stack.h
-asn_pack.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+asn_pack.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 d2i_dhp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_dhp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_dhp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -303,7 +312,8 @@ d2i_dhp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_dhp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_dhp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_dhp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_dhp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_dhp.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+d2i_dhp.o: asn1_mac.h
 d2i_dsap.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_dsap.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_dsap.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -313,7 +323,8 @@ d2i_dsap.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_dsap.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_dsap.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_dsap.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_dsap.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_dsap.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+d2i_dsap.o: asn1_mac.h
 d2i_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -323,7 +334,7 @@ d2i_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+d2i_pr.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 d2i_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -333,7 +344,7 @@ d2i_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+d2i_pu.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 d2i_r_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_r_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_r_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -343,7 +354,8 @@ d2i_r_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_r_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_r_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_r_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_r_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_r_pr.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+d2i_r_pr.o: asn1_mac.h
 d2i_r_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_r_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_r_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -353,7 +365,8 @@ d2i_r_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_r_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_r_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_r_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_r_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_r_pu.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+d2i_r_pu.o: asn1_mac.h
 d2i_s_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_s_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_s_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -363,7 +376,8 @@ d2i_s_pr.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_s_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_s_pr.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_s_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_s_pr.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_s_pr.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+d2i_s_pr.o: asn1_mac.h
 d2i_s_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 d2i_s_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 d2i_s_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -373,7 +387,8 @@ d2i_s_pu.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 d2i_s_pu.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 d2i_s_pu.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 d2i_s_pu.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_s_pu.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+d2i_s_pu.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+d2i_s_pu.o: asn1_mac.h
 evp_asn1.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 evp_asn1.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 evp_asn1.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -383,7 +398,8 @@ evp_asn1.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 evp_asn1.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 evp_asn1.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 evp_asn1.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-evp_asn1.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+evp_asn1.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+evp_asn1.o: asn1_mac.h
 f_enum.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_enum.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_enum.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -393,7 +409,7 @@ f_enum.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_enum.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 f_enum.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 f_enum.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-f_enum.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+f_enum.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 f_int.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_int.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_int.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -403,7 +419,7 @@ f_int.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_int.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 f_int.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 f_int.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-f_int.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+f_int.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 f_string.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 f_string.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 f_string.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -413,7 +429,7 @@ f_string.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 f_string.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 f_string.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 f_string.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-f_string.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h
+f_string.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
 i2d_dhp.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_dhp.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_dhp.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -423,7 +439,8 @@ i2d_dhp.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_dhp.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_dhp.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 i2d_dhp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-i2d_dhp.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_dhp.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+i2d_dhp.o: asn1_mac.h
 i2d_dsap.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_dsap.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_dsap.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -433,7 +450,8 @@ i2d_dsap.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h
 i2d_dsap.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 i2d_dsap.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 i2d_dsap.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-i2d_dsap.o: ../cryptlib.h ../crypto.h ../opensslv.h asn1.h asn1_mac.h
+i2d_dsap.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h asn1.h
+i2d_dsap.o: asn1_mac.h
 i2d_pr.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_pr.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_pr.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -442,7 +460,7 @@ i2d_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_pr.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 i2d_pr.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 i2d_pr.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-i2d_pr.o: ../opensslv.h asn1.h
+i2d_pr.o: ../opensslconf.h ../opensslv.h asn1.h
 i2d_pu.o: ../../include/bio.h ../../include/blowfish.h ../../include/bn.h
 i2d_pu.o: ../../include/buffer.h ../../include/cast.h ../../include/des.h
 i2d_pu.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h
@@ -451,7 +469,7 @@ i2d_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
 i2d_pu.o: ../../include/objects.h ../../include/rc2.h ../../include/rc4.h
 i2d_pu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 i2d_pu.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h
-i2d_pu.o: ../opensslv.h asn1.h
+i2d_