make update

1 files changed, 87 insertions, 78 deletions

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index a038dea220..af3fb98b43 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -137,43 +137,45 @@ clean:
 cbc_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 cbc_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 cbc_cksm.o: ../../include/openssl/opensslconf.h
-cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-cbc_cksm.o: cbc_cksm.c des_locl.h
+cbc_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cbc_cksm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+cbc_cksm.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+cbc_cksm.o: ../../include/openssl/ui_compat.h cbc_cksm.c des_locl.h
 cbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 cbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 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
+cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+cbc_enc.o: 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: ../../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
-cfb64ede.o: cfb64ede.c des_locl.h
+cfb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cfb64ede.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+cfb64ede.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+cfb64ede.o: ../../include/openssl/ui_compat.h cfb64ede.c des_locl.h
 cfb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 cfb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 cfb64enc.o: ../../include/openssl/opensslconf.h
-cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-cfb64enc.o: cfb64enc.c des_locl.h
+cfb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cfb64enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+cfb64enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+cfb64enc.o: ../../include/openssl/ui_compat.h cfb64enc.c des_locl.h
 cfb_enc.o: ../../e_os.h ../../include/openssl/crypto.h
 cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 cfb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-cfb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-cfb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-cfb_enc.o: cfb_enc.c des_locl.h
+cfb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h
 des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c
+des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+des_enc.o: des_enc.c des_locl.h ncbc_enc.c
 des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
@@ -192,21 +194,23 @@ des_old2.o: des_old2.c
 ecb3_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 ecb3_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ecb3_enc.o: ../../include/openssl/opensslconf.h
-ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-ecb3_enc.o: des_locl.h ecb3_enc.c
+ecb3_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecb3_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecb3_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+ecb3_enc.o: ../../include/openssl/ui_compat.h des_locl.h ecb3_enc.c
 ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-ecb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ecb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-ecb_enc.o: des_locl.h des_ver.h ecb_enc.c spr.h
+ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c
+ecb_enc.o: spr.h
 ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ede_cbcm_enc.o: ../../include/openssl/opensslconf.h
 ede_cbcm_enc.o: ../../include/openssl/opensslv.h
+ede_cbcm_enc.o: ../../include/openssl/ossl_typ.h
 ede_cbcm_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ede_cbcm_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 ede_cbcm_enc.o: ../../include/openssl/ui_compat.h des_locl.h ede_cbcm_enc.c
@@ -215,10 +219,11 @@ enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-enc_read.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-enc_read.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-enc_read.o: ../cryptlib.h des_locl.h enc_read.c
+enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+enc_read.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+enc_read.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h
+enc_read.o: enc_read.c
 enc_writ.o: ../../e_os.h ../../include/openssl/bio.h
 enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
@@ -232,50 +237,52 @@ enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
 fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 fcrypt.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-fcrypt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fcrypt.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fcrypt.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt.c
+fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+fcrypt.o: des_locl.h fcrypt.c
 fcrypt_b.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 fcrypt_b.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 fcrypt_b.o: ../../include/openssl/opensslconf.h
-fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fcrypt_b.o: des_locl.h fcrypt_b.c
+fcrypt_b.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+fcrypt_b.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+fcrypt_b.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+fcrypt_b.o: ../../include/openssl/ui_compat.h des_locl.h fcrypt_b.c
 ofb64ede.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 ofb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ofb64ede.o: ../../include/openssl/opensslconf.h
-ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-ofb64ede.o: des_locl.h ofb64ede.c
+ofb64ede.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ofb64ede.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ofb64ede.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+ofb64ede.o: ../../include/openssl/ui_compat.h des_locl.h ofb64ede.c
 ofb64enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 ofb64enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ofb64enc.o: ../../include/openssl/opensslconf.h
-ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-ofb64enc.o: des_locl.h ofb64enc.c
+ofb64enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ofb64enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ofb64enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+ofb64enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb64enc.c
 ofb_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 ofb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ofb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-ofb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-ofb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-ofb_enc.o: ../../include/openssl/ui_compat.h des_locl.h ofb_enc.c
+ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+ofb_enc.o: des_locl.h ofb_enc.c
 pcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 pcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 pcbc_enc.o: ../../include/openssl/opensslconf.h
-pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-pcbc_enc.o: des_locl.h pcbc_enc.c
+pcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pcbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+pcbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+pcbc_enc.o: ../../include/openssl/ui_compat.h des_locl.h pcbc_enc.c
 qud_cksm.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 qud_cksm.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 qud_cksm.o: ../../include/openssl/opensslconf.h
-qud_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-qud_cksm.o: des_locl.h qud_cksm.c
+qud_cksm.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+qud_cksm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+qud_cksm.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+qud_cksm.o: ../../include/openssl/ui_compat.h des_locl.h qud_cksm.c
 rand_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 rand_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 rand_key.o: ../../include/openssl/opensslconf.h
@@ -287,33 +294,35 @@ rand_key.o: rand_key.c
 read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 read2pwd.o: ../../include/openssl/opensslconf.h
-read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-read2pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-read2pwd.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-read2pwd.o: read2pwd.c
+read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c
 rpc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 rpc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 rpc_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-rpc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rpc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-rpc_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h rpc_des.h
-rpc_enc.o: rpc_enc.c
+rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
 set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-set_key.o: ../../include/openssl/ui_compat.h des_locl.h set_key.c
+set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+set_key.o: des_locl.h set_key.c
 str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-str2key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-str2key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-str2key.o: ../../include/openssl/ui_compat.h des_locl.h str2key.c
+str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+str2key.o: des_locl.h str2key.c
 xcbc_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 xcbc_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 xcbc_enc.o: ../../include/openssl/opensslconf.h
-xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-xcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-xcbc_enc.o: des_locl.h xcbc_enc.c
+xcbc_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+xcbc_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+xcbc_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+xcbc_enc.o: ../../include/openssl/ui_compat.h des_locl.h xcbc_enc.c