make update

6 files changed, 28 insertions, 15 deletions

diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index e1be84b687..a37c6f66a2 100644
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -86,8 +86,9 @@ clean:
 
 aes_cbc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
 aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c aes_locl.h
-aes_cfb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-aes_cfb.o: ../../include/openssl/opensslconf.h aes_cfb.c aes_locl.h
+aes_cfb.o: ../../e_os.h ../../include/openssl/aes.h
+aes_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+aes_cfb.o: aes_cfb.c aes_locl.h
 aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
 aes_core.o: ../../include/openssl/fips.h ../../include/openssl/opensslconf.h
 aes_core.o: aes_core.c aes_locl.h
diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index 5e5877c268..655f2ea1a8 100644
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -142,9 +142,9 @@ cbc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 cbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 cbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 cbc_enc.o: ../../include/openssl/ui_compat.h cbc_enc.c des_locl.h ncbc_enc.c
-cfb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
-cfb64ede.o: ../../include/openssl/opensslconf.h
+cfb64ede.o: ../../e_os.h ../../include/openssl/crypto.h
+cfb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+cfb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 0f518f495a..c78790a54c 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -168,6 +168,7 @@ static ERR_STRING_DATA ERR_str_functs[]=
 #endif
 	{ERR_PACK(0,SYS_F_OPENDIR,0),		"opendir"},
 	{ERR_PACK(0,SYS_F_FREAD,0),		"fread"},
+	{ERR_PACK(0,SYS_F_GETADDRINFO,0),	"getaddrinfo"},
 	{0,NULL},
 	};
 
diff --git a/crypto/err/err.h b/crypto/err/err.h
index 723c1f5314..2efa18866a 100644
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -185,6 +185,7 @@ typedef struct err_state_st
 #define SYS_F_WSASTARTUP	9 /* Winsock stuff */
 #define SYS_F_OPENDIR		10
 #define SYS_F_FREAD		11
+#define SYS_F_GETADDRINFO	12
 
 
 /* reasons */
diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
index 65da7599ba..64467db5d0 100644
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -87,12 +87,12 @@ clean:
 
 o_names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 o_names.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/lhash.h
-o_names.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-o_names.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-o_names.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-o_names.o: o_names.c
+o_names.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+o_names.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+o_names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+o_names.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+o_names.o: ../../include/openssl/symhacks.h o_names.c
 obj_dat.o: ../../e_os.h ../../include/openssl/asn1.h
 obj_dat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 obj_dat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index 2380a62656..b30498d925 100644
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -106,8 +106,18 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rc4_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc4.h
-rc4_enc.o: rc4_enc.c rc4_locl.h
-rc4_skey.o: ../../include/openssl/opensslconf.h
+rc4_enc.o: ../../e_os.h ../../include/openssl/bio.h
+rc4_enc.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rc4_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+rc4_enc.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+rc4_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h
+rc4_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rc4_enc.o: ../../include/openssl/symhacks.h ../cryptlib.h rc4_enc.c rc4_locl.h
+rc4_skey.o: ../../e_os.h ../../include/openssl/bio.h
+rc4_skey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rc4_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+rc4_skey.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc4.h
-rc4_skey.o: rc4_locl.h rc4_skey.c
+rc4_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rc4_skey.o: ../../include/openssl/symhacks.h ../cryptlib.h rc4_locl.h
+rc4_skey.o: rc4_skey.c