make update

libeay.num got tweaked so the old des symbols would retain their
positions.

10 files changed, 252 insertions, 199 deletions

diff --git a/TABLE b/TABLE
index 3d2d00ebb3..1f54906209 100644
--- a/TABLE
+++ b/TABLE
@@ -1122,9 +1122,9 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $dso_scheme   = 
-$shared_target= 
+$shared_target= darwin-shared
 $shared_cflag = -fPIC
-$shared_ldflag = 
+$shared_ldflag = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib
 $shared_extension = 
 $ranlib       = 
 
@@ -1224,6 +1224,30 @@ $shared_ldflag =
 $shared_extension = 
 $ranlib       = 
 
+*** debug-ben-openbsd-debug
+$cc           = gcc
+$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe
+$unistd       = 
+$thread_cflag = (unknown)
+$sys_id       = 
+$lflags       = 
+$bn_ops       = 
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+
 *** debug-ben-strict
 $cc           = gcc
 $cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe
diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 5d155653f4..554d032007 100644
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -114,14 +114,16 @@ conf_mall.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 conf_mall.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
 conf_mall.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 conf_mall.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-conf_mall.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-conf_mall.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-conf_mall.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+conf_mall.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+conf_mall.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+conf_mall.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+conf_mall.o: ../../include/openssl/objects.h
 conf_mall.o: ../../include/openssl/opensslconf.h
 conf_mall.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-conf_mall.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-conf_mall.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+conf_mall.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+conf_mall.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+conf_mall.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 conf_mall.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 conf_mall.o: ../cryptlib.h conf_mall.c
 conf_mod.o: ../../e_os.h ../../include/openssl/asn1.h
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index 456be4e1bf..c6a42842a7 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -141,70 +141,91 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-cbc_cksm.o: ../../include/openssl/opensslconf.h cbc_cksm.c des_locl.h
-cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-cbc_enc.o: ../../include/openssl/opensslconf.h cbc_enc.c des_locl.h ncbc_enc.c
-cfb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-cfb64ede.o: ../../include/openssl/opensslconf.h cfb64ede.c des_locl.h
-cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-cfb64enc.o: ../../include/openssl/opensslconf.h cfb64enc.c des_locl.h
-cfb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-cfb_enc.o: ../../include/openssl/opensslconf.h cfb_enc.c des_locl.h
-des_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-des_enc.o: ../../include/openssl/opensslconf.h des_enc.c des_locl.h ncbc_enc.c
+cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+cbc_cksm.o: ../../include/openssl/symhacks.h cbc_cksm.c des_locl.h
+cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+cbc_enc.o: ../../include/openssl/symhacks.h cbc_enc.c des_locl.h ncbc_enc.c
+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/symhacks.h cfb64ede.c des_locl.h
+cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+cfb64enc.o: ../../include/openssl/symhacks.h cfb64enc.c des_locl.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/symhacks.h cfb_enc.c des_locl.h
+des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+des_enc.o: ../../include/openssl/symhacks.h des_enc.c des_locl.h ncbc_enc.c
 des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
 des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 des_old.o: ../../include/openssl/symhacks.h des_old.c
-ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-ecb3_enc.o: ../../include/openssl/opensslconf.h des_locl.h ecb3_enc.c
-ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-ecb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+ecb3_enc.o: ../../include/openssl/symhacks.h des_locl.h ecb3_enc.c
+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/symhacks.h
 ecb_enc.o: des_locl.h ecb_enc.c spr.h
-ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-ede_cbcm_enc.o: ../../include/openssl/opensslconf.h des_locl.h ede_cbcm_enc.c
+ede_cbcm_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+ede_cbcm_enc.o: ../../include/openssl/e_os2.h
+ede_cbcm_enc.o: ../../include/openssl/opensslconf.h
+ede_cbcm_enc.o: ../../include/openssl/symhacks.h des_locl.h ede_cbcm_enc.c
 enc_read.o: ../../e_os.h ../../include/openssl/bio.h
 enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-enc_read.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-enc_read.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-enc_read.o: ../../include/openssl/opensslconf.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: ../cryptlib.h des_locl.h 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/e_os2.h
-enc_writ.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-enc_writ.o: ../../include/openssl/opensslconf.h
+enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+enc_writ.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+enc_writ.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 enc_writ.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
-fcrypt.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-fcrypt.o: ../../include/openssl/opensslconf.h des_locl.h fcrypt.c
-fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-fcrypt_b.o: ../../include/openssl/opensslconf.h des_locl.h fcrypt_b.c
-ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-ofb64ede.o: ../../include/openssl/opensslconf.h des_locl.h ofb64ede.c
-ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-ofb64enc.o: ../../include/openssl/opensslconf.h des_locl.h ofb64enc.c
-ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-ofb_enc.o: ../../include/openssl/opensslconf.h des_locl.h ofb_enc.c
-pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-pcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h pcbc_enc.c
-qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-qud_cksm.o: ../../include/openssl/opensslconf.h des_locl.h qud_cksm.c
-rand_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-rand_key.o: ../../include/openssl/opensslconf.h
+fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+fcrypt.o: ../../include/openssl/symhacks.h des_locl.h fcrypt.c
+fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+fcrypt_b.o: ../../include/openssl/symhacks.h des_locl.h fcrypt_b.c
+ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+ofb64ede.o: ../../include/openssl/symhacks.h des_locl.h ofb64ede.c
+ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+ofb64enc.o: ../../include/openssl/symhacks.h des_locl.h ofb64enc.c
+ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+ofb_enc.o: ../../include/openssl/symhacks.h des_locl.h ofb_enc.c
+pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+pcbc_enc.o: ../../include/openssl/symhacks.h des_locl.h pcbc_enc.c
+qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+qud_cksm.o: ../../include/openssl/symhacks.h des_locl.h qud_cksm.c
+rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-rand_key.o: rand_key.c
-rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h
+rand_key.o: ../../include/openssl/symhacks.h rand_key.c
+rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+rpc_enc.o: ../../include/openssl/symhacks.h des_locl.h des_ver.h rpc_des.h
 rpc_enc.o: rpc_enc.c
-set_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-set_key.o: ../../include/openssl/opensslconf.h des_locl.h set_key.c
-str2key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-str2key.o: ../../include/openssl/opensslconf.h des_locl.h str2key.c
-xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-xcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h xcbc_enc.c
+set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+set_key.o: ../../include/openssl/symhacks.h des_locl.h set_key.c
+str2key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+str2key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+str2key.o: ../../include/openssl/symhacks.h des_locl.h str2key.c
+xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+xcbc_enc.o: ../../include/openssl/symhacks.h des_locl.h xcbc_enc.c
diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index 4b0ae0552d..5f19fb0bf8 100644
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -99,6 +99,18 @@ eng_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
 eng_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 eng_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 eng_all.o: ../../include/openssl/ui.h eng_all.c eng_int.h
+eng_cnf.o: ../../e_os.h ../../include/openssl/asn1.h
+eng_cnf.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+eng_cnf.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+eng_cnf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+eng_cnf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+eng_cnf.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+eng_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+eng_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_cnf.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_cnf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+eng_cnf.o: ../cryptlib.h eng_cnf.c
 eng_ctrl.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_ctrl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 eng_ctrl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -135,15 +147,16 @@ eng_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 eng_err.o: ../../include/openssl/ui.h eng_err.c
 eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-eng_fat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-eng_fat.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-eng_fat.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-eng_fat.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-eng_fat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-eng_fat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-eng_fat.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_fat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-eng_fat.o: ../../include/openssl/ui.h ../cryptlib.h eng_fat.c eng_int.h
+eng_fat.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+eng_fat.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+eng_fat.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+eng_fat.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+eng_fat.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+eng_fat.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_fat.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+eng_fat.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+eng_fat.o: ../cryptlib.h eng_fat.c eng_int.h
 eng_init.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_init.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 eng_init.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index b467f90ceb..3f166f304a 100644
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -218,23 +218,23 @@ e_cast.o: ../cryptlib.h e_cast.c evp_locl.h
 e_des.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_des.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 e_des.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-e_des.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_des.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-e_des.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_des.o: ../cryptlib.h e_des.c evp_locl.h
+e_des.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+e_des.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+e_des.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+e_des.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_des.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_des.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+e_des.o: ../../include/openssl/symhacks.h ../cryptlib.h e_des.c evp_locl.h
 e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_des3.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 e_des3.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-e_des3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_des3.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-e_des3.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-e_des3.o: ../cryptlib.h e_des3.c evp_locl.h
+e_des3.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+e_des3.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+e_des3.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+e_des3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_des3.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+e_des3.o: ../../include/openssl/symhacks.h ../cryptlib.h e_des3.c evp_locl.h
 e_idea.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_idea.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 e_idea.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -287,10 +287,11 @@ e_rc5.o: ../cryptlib.h e_rc5.c evp_locl.h
 e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h
 e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 e_xcbc_d.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-e_xcbc_d.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_xcbc_d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_xcbc_d.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+e_xcbc_d.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+e_xcbc_d.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+e_xcbc_d.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+e_xcbc_d.o: ../../include/openssl/opensslconf.h
 e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 e_xcbc_d.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 e_xcbc_d.o: ../../include/openssl/symhacks.h ../cryptlib.h e_xcbc_d.c
@@ -444,17 +445,17 @@ m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
 m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_mdc2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 m_mdc2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-m_mdc2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-m_mdc2.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-m_mdc2.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-m_mdc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_mdc2.o: ../cryptlib.h m_mdc2.c
+m_mdc2.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+m_mdc2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h
+m_mdc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_mdc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_mdc2.c
 m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 m_null.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
diff --git a/crypto/mdc2/Makefile.ssl b/crypto/mdc2/Makefile.ssl
index 58bdb0dd9c..5001de4191 100644
--- a/crypto/mdc2/Makefile.ssl
+++ b/crypto/mdc2/Makefile.ssl
@@ -81,12 +81,14 @@ clean:
 
 mdc2_one.o: ../../e_os.h ../../include/openssl/bio.h
 mdc2_one.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-mdc2_one.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-mdc2_one.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-mdc2_one.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
+mdc2_one.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+mdc2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+mdc2_one.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h
+mdc2_one.o: ../../include/openssl/opensslconf.h
 mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 mdc2_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 mdc2_one.o: ../cryptlib.h mdc2_one.c
-mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
-mdc2dgst.o: mdc2dgst.c
+mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/mdc2.h
+mdc2dgst.o: ../../include/openssl/opensslconf.h
+mdc2dgst.o: ../../include/openssl/symhacks.h mdc2dgst.c
diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl
index c3f21b0d47..0159d39434 100644
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -128,19 +128,19 @@ pem_info.o: ../cryptlib.h pem_info.c
 pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 pem_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 pem_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-pem_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-pem_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_lib.o: ../cryptlib.h pem_lib.c
+pem_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pem_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+pem_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+pem_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pem_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
+pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+pem_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_lib.c
 pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h
 pem_oth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 pem_oth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/ui/Makefile.ssl b/crypto/ui/Makefile.ssl
index 02a17203de..24f62fd385 100644
--- a/crypto/ui/Makefile.ssl
+++ b/crypto/ui/Makefile.ssl
@@ -84,7 +84,8 @@ clean:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 ui_compat.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-ui_compat.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+ui_compat.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+ui_compat.o: ../../include/openssl/opensslconf.h
 ui_compat.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 ui_compat.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ui_compat.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 1de7d34e6a..23c5902d55 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -422,16 +422,17 @@ enginetest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 enginetest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
 enginetest.o: enginetest.c
 evp_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-evp_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-evp_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-evp_test.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
-evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h
-evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-evp_test.o: ../include/openssl/rand.h ../include/openssl/rsa.h
-evp_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-evp_test.o: ../include/openssl/symhacks.h ../include/openssl/ui.h evp_test.c
+evp_test.o: ../include/openssl/bn.h ../include/openssl/conf.h
+evp_test.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+evp_test.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+evp_test.o: ../include/openssl/engine.h ../include/openssl/err.h
+evp_test.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+evp_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+evp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+evp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+evp_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+evp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+evp_test.o: ../include/openssl/ui.h evp_test.c
 exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
 exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
@@ -475,12 +476,13 @@ md5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 md5test.o: ../include/openssl/symhacks.h md5test.c
 mdc2test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 mdc2test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-mdc2test.o: ../include/openssl/des.h ../include/openssl/e_os2.h
-mdc2test.o: ../include/openssl/evp.h ../include/openssl/mdc2.h
-mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-mdc2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
-mdc2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h mdc2test.c
+mdc2test.o: ../include/openssl/des.h ../include/openssl/des_old.h
+mdc2test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
+mdc2test.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+mdc2test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+mdc2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+mdc2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+mdc2test.o: ../include/openssl/symhacks.h mdc2test.c
 randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h randtest.c
 rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c
 rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h rc4test.c
diff --git a/util/libeay.num b/util/libeay.num
index c45a1401e8..106806bebd 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -701,8 +701,7 @@ bn_mul_words                            707	EXIST::FUNCTION:
 BN_uadd                                 708	EXIST::FUNCTION:
 BN_usub                                 709	EXIST::FUNCTION:
 bn_sqr_words                            710	EXIST::FUNCTION:
-crypt                                   711	EXIST:!NeXT,!PERL5,!VMS,!WIN16,!__FreeBSD__:FUNCTION:DES
-ocrypt                                  711	EXIST:!NeXT,!PERL5,!__FreeBSD__,VMS,WIN16:FUNCTION:DES
+_old_crypt                              711	EXIST:!NeXT,!PERL5,!__FreeBSD__:FUNCTION:DES
 d2i_ASN1_BIT_STRING                     712	EXIST::FUNCTION:
 d2i_ASN1_BOOLEAN                        713	EXIST::FUNCTION:
 d2i_ASN1_HEADER                         714	EXIST::FUNCTION:
@@ -793,8 +792,7 @@ DES_options                             799	EXIST::FUNCTION:DES
 DES_pcbc_encrypt                        800	EXIST::FUNCTION:DES
 DES_quad_cksum                          801	EXIST::FUNCTION:DES
 DES_random_key                          802	EXIST::FUNCTION:DES
-des_random_seed                         803	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_random_seed                        803	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_random_seed                    803	EXIST::FUNCTION:DES
 des_read_2passwords                     804	EXIST::FUNCTION:DES
 des_read_password                       805	EXIST::FUNCTION:DES
 des_read_pw                             806	EXIST::FUNCTION:
@@ -1992,22 +1990,19 @@ i2d_OCSP_SERVICELOC                     2562	EXIST::FUNCTION:
 ENGINE_get_digest_engine                2563	EXIST::FUNCTION:
 EC_GROUP_set_curve_GFp                  2564	EXIST::FUNCTION:EC
 OCSP_REQUEST_get_ext_by_OBJ             2565	EXIST::FUNCTION:
-des_random_key                          2566	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_random_key                         2566	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_random_key                     2566	EXIST::FUNCTION:DES
 ASN1_T61STRING_it                       2567	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_T61STRING_it                       2567	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EC_GROUP_method_of                      2568	EXIST::FUNCTION:EC
 i2d_KRB5_APREQ                          2569	EXIST::FUNCTION:
-des_encrypt                             2570	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_encrypt                            2570	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_encrypt                        2570	EXIST::FUNCTION:DES
 ASN1_PRINTABLE_new                      2571	EXIST::FUNCTION:
 HMAC_Init_ex                            2572	EXIST::FUNCTION:HMAC
 d2i_KRB5_AUTHENT                        2573	EXIST::FUNCTION:
 OCSP_archive_cutoff_new                 2574	EXIST::FUNCTION:
 EC_POINT_set_Jprojective_coordinates_GFp 2575	EXIST:!VMS:FUNCTION:EC
 EC_POINT_set_Jproj_coords_GFp           2575	EXIST:VMS:FUNCTION:EC
-des_is_weak_key                         2576	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_is_weak_key                        2576	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_is_weak_key                    2576	EXIST::FUNCTION:DES
 OCSP_BASICRESP_get_ext_by_OBJ           2577	EXIST::FUNCTION:
 EC_POINT_oct2point                      2578	EXIST::FUNCTION:EC
 OCSP_SINGLERESP_get_ext_count           2579	EXIST::FUNCTION:
@@ -2048,8 +2043,7 @@ ENGINE_register_RAND                    2609	EXIST::FUNCTION:
 OCSP_SERVICELOC_new                     2610	EXIST::FUNCTION:
 EC_POINT_set_affine_coordinates_GFp     2611	EXIST:!VMS:FUNCTION:EC
 EC_POINT_set_affine_coords_GFp          2611	EXIST:VMS:FUNCTION:EC
-des_options                             2612	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_options                            2612	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_options                        2612	EXIST::FUNCTION:DES
 SXNET_it                                2613	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 SXNET_it                                2613	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_dup_input_boolean                    2614	EXIST::FUNCTION:
@@ -2095,15 +2089,13 @@ OCSP_BASICRESP_get_ext_by_crit          2646	EXIST:VMS:FUNCTION:
 OCSP_cert_status_str                    2647	EXIST::FUNCTION:
 d2i_OCSP_REQUEST                        2648	EXIST::FUNCTION:
 UI_dup_info_string                      2649	EXIST::FUNCTION:
-des_xwhite_in2out                       2650	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_xwhite_in2out                      2650	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_xwhite_in2out                  2650	EXIST::FUNCTION:DES
 PKCS12_it                               2651	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_it                               2651	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_SINGLERESP_get_ext_by_critical     2652	EXIST:!VMS:FUNCTION:
 OCSP_SINGLERESP_get_ext_by_crit         2652	EXIST:VMS:FUNCTION:
 OCSP_CERTSTATUS_free                    2653	EXIST::FUNCTION:
-des_crypt                               2654	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_crypt                              2654	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_crypt                          2654	EXIST::FUNCTION:DES
 ASN1_item_i2d                           2655	EXIST::FUNCTION:
 EVP_DecryptFinal_ex                     2656	EXIST::FUNCTION:
 ENGINE_load_openssl                     2657	EXIST::FUNCTION:
@@ -2116,8 +2108,7 @@ X509_get0_pubkey_bitstr                 2662	EXIST::FUNCTION:
 asn1_ex_i2c                             2663	EXIST::FUNCTION:
 ENGINE_register_RSA                     2664	EXIST::FUNCTION:
 ENGINE_unregister_DSA                   2665	EXIST::FUNCTION:
-des_key_sched                           2666	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_key_sched                          2666	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_key_sched                      2666	EXIST::FUNCTION:DES
 X509_EXTENSION_it                       2667	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_EXTENSION_it                       2667	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 i2d_KRB5_AUTHENT                        2668	EXIST::FUNCTION:
@@ -2126,8 +2117,7 @@ SXNETID_it                              2669	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 d2i_OCSP_SINGLERESP                     2670	EXIST::FUNCTION:
 EDIPARTYNAME_new                        2671	EXIST::FUNCTION:
 PKCS12_certbag2x509                     2672	EXIST::FUNCTION:
-des_ofb64_encrypt                       2673	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ofb64_encrypt                      2673	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ofb64_encrypt                  2673	EXIST::FUNCTION:DES
 d2i_EXTENDED_KEY_USAGE                  2674	EXIST::FUNCTION:
 ERR_print_errors_cb                     2675	EXIST::FUNCTION:
 ENGINE_set_ciphers                      2676	EXIST::FUNCTION:
@@ -2135,8 +2125,7 @@ d2i_KRB5_APREQBODY                      2677	EXIST::FUNCTION:
 UI_method_get_flusher                   2678	EXIST::FUNCTION:
 X509_PUBKEY_it                          2679	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_PUBKEY_it                          2679	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-des_enc_read                            2680	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_enc_read                           2680	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_enc_read                       2680	EXIST::FUNCTION:DES
 PKCS7_ENCRYPT_it                        2681	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_ENCRYPT_it                        2681	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 i2d_OCSP_RESPONSE                       2682	EXIST::FUNCTION:
@@ -2164,8 +2153,7 @@ EC_GROUP_get_order                      2701	EXIST::FUNCTION:EC
 d2i_OCSP_RESPID                         2702	EXIST::FUNCTION:
 OCSP_request_verify                     2703	EXIST::FUNCTION:
 NCONF_get_number_e                      2704	EXIST::FUNCTION:
-des_decrypt3                            2705	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_decrypt3                           2705	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_decrypt3                       2705	EXIST::FUNCTION:DES
 X509_signature_print                    2706	EXIST::FUNCTION:EVP
 OCSP_SINGLERESP_free                    2707	EXIST::FUNCTION:
 ENGINE_load_builtin_engines             2708	EXIST::FUNCTION:
@@ -2189,15 +2177,13 @@ ASN1_IA5STRING_it                       2722	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_IA5STRING_it                       2722	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_get_input_flags                      2723	EXIST::FUNCTION:
 EC_GROUP_set_generator                  2724	EXIST::FUNCTION:EC
-des_string_to_2keys                     2725	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_string_to_2keys                    2725	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_string_to_2keys                2725	EXIST::FUNCTION:DES
 OCSP_CERTID_free                        2726	EXIST::FUNCTION:
 X509_CERT_AUX_it                        2727	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_CERT_AUX_it                        2727	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CERTIFICATEPOLICIES_it                  2728	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 CERTIFICATEPOLICIES_it                  2728	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-des_ede3_cbc_encrypt                    2729	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ede3_cbc_encrypt                   2729	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ede3_cbc_encrypt               2729	EXIST::FUNCTION:DES
 RAND_set_rand_engine                    2730	EXIST::FUNCTION:
 DSO_get_loaded_filename                 2731	EXIST::FUNCTION:
 X509_ATTRIBUTE_it                       2732	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2257,8 +2243,7 @@ X509_it                                 2773	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 X509_it                                 2773	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 BN_mod_add                              2774	EXIST::FUNCTION:
 KRB5_AUTHDATA_free                      2775	EXIST::FUNCTION:
-des_cbc_cksum                           2776	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_cbc_cksum                          2776	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_cbc_cksum                      2776	EXIST::FUNCTION:DES
 ASN1_item_verify                        2777	EXIST::FUNCTION:EVP
 CRYPTO_set_mem_ex_functions             2778	EXIST::FUNCTION:
 EC_POINT_get_Jprojective_coordinates_GFp 2779	EXIST:!VMS:FUNCTION:EC
@@ -2271,8 +2256,7 @@ ASN1_TIME_check                         2782	EXIST::FUNCTION:
 UI_get0_user_data                       2783	EXIST::FUNCTION:
 HMAC_CTX_cleanup                        2784	EXIST::FUNCTION:HMAC
 DSA_up_ref                              2785	EXIST::FUNCTION:DSA
-des_ede3_cfb64_encrypt                  2786	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ede3_cfb64_encrypt                 2786	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ede3_cfb64_encrypt             2786	EXIST::FUNCTION:DES
 ASN1_BMPSTRING_it                       2787	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_BMPSTRING_it                       2787	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ASN1_tag2bit                            2788	EXIST::FUNCTION:
@@ -2303,8 +2287,7 @@ AUTHORITY_INFO_ACCESS_it                2805	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 ASN1_FBOOLEAN_it                        2806	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_FBOOLEAN_it                        2806	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_set_ex_data                          2807	EXIST::FUNCTION:
-des_string_to_key                       2808	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_string_to_key                      2808	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_string_to_key                  2808	EXIST::FUNCTION:DES
 ENGINE_register_all_RSA                 2809	EXIST::FUNCTION:
 d2i_KRB5_PRINCNAME                      2810	EXIST::FUNCTION:
 OCSP_RESPBYTES_it                       2811	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2315,8 +2298,7 @@ ENGINE_unregister_digests               2813	EXIST::FUNCTION:
 d2i_EDIPARTYNAME                        2814	EXIST::FUNCTION:
 d2i_OCSP_SERVICELOC                     2815	EXIST::FUNCTION:
 ENGINE_get_digests                      2816	EXIST::FUNCTION:
-des_set_odd_parity                      2817	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_set_odd_parity                     2817	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_set_odd_parity                 2817	EXIST::FUNCTION:DES
 OCSP_RESPDATA_free                      2818	EXIST::FUNCTION:
 d2i_KRB5_TICKET                         2819	EXIST::FUNCTION:
 OTHERNAME_it                            2820	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2336,8 +2318,7 @@ EC_POINT_mul                            2831	EXIST::FUNCTION:EC
 X509V3_EXT_add_nconf                    2832	EXIST::FUNCTION:
 X509_TRUST_set                          2833	EXIST::FUNCTION:
 X509_CRL_add1_ext_i2d                   2834	EXIST::FUNCTION:
-des_fcrypt                              2835	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_fcrypt                             2835	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_fcrypt                         2835	EXIST::FUNCTION:DES
 DISPLAYTEXT_it                          2836	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 DISPLAYTEXT_it                          2836	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_CRL_set_lastUpdate                 2837	EXIST::FUNCTION:
@@ -2359,8 +2340,7 @@ UI_get0_action_string                   2850	EXIST::FUNCTION:
 OCSP_ONEREQ_get_ext                     2851	EXIST::FUNCTION:
 EC_POINT_method_of                      2852	EXIST::FUNCTION:EC
 i2d_KRB5_APREQBODY                      2853	EXIST::FUNCTION:
-des_ecb3_encrypt                        2854	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ecb3_encrypt                       2854	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ecb3_encrypt                   2854	EXIST::FUNCTION:DES
 CRYPTO_get_mem_ex_functions             2855	EXIST::FUNCTION:
 ENGINE_get_ex_data                      2856	EXIST::FUNCTION:
 UI_destroy_method                       2857	EXIST::FUNCTION:
@@ -2393,8 +2373,7 @@ ASN1_BIT_STRING_it                      2878	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_BIT_STRING_it                      2878	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_REQ_it                             2879	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_REQ_it                             2879	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-des_cbc_encrypt                         2880	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_cbc_encrypt                        2880	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_cbc_encrypt                    2880	EXIST::FUNCTION:DES
 ERR_unload_strings                      2881	EXIST::FUNCTION:
 PKCS7_SIGN_ENVELOPE_it                  2882	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_SIGN_ENVELOPE_it                  2882	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2488,8 +2467,7 @@ OCSP_id_get0_info                       2960	EXIST::FUNCTION:
 BN_mod_sqrt                             2961	EXIST::FUNCTION:
 EC_GROUP_copy                           2962	EXIST::FUNCTION:EC
 KRB5_ENCDATA_free                       2963	EXIST::FUNCTION:
-des_cfb_encrypt                         2964	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_cfb_encrypt                        2964	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_cfb_encrypt                    2964	EXIST::FUNCTION:DES
 OCSP_SINGLERESP_get_ext_by_OBJ          2965	EXIST::FUNCTION:
 OCSP_cert_to_id                         2966	EXIST::FUNCTION:
 OCSP_RESPID_new                         2967	EXIST::FUNCTION:
@@ -2517,8 +2495,7 @@ KRB5_APREQ_new                          2984	EXIST::FUNCTION:
 EC_GROUP_get_curve_GFp                  2985	EXIST::FUNCTION:EC
 KRB5_ENCKEY_new                         2986	EXIST::FUNCTION:
 ASN1_template_d2i                       2987	EXIST::FUNCTION:
-des_quad_cksum                          2988	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_quad_cksum                         2988	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_quad_cksum                     2988	EXIST::FUNCTION:DES
 OCSP_single_get0_status                 2989	EXIST::FUNCTION:
 BN_swap                                 2990	EXIST::FUNCTION:
 POLICYINFO_it                           2991	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2530,10 +2507,8 @@ OCSP_RESPID_it                          2994	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 EC_GROUP_new                            2995	EXIST::FUNCTION:EC
 EVP_aes_256_cbc                         2996	EXIST::FUNCTION:AES
 i2d_KRB5_PRINCNAME                      2997	EXIST::FUNCTION:
-des_encrypt2                            2998	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_encrypt2                           2998	EXIST:VMS,WIN16:FUNCTION:DES
-des_encrypt3                            2999	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_encrypt3                           2999	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_encrypt2                       2998	EXIST::FUNCTION:DES
+_old_des_encrypt3                       2999	EXIST::FUNCTION:DES
 PKCS8_PRIV_KEY_INFO_it                  3000	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS8_PRIV_KEY_INFO_it                  3000	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_REQINFO_it                         3001	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2551,8 +2526,7 @@ ENGINE_get_cipher_engine                3008	EXIST::FUNCTION:
 ENGINE_register_all_ciphers             3009	EXIST::FUNCTION:
 EC_POINT_copy                           3010	EXIST::FUNCTION:EC
 BN_kronecker                            3011	EXIST::FUNCTION:
-des_ede3_ofb64_encrypt                  3012	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ede3_ofb64_encrypt                 3012	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ede3_ofb64_encrypt             3012	EXIST::FUNCTION:DES
 UI_method_get_reader                    3013	EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_count            3014	EXIST::FUNCTION:
 ASN1_ENUMERATED_it                      3015	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2564,8 +2538,7 @@ EVP_CIPHER_CTX_set_padding              3019	EXIST::FUNCTION:
 d2i_OCSP_RESPONSE                       3020	EXIST::FUNCTION:
 ASN1_UTCTIME_it                         3021	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_UTCTIME_it                         3021	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-des_enc_write                           3022	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_enc_write                          3022	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_enc_write                      3022	EXIST::FUNCTION:DES
 OCSP_RESPONSE_new                       3023	EXIST::FUNCTION:
 AES_set_encrypt_key                     3024	EXIST::FUNCTION:AES
 OCSP_resp_count                         3025	EXIST::FUNCTION:
@@ -2583,8 +2556,7 @@ OCSP_REQUEST_new                        3034	EXIST::FUNCTION:
 ASN1_ANY_it                             3035	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_ANY_it                             3035	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CRYPTO_ex_data_new_class                3036	EXIST::FUNCTION:
-des_ncbc_encrypt                        3037	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ncbc_encrypt                       3037	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ncbc_encrypt                   3037	EXIST::FUNCTION:DES
 i2d_KRB5_TKTBODY                        3038	EXIST::FUNCTION:
 EC_POINT_clear_free                     3039	EXIST::FUNCTION:EC
 AES_decrypt                             3040	EXIST::FUNCTION:AES
@@ -2603,8 +2575,7 @@ i2d_EXTENDED_KEY_USAGE                  3052	EXIST::FUNCTION:
 i2d_OCSP_SIGNATURE                      3053	EXIST::FUNCTION:
 asn1_enc_save                           3054	EXIST::FUNCTION:
 ENGINE_load_nuron                       3055	EXIST::FUNCTION:
-des_pcbc_encrypt                        3056	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_pcbc_encrypt                       3056	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_pcbc_encrypt                   3056	EXIST::FUNCTION:DES
 PKCS12_MAC_DATA_it                      3057	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_MAC_DATA_it                      3057	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_accept_responses_new               3058	EXIST::FUNCTION:
@@ -2616,8 +2587,7 @@ KRB5_APREQBODY_it                       3061	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 i2d_OCSP_SINGLERESP                     3062	EXIST::FUNCTION:
 ASN1_item_ex_new                        3063	EXIST::FUNCTION:
 UI_add_verify_string                    3064	EXIST::FUNCTION:
-des_set_key                             3065	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_set_key                            3065	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_set_key                        3065	EXIST::FUNCTION:DES
 KRB5_PRINCNAME_it                       3066	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_PRINCNAME_it                       3066	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EVP_DecryptInit_ex                      3067	EXIST::FUNCTION:
@@ -2641,11 +2611,9 @@ OCSP_BASICRESP_get_ext_by_NID           3083	EXIST::FUNCTION:
 DIST_POINT_NAME_it                      3084	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 DIST_POINT_NAME_it                      3084	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509V3_extensions_print                 3085	EXIST::FUNCTION:
-des_cfb64_encrypt                       3086	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_cfb64_encrypt                      3086	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_cfb64_encrypt                  3086	EXIST::FUNCTION:DES
 X509_REVOKED_add1_ext_i2d               3087	EXIST::FUNCTION:
-des_ofb_encrypt                         3088	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ofb_encrypt                        3088	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ofb_encrypt                    3088	EXIST::FUNCTION:DES
 KRB5_TKTBODY_new                        3089	EXIST::FUNCTION:
 ASN1_OCTET_STRING_it                    3090	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_OCTET_STRING_it                    3090	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2734,15 +2702,13 @@ EVP_aes_192_cbc                         3155	EXIST::FUNCTION:AES
 KRB5_TICKET_free                        3156	EXIST::FUNCTION:
 UI_new                                  3157	EXIST::FUNCTION:
 OCSP_response_create                    3158	EXIST::FUNCTION:
-des_xcbc_encrypt                        3159	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_xcbc_encrypt                       3159	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_xcbc_encrypt                   3159	EXIST::FUNCTION:DES
 PKCS7_it                                3160	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_it                                3160	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_REQUEST_get_ext_by_critical        3161	EXIST:!VMS:FUNCTION:
 OCSP_REQUEST_get_ext_by_crit            3161	EXIST:VMS:FUNCTION:
 ENGINE_set_flags                        3162	EXIST::FUNCTION:
-des_ecb_encrypt                         3163	EXIST:!VMS,!WIN16:FUNCTION:DES
-odes_ecb_encrypt                        3163	EXIST:VMS,WIN16:FUNCTION:DES
+_old_des_ecb_encrypt                    3163	EXIST::FUNCTION:DES
 OCSP_response_get1_basic                3164	EXIST::FUNCTION:
 EVP_Digest                              3165	EXIST::FUNCTION:
 OCSP_ONEREQ_delete_ext                  3166	EXIST::FUNCTION:
@@ -2766,3 +2732,24 @@ ASN1_OBJECT_it                          3180	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_OBJECT_it                          3180	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_crlID_new                          3181	EXIST:!VMS,!WIN16:FUNCTION:
 OCSP_crlID2_new                         3181	EXIST:VMS,WIN16:FUNCTION:
+CONF_modules_load_file                  3182	EXIST::FUNCTION:
+CONF_imodule_set_usr_data               3183	EXIST::FUNCTION:
+ENGINE_set_default_string               3184	EXIST::FUNCTION:
+CONF_module_get_usr_data                3185	EXIST::FUNCTION:
+ASN1_add_oid_module                     3186	EXIST::FUNCTION:
+CONF_modules_finish                     3187	EXIST::FUNCTION:
+OPENSSL_config                          3188	EXIST::FUNCTION:
+CONF_modules_unload                     3189	EXIST::FUNCTION:
+CONF_imodule_get_value                  3190	EXIST::FUNCTION:
+CONF_module_set_usr_data                3191	EXIST::FUNCTION:
+CONF_parse_list                         3192	EXIST::FUNCTION:
+CONF_module_add                         3193	EXIST::FUNCTION:
+CONF_get1_default_config_file           3194	EXIST::FUNCTION:
+CONF_imodule_get_flags                  3195	EXIST::FUNCTION:
+CONF_imodule_get_module                 3196	EXIST::FUNCTION:
+CONF_modules_load                       3197	EXIST::FUNCTION:
+CONF_imodule_get_name                   3198	EXIST::FUNCTION:
+ERR_peek_top_error                      3199	EXIST::FUNCTION:
+CONF_imodule_get_usr_data               3200	EXIST::FUNCTION:
+CONF_imodule_set_flags                  3201	EXIST::FUNCTION:
+ENGINE_add_conf_module                  3202	EXIST::FUNCTION: