make update

7 files changed, 146 insertions, 81 deletions

diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl
index b99dd36569..b189cf7d23 100644
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -130,8 +130,9 @@ dh_key.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
 dh_key.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 dh_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 dh_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dh_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dh_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dh_key.c
+dh_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+dh_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+dh_key.o: ../cryptlib.h dh_key.c
 dh_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 dh_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 dh_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -151,5 +152,6 @@ dh_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
 dh_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 dh_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 dh_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dh_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dh_lib.c
+dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+dh_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+dh_lib.o: ../cryptlib.h dh_lib.c
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index b5fe91e264..1d5ce8550e 100644
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -98,12 +98,22 @@ dsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 dsa_err.o: ../../include/openssl/symhacks.h dsa_err.c
-dsa_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
-dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-dsa_gen.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-dsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-dsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-dsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+dsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h
+dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+dsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+dsa_gen.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+dsa_gen.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+dsa_gen.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+dsa_gen.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+dsa_gen.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+dsa_gen.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+dsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dsa_gen.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+dsa_gen.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+dsa_gen.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
+dsa_gen.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 dsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 dsa_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 dsa_gen.o: ../cryptlib.h dsa_gen.c
@@ -113,9 +123,8 @@ dsa_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
 dsa_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 dsa_key.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 dsa_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dsa_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_key.o: ../cryptlib.h dsa_key.c
+dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_key.c
 dsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 dsa_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -136,8 +145,8 @@ dsa_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 dsa_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 dsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-dsa_lib.o: ../cryptlib.h dsa_lib.c
+dsa_lib.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+dsa_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dsa_lib.c
 dsa_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_ossl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -158,8 +167,8 @@ dsa_ossl.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 dsa_ossl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 dsa_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_ossl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-dsa_ossl.o: ../cryptlib.h dsa_ossl.c
+dsa_ossl.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+dsa_ossl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dsa_ossl.c
 dsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 dsa_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -180,8 +189,8 @@ dsa_sign.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 dsa_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-dsa_sign.o: ../cryptlib.h dsa_sign.c
+dsa_sign.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+dsa_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dsa_sign.c
 dsa_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_vrf.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
 dsa_vrf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
@@ -202,5 +211,6 @@ dsa_vrf.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
 dsa_vrf.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 dsa_vrf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 dsa_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-dsa_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-dsa_vrf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dsa_vrf.c
+dsa_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+dsa_vrf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+dsa_vrf.o: ../cryptlib.h dsa_vrf.c
diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index 63f2f28966..d385a8b135 100644
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -101,8 +101,8 @@ engine_all.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 engine_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 engine_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 engine_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-engine_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-engine_all.o: engine_all.c engine_int.h
+engine_all.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+engine_all.o: ../../include/openssl/x509_vfy.h engine_all.c engine_int.h
 engine_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 engine_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -123,8 +123,8 @@ engine_err.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 engine_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 engine_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 engine_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-engine_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-engine_err.o: engine_err.c
+engine_err.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+engine_err.o: ../../include/openssl/x509_vfy.h engine_err.c
 engine_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 engine_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 engine_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -146,8 +146,9 @@ engine_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 engine_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 engine_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 engine_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-engine_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-engine_lib.o: ../cryptlib.h engine_int.h engine_lib.c
+engine_lib.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+engine_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h engine_int.h
+engine_lib.o: engine_lib.c
 engine_list.o: ../../e_os.h ../../include/openssl/asn1.h
 engine_list.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 engine_list.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -169,8 +170,9 @@ engine_list.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 engine_list.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 engine_list.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 engine_list.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-engine_list.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-engine_list.o: ../cryptlib.h engine_int.h engine_list.c
+engine_list.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+engine_list.o: ../../include/openssl/x509_vfy.h ../cryptlib.h engine_int.h
+engine_list.o: engine_list.c
 engine_openssl.o: ../../e_os.h ../../include/openssl/asn1.h
 engine_openssl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 engine_openssl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -194,9 +196,9 @@ engine_openssl.o: ../../include/openssl/rijndael.h
 engine_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 engine_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 engine_openssl.o: ../../include/openssl/stack.h
-engine_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-engine_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
-engine_openssl.o: engine_openssl.c
+engine_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+engine_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+engine_openssl.o: ../cryptlib.h engine_openssl.c
 hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_atalla.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -218,8 +220,9 @@ hw_atalla.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 hw_atalla.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_atalla.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_atalla.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_atalla.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-hw_atalla.o: ../cryptlib.h hw_atalla.c vendor_defns/atalla.h
+hw_atalla.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+hw_atalla.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_atalla.c
+hw_atalla.o: vendor_defns/atalla.h
 hw_cswift.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_cswift.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -241,8 +244,9 @@ hw_cswift.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 hw_cswift.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_cswift.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_cswift.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_cswift.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-hw_cswift.o: ../cryptlib.h hw_cswift.c vendor_defns/cswift.h
+hw_cswift.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+hw_cswift.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_cswift.c
+hw_cswift.o: vendor_defns/cswift.h
 hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_ncipher.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -264,8 +268,9 @@ hw_ncipher.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 hw_ncipher.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_ncipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_ncipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-hw_ncipher.o: ../cryptlib.h hw_ncipher.c vendor_defns/hwcryptohook.h
+hw_ncipher.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+hw_ncipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_ncipher.c
+hw_ncipher.o: vendor_defns/hwcryptohook.h
 hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_nuron.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -287,8 +292,8 @@ hw_nuron.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 hw_nuron.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_nuron.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_nuron.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-hw_nuron.o: ../cryptlib.h hw_nuron.c
+hw_nuron.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+hw_nuron.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_nuron.c
 hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_ubsec.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -310,5 +315,6 @@ hw_ubsec.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 hw_ubsec.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_ubsec.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_ubsec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_ubsec.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-hw_ubsec.o: ../cryptlib.h hw_ubsec.c vendor_defns/hw_ubsec.h
+hw_ubsec.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+hw_ubsec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_ubsec.c
+hw_ubsec.o: vendor_defns/hw_ubsec.h
diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl
index e13bbb178f..e7a0aeb41d 100644
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@@ -107,8 +107,9 @@ err_all.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-err_all.o: ../../include/openssl/x509v3.h err_all.c
+err_all.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+err_all.o: err_all.c
 err_prn.o: ../../e_os.h ../../include/openssl/bio.h
 err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index 03fff3864c..d5369c4964 100644
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -81,11 +81,22 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md_rand.o: ../../e_os.h ../../include/openssl/bio.h
-md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-md_rand.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+md_rand.o: ../../e_os.h ../../include/openssl/asn1.h
+md_rand.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+md_rand.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+md_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+md_rand.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+md_rand.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+md_rand.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+md_rand.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+md_rand.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+md_rand.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+md_rand.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 md_rand.o: ../../include/openssl/symhacks.h md_rand.c rand_lcl.h
 rand_egd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
@@ -116,24 +127,48 @@ rand_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 rand_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-rand_lib.o: ../cryptlib.h rand_lib.c
-rand_unix.o: ../../e_os.h ../../include/openssl/bio.h
-rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-rand_unix.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rand_unix.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+rand_lib.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+rand_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rand_lib.c
+rand_unix.o: ../../e_os.h ../../include/openssl/asn1.h
+rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rand_unix.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rand_unix.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rand_unix.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rand_unix.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rand_unix.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+rand_unix.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+rand_unix.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rand_unix.o: ../../include/openssl/opensslconf.h
 rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_unix.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-rand_unix.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_unix.o: ../cryptlib.h rand_lcl.h rand_unix.c
-rand_win.o: ../../e_os.h ../../include/openssl/bio.h
-rand_win.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-rand_win.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rand_win.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+rand_unix.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+rand_unix.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+rand_unix.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+rand_unix.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rand_unix.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_unix.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
+rand_unix.o: rand_unix.c
+rand_win.o: ../../e_os.h ../../include/openssl/asn1.h
+rand_win.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rand_win.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rand_win.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rand_win.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rand_win.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rand_win.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+rand_win.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+rand_win.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rand_win.o: ../../include/openssl/opensslconf.h
 rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rand_win.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-rand_win.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rand_win.o: ../cryptlib.h rand_lcl.h rand_win.c
+rand_win.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+rand_win.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+rand_win.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
+rand_win.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_win.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h
+rand_win.o: rand_win.c
 randfile.o: ../../e_os.h ../../include/openssl/crypto.h
 randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index 04d4a51d96..f2a365cdb0 100644
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -119,8 +119,8 @@ rsa_eay.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 rsa_eay.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_eay.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_eay.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-rsa_eay.o: ../cryptlib.h rsa_eay.c
+rsa_eay.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+rsa_eay.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_eay.c
 rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 rsa_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -156,8 +156,8 @@ rsa_lib.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 rsa_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 rsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-rsa_lib.o: ../cryptlib.h rsa_lib.c
+rsa_lib.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+rsa_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_lib.c
 rsa_none.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -177,11 +177,21 @@ rsa_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_null.o: ../cryptlib.h rsa_null.c
 rsa_oaep.o: ../../e_os.h ../../include/openssl/asn1.h
-rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-rsa_oaep.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-rsa_oaep.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rsa_oaep.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_oaep.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rsa_oaep.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rsa_oaep.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rsa_oaep.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+rsa_oaep.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+rsa_oaep.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+rsa_oaep.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_oaep.o: ../../include/openssl/opensslconf.h
 rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+rsa_oaep.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+rsa_oaep.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
+rsa_oaep.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rsa_oaep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_oaep.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_oaep.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_oaep.c
@@ -234,8 +244,8 @@ rsa_sign.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 rsa_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-rsa_sign.o: ../cryptlib.h rsa_sign.c
+rsa_sign.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+rsa_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_sign.c
 rsa_ssl.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_ssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_ssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/ui/Makefile.ssl b/crypto/ui/Makefile.ssl
index c6dec3e46c..02a17203de 100644
--- a/crypto/ui/Makefile.ssl
+++ b/crypto/ui/Makefile.ssl
@@ -95,12 +95,13 @@ ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 ui_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 ui_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ui_err.o: ../../include/openssl/ui.h ui_err.c
-ui_lib.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-ui_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-ui_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-ui_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-ui_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ui_lib.o: ../../include/openssl/ui.h ui_lib.c ui_locl.h
+ui_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ui_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ui_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ui_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ui_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ui_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h ui_lib.c
+ui_lib.o: ui_locl.h
 ui_openssl.o: ../../e_os.h ../../include/openssl/bio.h
 ui_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 ui_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h