This time, get it right.

31 files changed, 1248 insertions, 1102 deletions

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index d89d3dfe36..b62558f591 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -161,13 +161,14 @@ errgen:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-cpt_err.o: ../include/err.h ../include/stack.h crypto.h ../include/bio.h
-cryptlib.o: ../include/buffer.h ../include/e_os.h ../include/err.h
-cryptlib.o: ../include/stack.h cryptlib.h crypto.h date.h ../include/bio.h
-cversion.o: ../include/buffer.h ../include/e_os.h ../include/err.h
-cversion.o: ../include/stack.h cryptlib.h crypto.h date.h ../include/bio.h
-ex_data.o: ../include/buffer.h ../include/e_os.h ../include/err.h
-ex_data.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h
+cpt_err.o: ../include/err.h ../include/stack.h crypto.h
+cryptlib.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+cryptlib.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
+cversion.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+cversion.o: ../include/err.h ../include/stack.h cryptlib.h crypto.h date.h
+ex_data.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
+ex_data.o: ../include/err.h ../include/lhash.h ../include/stack.h cryptlib.h
+ex_data.o: crypto.h
 mem.o: ../include/bio.h ../include/buffer.h ../include/e_os.h ../include/err.h
 mem.o: ../include/lhash.h ../include/stack.h cryptlib.h crypto.h
 tmdiff.o: ../include/bio.h ../include/buffer.h ../include/e_os.h
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 7d68e0538f..c6c568a7fc 100644
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -123,21 +123,23 @@ $(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 asn1.h ../../include/bio.h
-a_bmp.o: ../../include/bn.h ../../include/buffer.h ../../include/e_os.h
-a_bmp.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-a_bmp.o: asn1.h ../../include/bio.h ../../include/bn.h ../../include/buffer.h
+a_bitstr.o: ../cryptlib.h ../crypto.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 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 asn1.h ../../include/bio.h
-a_bytes.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-a_bytes.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-a_bytes.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-a_bytes.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-a_bytes.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-a_bytes.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-a_bytes.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-a_bytes.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-a_bytes.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h asn1_mac.h
+a_bool.o: ../cryptlib.h ../crypto.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
+a_bytes.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+a_bytes.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+a_bytes.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+a_bytes.o: ../crypto.h asn1.h 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
@@ -147,16 +149,17 @@ 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/sha.h ../../include/stack.h
 a_d2i_fp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_d2i_fp.o: ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-a_digest.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-a_digest.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-a_digest.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-a_digest.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-a_digest.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-a_digest.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-a_digest.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-a_digest.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-a_digest.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
+a_d2i_fp.o: ../crypto.h asn1.h 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
+a_digest.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+a_digest.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+a_digest.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+a_digest.o: ../crypto.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
@@ -166,9 +169,10 @@ 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/sha.h ../../include/stack.h
 a_dup.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_dup.o: ../crypto.h asn1.h asn1_mac.h ../../include/bio.h ../../include/bn.h
-a_gentm.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-a_gentm.o: ../../include/stack.h ../cryptlib.h ../crypto.h asn1.h
+a_dup.o: ../crypto.h asn1.h asn1_mac.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 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
@@ -178,19 +182,20 @@ 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/sha.h ../../include/stack.h
 a_hdr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_hdr.o: ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-a_i2d_fp.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-a_i2d_fp.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-a_i2d_fp.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-a_i2d_fp.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-a_i2d_fp.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-a_i2d_fp.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-a_i2d_fp.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-a_i2d_fp.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-a_i2d_fp.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
-a_i2d_fp.o: asn1_mac.h ../../include/bio.h ../../include/bn.h
-a_int.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-a_int.o: ../../include/stack.h ../cryptlib.h ../crypto.h asn1.h
+a_hdr.o: ../crypto.h asn1.h 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
+a_i2d_fp.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+a_i2d_fp.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+a_i2d_fp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+a_i2d_fp.o: ../crypto.h asn1.h 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 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
@@ -200,24 +205,26 @@ 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/sha.h ../../include/stack.h
 a_meth.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-a_meth.o: ../crypto.h asn1.h ../../include/bio.h ../../include/bn.h
-a_object.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-a_object.o: ../../include/objects.h ../../include/stack.h ../cryptlib.h
-a_object.o: ../crypto.h asn1.h ../../include/bio.h ../../include/bn.h
-a_octet.o: ../../include/buffer.h ../../include/e_os.h ../../include/err.h
-a_octet.o: ../../include/stack.h ../cryptlib.h ../crypto.h asn1.h
+a_meth.o: ../crypto.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 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 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 asn1.h ../../include/bio.h
-a_set.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-a_set.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-a_set.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-a_set.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-a_set.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-a_set.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-a_set.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-a_set.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-a_set.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h asn1_mac.h
+a_print.o: ../cryptlib.h ../crypto.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
+a_set.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+a_set.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+a_set.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+a_set.o: ../crypto.h asn1.h 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
@@ -227,31 +234,33 @@ a_sign.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h
 a_sign.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 a_sign.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
 a_sign.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_sign.o: ../cryptlib.h ../crypto.h asn1.h ../../include/bio.h
-a_time.o: ../../include/bn.h ../../include/buffer.h ../../include/e_os.h
-a_time.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-a_time.o: asn1.h ../../include/bio.h ../../include/blowfish.h
-a_type.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-a_type.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-a_type.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-a_type.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-a_type.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
-a_type.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-a_type.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-a_type.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-a_type.o: ../cryptlib.h ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-a_utctm.o: ../../include/bn.h ../../include/buffer.h ../../include/e_os.h
-a_utctm.o: ../../include/err.h ../../include/stack.h ../cryptlib.h ../crypto.h
-a_utctm.o: asn1.h ../../include/bio.h ../../include/blowfish.h
-a_verify.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-a_verify.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-a_verify.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-a_verify.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-a_verify.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h
-a_verify.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-a_verify.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-a_verify.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-a_verify.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
+a_sign.o: ../cryptlib.h ../crypto.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 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
+a_type.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+a_type.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+a_type.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+a_type.o: ../crypto.h asn1.h 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 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
+a_verify.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+a_verify.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+a_verify.o: ../../include/objects.h ../../include/pem.h ../../include/pkcs7.h
+a_verify.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
+a_verify.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
+a_verify.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
+a_verify.o: ../cryptlib.h ../crypto.h asn1.h
 asn1_err.o: ../../include/bn.h ../../include/err.h ../../include/stack.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
@@ -262,16 +271,17 @@ 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/sha.h ../../include/stack.h
 asn1_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-asn1_lib.o: ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-asn1_par.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-asn1_par.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-asn1_par.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-asn1_par.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-asn1_par.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-asn1_par.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-asn1_par.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-asn1_par.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-asn1_par.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
+asn1_lib.o: ../crypto.h asn1.h 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
+asn1_par.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+asn1_par.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+asn1_par.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+asn1_par.o: ../crypto.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
@@ -281,35 +291,37 @@ 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/sha.h ../../include/stack.h
 d2i_dhp.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_dhp.o: ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-d2i_dsap.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-d2i_dsap.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-d2i_dsap.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-d2i_dsap.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-d2i_dsap.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-d2i_dsap.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-d2i_dsap.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-d2i_dsap.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-d2i_dsap.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
-d2i_dsap.o: asn1_mac.h ../../include/bio.h ../../include/blowfish.h
-d2i_pr.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-d2i_pr.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-d2i_pr.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-d2i_pr.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-d2i_pr.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
-d2i_pr.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-d2i_pr.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-d2i_pr.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-d2i_pr.o: ../cryptlib.h ../crypto.h asn1.h ../../include/bio.h
-d2i_pu.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-d2i_pu.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-d2i_pu.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-d2i_pu.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-d2i_pu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-d2i_pu.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-d2i_pu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-d2i_pu.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-d2i_pu.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
+d2i_dhp.o: ../crypto.h asn1.h 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
+d2i_dsap.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+d2i_dsap.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+d2i_dsap.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+d2i_dsap.o: ../crypto.h asn1.h 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
+d2i_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+d2i_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+d2i_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+d2i_pr.o: ../crypto.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
+d2i_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+d2i_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+d2i_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+d2i_pu.o: ../crypto.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
@@ -319,54 +331,57 @@ 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/sha.h ../../include/stack.h
 d2i_r_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-d2i_r_pr.o: ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-d2i_r_pu.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-d2i_r_pu.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-d2i_r_pu.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-d2i_r_pu.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-d2i_r_pu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-d2i_r_pu.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-d2i_r_pu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-d2i_r_pu.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-d2i_r_pu.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
-d2i_r_pu.o: asn1_mac.h ../../include/bio.h ../../include/blowfish.h
-d2i_s_pr.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-d2i_s_pr.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-d2i_s_pr.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-d2i_s_pr.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-d2i_s_pr.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
-d2i_s_pr.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-d2i_s_pr.o: ../../include/ripemd.h ../../include/rsa.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 asn1.h asn1_mac.h ../../include/bio.h
-d2i_s_pu.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-d2i_s_pu.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-d2i_s_pu.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-d2i_s_pu.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-d2i_s_pu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-d2i_s_pu.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-d2i_s_pu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-d2i_s_pu.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-d2i_s_pu.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
-d2i_s_pu.o: asn1_mac.h ../../include/bio.h ../../include/blowfish.h
-evp_asn1.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-evp_asn1.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-evp_asn1.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-evp_asn1.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-evp_asn1.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
-evp_asn1.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-evp_asn1.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-evp_asn1.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-evp_asn1.o: ../cryptlib.h ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-f_int.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-f_int.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-f_int.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-f_int.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-f_int.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-f_int.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-f_int.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-f_int.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-f_int.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
+d2i_r_pr.o: ../crypto.h asn1.h 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
+d2i_r_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+d2i_r_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+d2i_r_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+d2i_r_pu.o: ../crypto.h asn1.h 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
+d2i_s_pr.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+d2i_s_pr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+d2i_s_pr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+d2i_s_pr.o: ../crypto.h asn1.h 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
+d2i_s_pu.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+d2i_s_pu.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+d2i_s_pu.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+d2i_s_pu.o: ../crypto.h asn1.h 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
+evp_asn1.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+evp_asn1.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+evp_asn1.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+evp_asn1.o: ../crypto.h asn1.h asn1_mac.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
+f_int.o: ../../include/err.h ../../include/evp.h ../../include/idea.h
+f_int.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h
+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/sha.h ../../include/stack.h
+f_int.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
+f_int.o: ../crypto.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
@@ -376,42 +391,45 @@ 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/sha.h ../../include/stack.h
 f_string.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-f_string.o: ../crypto.h asn1.h ../../include/bio.h ../../include/blowfish.h
-i2d_dhp.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-i2d_dhp.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-i2d_dhp.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-i2d_dhp.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-i2d_dhp.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
-i2d_dhp.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-i2d_dhp.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-i2d_dhp.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-i2d_dhp.o: ../cryptlib.h ../crypto.h asn1.h asn1_mac.h ../../include/bio.h
-i2d_dsap.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-i2d_dsap.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-i2d_dsap.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-i2d_dsap.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-i2d_dsap.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-i2d_dsap.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
-i2d_dsap.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
-i2d_dsap.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-i2d_dsap.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h asn1.h
-i2d_dsap.o: asn1_mac.h ../../include/bio.h ../../include/blowfish.h
-i2d_pr.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
-i2d_pr.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
-i2d_pr.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h
-i2d_pr.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h
-i2d_pr.o: ../../include/mdc2.h ../../include/objects.h ../../include/rc2.h
-i2d_pr.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
-i2d_pr.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h
-i2d_pr.o: ../cryptlib.h ../crypto.h asn1.h ../../include/bio.h
-i2d_pu.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
-i2d_pu.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
-i2d_pu.o: ../../include/dsa.h ../../include/e_os.h ../../include/err.h
-i2d_pu.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h
-i2d_pu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h
-i2d_pu.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
-i2d_pu.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h
-i2d_pu.o: ../../include/stack.h ../cryptlib.h ../crypto.h asn1.h
+f_string.o: