"make update".

8 files changed, 93 insertions, 59 deletions

diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl
index a84a0c9523..8ca341ab28 100644
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -123,7 +123,8 @@ bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bf_nbio.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bf_nbio.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_nbio.c
+bf_nbio.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bf_nbio.o: ../cryptlib.h bf_nbio.c
 bf_null.o: ../../e_os.h ../../include/openssl/bio.h
 bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bf_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index 30dd88863c..d9c0a682d4 100644
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -285,8 +285,8 @@ bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bn_prime.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_prime.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 bn_prime.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bn_prime.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_prime.c
-bn_prime.o: bn_prime.h
+bn_prime.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bn_prime.o: ../cryptlib.h bn_lcl.h bn_prime.c bn_prime.h
 bn_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bn_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -300,7 +300,8 @@ bn_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bn_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 bn_rand.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bn_rand.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_rand.c
+bn_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+bn_rand.o: ../cryptlib.h bn_lcl.h bn_rand.c
 bn_recp.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bn_recp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index c13a802e68..f12d82b81f 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -175,8 +175,8 @@ enc_writ.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 enc_writ.o: ../../include/openssl/opensslconf.h
 enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-enc_writ.o: ../../include/openssl/symhacks.h ../cryptlib.h des_locl.h
-enc_writ.o: enc_writ.c
+enc_writ.o: ../../include/openssl/symhacks.h ../../include/openssl/types.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
@@ -193,7 +193,7 @@ 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 ../../include/openssl/rand.h
-rand_key.o: rand_key.c
+rand_key.o: ../../include/openssl/types.h 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
 rpc_enc.o: rpc_enc.c
diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl
index aa9ca7b2bb..1e8f135af6 100644
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -96,21 +96,22 @@ dh_check.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dh_check.o: ../../include/openssl/opensslconf.h
 dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 dh_check.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_check.o: ../cryptlib.h dh_check.c
+dh_check.o: ../../include/openssl/types.h ../cryptlib.h dh_check.c
 dh_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dh_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
 dh_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 dh_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 dh_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 dh_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-dh_err.o: dh_err.c
+dh_err.o: ../../include/openssl/types.h dh_err.c
 dh_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h
 dh_gen.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dh_gen.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_gen.c
+dh_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dh_gen.o: ../cryptlib.h dh_gen.c
 dh_key.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 dh_key.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 dh_key.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index 2029e8db94..cf761639cb 100644
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -97,7 +97,8 @@ dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 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_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dsa_err.o: dsa_err.c
 dsa_gen.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -117,7 +118,8 @@ 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/stack.h
-dsa_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_key.c
+dsa_key.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+dsa_key.o: ../cryptlib.h dsa_key.c
 dsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index 11c1a614d9..e869958344 100644
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -92,13 +92,15 @@ md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 md_rand.o: ../../include/openssl/types.h md_rand.c rand_lcl.h
 rand_egd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-rand_egd.o: ../../include/openssl/rand.h rand_egd.c
+rand_egd.o: ../../include/openssl/rand.h ../../include/openssl/types.h
+rand_egd.o: rand_egd.c
 rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 rand_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rand_err.o: ../../include/openssl/symhacks.h rand_err.c
+rand_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+rand_err.o: rand_err.c
 rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rand_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -148,4 +150,5 @@ 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
 randfile.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-randfile.o: ../../include/openssl/symhacks.h randfile.c
+randfile.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h
+randfile.o: randfile.c
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index d71f270be7..4d599fc137 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -380,17 +380,21 @@ destest.o: ../include/openssl/des.h ../include/openssl/e_os2.h
 destest.o: ../include/openssl/opensslconf.h destest.c
 dhtest.o: ../include/openssl/bio.h ../include/openssl/bn.h
 dhtest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
-dhtest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
+dhtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+dhtest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
 dhtest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
 dhtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-dhtest.o: ../include/openssl/symhacks.h dhtest.c
-dsatest.o: ../include/openssl/bio.h ../include/openssl/bn.h
-dsatest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
-dsatest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+dhtest.o: ../include/openssl/symhacks.h ../include/openssl/types.h dhtest.c
+dsatest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+dsatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
+dsatest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+dsatest.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
 dsatest.o: ../include/openssl/err.h ../include/openssl/lhash.h
 dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dsatest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h dsatest.c
+dsatest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+dsatest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+dsatest.o: ../include/openssl/symhacks.h ../include/openssl/types.h
+dsatest.o: ../include/openssl/ui.h dsatest.c
 ectest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 ectest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
 ectest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
@@ -427,7 +431,8 @@ exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
 exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 exptest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-exptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h exptest.c
+exptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+exptest.o: ../include/openssl/types.h exptest.c
 hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 hmactest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
 hmactest.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
@@ -470,7 +475,7 @@ 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/safestack.h ../include/openssl/stack.h
 mdc2test.o: ../include/openssl/symhacks.h ../include/openssl/types.h mdc2test.c
-randtest.o: ../include/openssl/rand.h randtest.c
+randtest.o: ../include/openssl/rand.h ../include/openssl/types.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
 rc5test.o: ../include/openssl/rc5.h rc5test.c
@@ -484,12 +489,14 @@ rmdtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 rmdtest.o: ../include/openssl/types.h rmdtest.c
 rsa_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-rsa_test.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
-rsa_test.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-rsa_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-rsa_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-rsa_test.o: ../include/openssl/types.h rsa_test.c
+rsa_test.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+rsa_test.o: ../include/openssl/err.h ../include/openssl/lhash.h
+rsa_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+rsa_test.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+rsa_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+rsa_test.o: ../include/openssl/symhacks.h ../include/openssl/types.h
+rsa_test.o: ../include/openssl/ui.h rsa_test.c
 sha1test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 sha1test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
 sha1test.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
diff --git a/util/libeay.num b/util/libeay.num
index 05d9b6462f..d6e48afb36 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -483,7 +483,7 @@ RSA_private_decrypt                     490	EXIST::FUNCTION:RSA
 RSA_private_encrypt                     491	EXIST::FUNCTION:RSA
 RSA_public_decrypt                      492	EXIST::FUNCTION:RSA
 RSA_public_encrypt                      493	EXIST::FUNCTION:RSA
-RSA_set_default_method                  494	NOEXIST::FUNCTION:
+RSA_set_default_method                  494	EXIST::FUNCTION:RSA
 RSA_sign                                495	EXIST::FUNCTION:RSA
 RSA_sign_ASN1_OCTET_STRING              496	EXIST::FUNCTION:RSA
 RSA_size                                497	EXIST::FUNCTION:RSA
@@ -1465,7 +1465,7 @@ d2i_ASN1_SET_OF_ASN1_OBJECT             1844	NOEXIST::FUNCTION:
 PKCS7_signatureVerify                   1845	EXIST::FUNCTION:
 RSA_set_method                          1846	EXIST::FUNCTION:RSA
 RSA_get_method                          1847	EXIST::FUNCTION:RSA
-RSA_get_default_method                  1848	NOEXIST::FUNCTION:
+RSA_get_default_method                  1848	EXIST::FUNCTION:RSA
 RSA_check_key                           1869	EXIST::FUNCTION:RSA
 OBJ_obj2txt                             1870	EXIST::FUNCTION:
 DSA_dup_DH                              1871	EXIST::FUNCTION:DH,DSA
@@ -1489,9 +1489,9 @@ DSA_new_method                          1888	EXIST::FUNCTION:DSA
 DH_new_method                           1889	EXIST::FUNCTION:DH
 DH_OpenSSL                              1890	EXIST::FUNCTION:DH
 DSA_get_ex_new_index                    1891	EXIST::FUNCTION:DSA
-DH_get_default_method                   1892	NOEXIST::FUNCTION:
+DH_get_default_method                   1892	EXIST::FUNCTION:DH
 DSA_set_ex_data                         1893	EXIST::FUNCTION:DSA
-DH_set_default_method                   1894	NOEXIST::FUNCTION:
+DH_set_default_method                   1894	EXIST::FUNCTION:DH
 DSA_get_ex_data                         1895	EXIST::FUNCTION:DSA
 X509V3_EXT_REQ_add_conf                 1896	EXIST::FUNCTION:
 NETSCAPE_SPKI_print                     1897	EXIST::FUNCTION:EVP
@@ -1527,7 +1527,7 @@ EVP_PKEY_get1_DSA                       1935	EXIST::FUNCTION:DSA
 ASN1_BMPSTRING_new                      1936	EXIST::FUNCTION:
 ASN1_mbstring_copy                      1937	EXIST::FUNCTION:
 ASN1_UTF8STRING_new                     1938	EXIST::FUNCTION:
-DSA_get_default_method                  1941	NOEXIST::FUNCTION:
+DSA_get_default_method                  1941	EXIST::FUNCTION:DSA
 i2d_ASN1_SET_OF_ACCESS_DESCRIPTION      1945	NOEXIST::FUNCTION:
 ASN1_T61STRING_free                     1946	EXIST::FUNCTION:
 DSA_set_method                          1949	EXIST::FUNCTION:DSA
@@ -1562,7 +1562,7 @@ i2d_RSA_PUBKEY_bio                      1985	EXIST::FUNCTION:BIO,RSA
 ASN1_BIT_STRING_num_asc                 1986	EXIST::FUNCTION:
 i2d_PUBKEY                              1987	EXIST::FUNCTION:
 ASN1_UTCTIME_free                       1988	EXIST::FUNCTION:
-DSA_set_default_method                  1989	NOEXIST::FUNCTION:
+DSA_set_default_method                  1989	EXIST::FUNCTION:DSA
 X509_PURPOSE_get_by_id                  1990	EXIST::FUNCTION:
 ACCESS_DESCRIPTION_free                 1994	EXIST::FUNCTION:
 PEM_read_bio_PUBKEY                     1995	EXIST::FUNCTION:
@@ -1902,8 +1902,8 @@ X509V3_EXT_nconf                        2480	EXIST::FUNCTION:
 ASN1_GENERALSTRING_free                 2481	EXIST::FUNCTION:
 d2i_OCSP_CERTSTATUS                     2482	EXIST::FUNCTION:
 ENGINE_by_id                            2483	EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp_crt       2484	EXIST:!VMS:FUNCTION:
-ENGINE_get_def_BN_mod_exp_crt           2484	EXIST:VMS:FUNCTION:
+ENGINE_get_default_BN_mod_exp_crt       2484	NOEXIST::FUNCTION:
+ENGINE_get_def_BN_mod_exp_crt           2484	NOEXIST::FUNCTION:
 X509_REVOKED_set_serialNumber           2485	EXIST::FUNCTION:
 X509_print_ex                           2486	EXIST::FUNCTION:BIO
 OCSP_ONEREQ_get1_ext_d2i                2487	EXIST::FUNCTION:
@@ -1914,7 +1914,7 @@ EC_GROUP_clear_free                     2490	EXIST::FUNCTION:
 OCSP_sendreq_bio                        2491	EXIST::FUNCTION:
 ASN1_item_digest                        2492	EXIST::FUNCTION:EVP
 OCSP_BASICRESP_delete_ext               2493	EXIST::FUNCTION:
-ENGINE_set_BN_mod_exp_crt               2494	EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp_crt               2494	NOEXIST::FUNCTION:
 OCSP_SIGNATURE_it                       2495	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_SIGNATURE_it                       2495	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_CRL_it                             2496	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2052,10 +2052,10 @@ X509_PUBKEY_it                          2606	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 X509_PUBKEY_it                          2606	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 PKCS7_ENCRYPT_it                        2607	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_ENCRYPT_it                        2607	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-DH_get_default_openssl_method           2608	EXIST::FUNCTION:DH
+DH_get_default_openssl_method           2608	NOEXIST::FUNCTION:
 i2d_OCSP_RESPONSE                       2609	EXIST::FUNCTION:
 EC_GROUP_get_cofactor                   2610	EXIST::FUNCTION:
-ENGINE_clear_defaults                   2611	EXIST::FUNCTION:
+ENGINE_clear_defaults                   2611	NOEXIST::FUNCTION:
 PKCS12_unpack_p7data                    2612	EXIST::FUNCTION:
 d2i_KRB5_AUTHDATA                       2613	EXIST::FUNCTION:
 OCSP_copy_nonce                         2614	EXIST::FUNCTION:
@@ -2088,7 +2088,7 @@ ENGINE_load_builtin_engines             2638	EXIST::FUNCTION:
 i2d_OCSP_ONEREQ                         2639	EXIST::FUNCTION:
 OCSP_REQUEST_add_ext                    2640	EXIST::FUNCTION:
 OCSP_RESPBYTES_new                      2641	EXIST::FUNCTION:
-ENGINE_get_default_BN_mod_exp           2642	EXIST::FUNCTION:
+ENGINE_get_default_BN_mod_exp           2642	NOEXIST::FUNCTION:
 EVP_MD_CTX_create                       2643	EXIST::FUNCTION:
 OCSP_resp_find_status                   2644	EXIST::FUNCTION:
 X509_ALGOR_it                           2645	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2103,7 +2103,7 @@ PKCS12_AUTHSAFES_it                     2650	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 ENGINE_get_prev                         2651	EXIST::FUNCTION:
 EVP_aes_256_ecb                         2652	EXIST::FUNCTION:AES
 PKCS12_pack_authsafes                   2653	EXIST::FUNCTION:
-DSA_get_default_openssl_method          2654	EXIST::FUNCTION:DSA
+DSA_get_default_openssl_method          2654	NOEXIST::FUNCTION:
 ASN1_IA5STRING_it                       2655	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_IA5STRING_it                       2655	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_get_input_flags                      2656	EXIST::FUNCTION:
@@ -2149,7 +2149,7 @@ PBE2PARAM_it                            2684	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 PKCS12_certbag2x509crl                  2685	EXIST::FUNCTION:
 PKCS7_SIGNED_it                         2686	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_SIGNED_it                         2686	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_cipher                       2687	EXIST::FUNCTION:
+ENGINE_get_cipher                       2687	NOEXIST::FUNCTION:
 i2d_OCSP_CRLID                          2688	EXIST::FUNCTION:
 OCSP_SINGLERESP_new                     2689	EXIST::FUNCTION:
 ENGINE_cmd_is_executable                2690	EXIST::FUNCTION:
@@ -2255,14 +2255,14 @@ CRYPTO_set_ex_data_implementation       2768	EXIST::FUNCTION:
 KRB5_ENCDATA_new                        2769	EXIST::FUNCTION:
 DSO_up_ref                              2770	EXIST::FUNCTION:
 OCSP_crl_reason_str                     2771	EXIST::FUNCTION:
-ENGINE_load_engine_ciphers              2772	EXIST::FUNCTION:
+ENGINE_load_engine_ciphers              2772	NOEXIST::FUNCTION:
 UI_get0_result_string                   2773	EXIST::FUNCTION:
 ASN1_GENERALSTRING_new                  2774	EXIST::FUNCTION:
 X509_SIG_it                             2775	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_SIG_it                             2775	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ERR_set_implementation                  2776	EXIST::FUNCTION:
 UI_get0_action_string                   2777	EXIST::FUNCTION:
-RSA_set_default_openssl_method          2778	EXIST::FUNCTION:RSA
+RSA_set_default_openssl_method          2778	NOEXIST::FUNCTION:
 OCSP_ONEREQ_get_ext                     2779	EXIST::FUNCTION:
 EC_POINT_method_of                      2780	EXIST::FUNCTION:
 i2d_KRB5_APREQBODY                      2781	EXIST::FUNCTION:
@@ -2318,7 +2318,7 @@ asn1_enc_restore                        2822	EXIST::FUNCTION:
 UI_free                                 2823	EXIST::FUNCTION:
 UI_new_method                           2824	EXIST::FUNCTION:
 X509_pubkey_digest                      2825	EXIST::FUNCTION:EVP
-ENGINE_set_BN_mod_exp                   2826	EXIST::FUNCTION:
+ENGINE_set_BN_mod_exp                   2826	NOEXIST::FUNCTION:
 EC_POINT_invert                         2827	EXIST::FUNCTION:
 OCSP_basic_sign                         2828	EXIST::FUNCTION:
 i2d_OCSP_RESPID                         2829	EXIST::FUNCTION:
@@ -2339,8 +2339,8 @@ ENGINE_get_flags                        2841	EXIST::FUNCTION:
 OCSP_ONEREQ_it                          2842	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_ONEREQ_it                          2842	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_process                              2843	EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp_crt       2844	EXIST:!VMS:FUNCTION:
-ENGINE_set_def_BN_mod_exp_crt           2844	EXIST:VMS:FUNCTION:
+ENGINE_set_default_BN_mod_exp_crt       2844	NOEXIST::FUNCTION:
+ENGINE_set_def_BN_mod_exp_crt           2844	NOEXIST::FUNCTION:
 ASN1_INTEGER_it                         2845	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_INTEGER_it                         2845	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 ENGINE_get_name                         2846	EXIST::FUNCTION:
@@ -2356,7 +2356,7 @@ BN_mod_add_quick                        2854	EXIST::FUNCTION:
 EC_POINT_new                            2855	EXIST::FUNCTION:
 ENGINE_free                             2856	EXIST::FUNCTION:
 ENGINE_get_init_function                2857	EXIST::FUNCTION:
-ENGINE_load_ciphers                     2858	EXIST::FUNCTION:
+ENGINE_load_ciphers                     2858	NOEXIST::FUNCTION:
 EVP_MD_CTX_destroy                      2859	EXIST::FUNCTION:
 OCSP_RESPBYTES_free                     2860	EXIST::FUNCTION:
 EVP_aes_128_cbc                         2861	EXIST::FUNCTION:AES
@@ -2386,7 +2386,7 @@ DIST_POINT_it                           2882	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 DIST_POINT_it                           2882	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_SINGLERESP_it                      2883	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_SINGLERESP_it                      2883	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_BN_mod_exp_crt               2884	EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp_crt               2884	NOEXIST::FUNCTION:
 d2i_KRB5_TKTBODY                        2885	EXIST::FUNCTION:
 EC_POINT_cmp                            2886	EXIST::FUNCTION:
 OCSP_REVOKEDINFO_new                    2887	EXIST::FUNCTION:
@@ -2453,7 +2453,7 @@ NETSCAPE_SPKI_it                        2937	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 NETSCAPE_SPKI_it                        2937	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_get0_test_string                     2938	EXIST::FUNCTION:
 EC_POINT_copy                           2939	EXIST::FUNCTION:
-ENGINE_get_cipher_by_name               2940	EXIST::FUNCTION:
+ENGINE_get_cipher_by_name               2940	NOEXIST::FUNCTION:
 BN_kronecker                            2941	EXIST::FUNCTION:
 ENGINE_get_finish_function              2942	EXIST::FUNCTION:
 UI_method_get_reader                    2943	EXIST::FUNCTION:
@@ -2468,7 +2468,7 @@ d2i_OCSP_RESPONSE                       2950	EXIST::FUNCTION:
 ASN1_UTCTIME_it                         2951	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_UTCTIME_it                         2951	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_RESPONSE_new                       2952	EXIST::FUNCTION:
-DH_set_default_openssl_method           2953	EXIST::FUNCTION:DH
+DH_set_default_openssl_method           2953	NOEXIST::FUNCTION:
 OCSP_resp_count                         2954	EXIST::FUNCTION:
 KRB5_CHECKSUM_new                       2955	EXIST::FUNCTION:
 ENGINE_get_DH                           2956	EXIST::FUNCTION:
@@ -2506,7 +2506,7 @@ PKCS12_MAC_DATA_it                      2984	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 PKCS12_MAC_DATA_it                      2984	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_accept_responses_new               2985	EXIST::FUNCTION:
 asn1_do_lock                            2986	EXIST::FUNCTION:
-DSA_set_default_openssl_method          2987	EXIST::FUNCTION:DSA
+DSA_set_default_openssl_method          2987	NOEXIST::FUNCTION:
 PKCS7_ATTR_VERIFY_it                    2988	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_ATTR_VERIFY_it                    2988	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 KRB5_APREQBODY_it                       2989	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2523,7 +2523,7 @@ ENGINE_set_finish_function              2997	EXIST::FUNCTION:
 EC_POINT_dbl                            2998	EXIST::FUNCTION:
 asn1_get_choice_selector                2999	EXIST::FUNCTION:
 i2d_KRB5_CHECKSUM                       3000	EXIST::FUNCTION:
-ENGINE_cipher_num                       3001	EXIST::FUNCTION:
+ENGINE_cipher_num                       3001	NOEXIST::FUNCTION:
 ENGINE_load_chil                        3002	EXIST::FUNCTION:
 OCSP_id_cmp                             3003	EXIST::FUNCTION:
 OCSP_BASICRESP_new                      3004	EXIST::FUNCTION:
@@ -2609,14 +2609,14 @@ ASN1_BOOLEAN_it                         3068	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_BOOLEAN_it                         3068	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_create_method                        3069	EXIST::FUNCTION:
 OCSP_ONEREQ_add1_ext_i2d                3070	EXIST::FUNCTION:
-ENGINE_cpy                              3071	EXIST::FUNCTION:
+ENGINE_cpy                              3071	NOEXIST::FUNCTION:
 d2i_OCSP_REQINFO                        3072	EXIST::FUNCTION:
 UI_add_info_string                      3073	EXIST::FUNCTION:
 UI_get_result_minsize                   3074	EXIST::FUNCTION:
 ASN1_NULL_it                            3075	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_NULL_it                            3075	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 BN_mod_lshift1                          3076	EXIST::FUNCTION:
-RSA_get_default_openssl_method          3077	EXIST::FUNCTION:RSA
+RSA_get_default_openssl_method          3077	NOEXIST::FUNCTION:
 d2i_OCSP_ONEREQ                         3078	EXIST::FUNCTION:
 OCSP_ONEREQ_new                         3079	EXIST::FUNCTION:
 KRB5_TICKET_it                          3080	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2641,11 +2641,11 @@ _shadow_des_check_key                   3094	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 _shadow_des_check_key                   3094	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
 BIGNUM_it                               3095	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 BIGNUM_it                               3095	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_BN_mod_exp                   3096	EXIST::FUNCTION:
+ENGINE_get_BN_mod_exp                   3096	NOEXIST::FUNCTION:
 ENGINE_get_load_privkey_function        3097	EXIST:!VMS:FUNCTION:
 ENGINE_get_load_privkey_fn              3097	EXIST:VMS:FUNCTION:
 OCSP_RESPONSE_free                      3098	EXIST::FUNCTION:
-ENGINE_set_default_BN_mod_exp           3099	EXIST::FUNCTION:
+ENGINE_set_default_BN_mod_exp           3099	NOEXIST::FUNCTION:
 UI_method_set_reader                    3100	EXIST::FUNCTION:
 i2d_ASN1_T61STRING                      3101	EXIST::FUNCTION:
 EC_POINT_set_to_infinity                3102	EXIST::FUNCTION:
@@ -2656,3 +2656,22 @@ ASN1_OBJECT_it                          3106	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_OBJECT_it                          3106	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_crlID_new                          3107	EXIST:!VMS,!WIN16:FUNCTION:
 OCSP_crlID2_new                         3107	EXIST:VMS,WIN16:FUNCTION:
+ENGINE_unregister_RSA                   3108	EXIST::FUNCTION:
+ENGINE_register_all_RAND                3109	EXIST::FUNCTION:
+ENGINE_load_dynamic                     3110	EXIST::FUNCTION:
+ENGINE_register_DH                      3111	EXIST::FUNCTION:
+ENGINE_register_RAND                    3112	EXIST::FUNCTION:
+ENGINE_load_openssl                     3113	EXIST::FUNCTION:
+ENGINE_register_RSA                     3114	EXIST::FUNCTION:
+ENGINE_unregister_DSA                   3115	EXIST::FUNCTION:
+ENGINE_register_DSA                     3116	EXIST::FUNCTION:
+ENGINE_register_all_RSA                 3117	EXIST::FUNCTION:
+ENGINE_register_all_DH                  3118	EXIST::FUNCTION:
+ENGINE_unregister_DH                    3119	EXIST::FUNCTION:
+ENGINE_register_all_DSA                 3120	EXIST::FUNCTION:
+ENGINE_register_complete                3121	EXIST::FUNCTION:
+ENGINE_register_all_complete            3122	EXIST::FUNCTION:
+ENGINE_unregister_RAND                  3123	EXIST::FUNCTION:
+ENGINE_set_table_flags                  3124	EXIST::FUNCTION:
+ENGINE_get_table_flags                  3125	EXIST::FUNCTION:
+RAND_set_rand_engine                    3126	EXIST::FUNCTION: