make update

diff --git a/TABLE b/TABLE
index 460976130686ab64f72184de8d482c983930dd47..bf14584c2c137633f622b6d7a0b4b6293c7feb76 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -1093,10 +1093,10 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $dso_scheme   = dlfcn
-$shared_target= 
+$shared_target= aix-shared
 $shared_cflag = 
 $shared_ldflag = 
-$shared_extension = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 
@@ -1143,10 +1143,10 @@ $rc4_obj      =
 $rmd160_obj   = 
 $rc5_obj      = 
 $dso_scheme   = dlfcn
-$shared_target= 
+$shared_target= aix-shared
 $shared_cflag = 
-$shared_ldflag = 
-$shared_extension = 
+$shared_ldflag = -q64
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = -X 64
 
@@ -3656,7 +3656,7 @@ $cflags       = -belf
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
-$lflags       = -lsocket -lresolv -lnsl
+$lflags       = -lsocket -lnsl
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $bn_obj       = asm/bn86-elf.o asm/co86-elf.o
 $des_obj      = asm/dx86-elf.o asm/yx86-elf.o
@@ -3671,7 +3671,7 @@ $dso_scheme   = dlfcn
 $shared_target= svr3-shared
 $shared_cflag = -Kpic
 $shared_ldflag = 
-$shared_extension = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 
@@ -3681,7 +3681,7 @@ $cflags       = -O3 -fomit-frame-pointer
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = 
-$lflags       = -lsocket -lresolv -lnsl
+$lflags       = -lsocket -lnsl
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $bn_obj       = asm/bn86-elf.o asm/co86-elf.o
 $des_obj      = asm/dx86-elf.o asm/yx86-elf.o
@@ -3696,7 +3696,7 @@ $dso_scheme   = dlfcn
 $shared_target= svr3-shared
 $shared_cflag = -fPIC
 $shared_ldflag = 
-$shared_extension = 
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 $arflags      = 
 

diff --git a/engines/Makefile.ssl b/engines/Makefile.ssl
index 15d92844ee3828feed03ad43745de5c4aa09cf81..6a010e05d669b4699c09e575e46d126e6e4714c7 100644 (file)
--- a/engines/Makefile.ssl
+++ b/engines/Makefile.ssl
@@ -184,6 +184,18 @@ e_cswift.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 e_cswift.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 e_cswift.o: ../include/openssl/symhacks.h ../include/openssl/ui.h e_cswift.c
 e_cswift.o: e_cswift_err.c e_cswift_err.h vendor_defns/cswift.h
+e_gmp.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_gmp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_gmp.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_gmp.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+e_gmp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+e_gmp.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
+e_gmp.o: ../include/openssl/err.h ../include/openssl/lhash.h
+e_gmp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_gmp.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+e_gmp.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+e_gmp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+e_gmp.o: ../include/openssl/ui.h e_gmp.c
 e_ncipher.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 e_ncipher.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 e_ncipher.o: ../include/openssl/crypto.h ../include/openssl/dh.h

diff --git a/util/libeay.num b/util/libeay.num
index 069c13d0bd4ab2d6bcb57ebb4c373a329dec8e4d..efaf93c9422d02f21376dfb76e4c1279bc7951a6 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1881,72 +1881,72 @@ BIO_f_linebuffer                        2463    EXIST:VMS:FUNCTION:
 BN_bntest_rand                          2464   EXIST::FUNCTION:
 OPENSSL_issetugid                       2465   EXIST::FUNCTION:
 BN_rand_range                           2466   EXIST::FUNCTION:
-ERR_load_ENGINE_strings                 2467   EXIST::FUNCTION:
-ENGINE_set_DSA                          2468   EXIST::FUNCTION:
-ENGINE_get_finish_function              2469   EXIST::FUNCTION:
-ENGINE_get_default_RSA                  2470   EXIST::FUNCTION:
+ERR_load_ENGINE_strings                 2467   EXIST::FUNCTION:ENGINE
+ENGINE_set_DSA                          2468   EXIST::FUNCTION:ENGINE
+ENGINE_get_finish_function              2469   EXIST::FUNCTION:ENGINE
+ENGINE_get_default_RSA                  2470   EXIST::FUNCTION:ENGINE
 ENGINE_get_BN_mod_exp                   2471   NOEXIST::FUNCTION:
 DSA_get_default_openssl_method          2472   NOEXIST::FUNCTION:
-ENGINE_set_DH                           2473   EXIST::FUNCTION:
+ENGINE_set_DH                           2473   EXIST::FUNCTION:ENGINE
 ENGINE_set_def_BN_mod_exp_crt           2474   NOEXIST::FUNCTION:
 ENGINE_set_default_BN_mod_exp_crt       2474   NOEXIST::FUNCTION:
-ENGINE_init                             2475   EXIST::FUNCTION:
+ENGINE_init                             2475   EXIST::FUNCTION:ENGINE
 DH_get_default_openssl_method           2476   NOEXIST::FUNCTION:
 RSA_set_default_openssl_method          2477   NOEXIST::FUNCTION:
-ENGINE_finish                           2478   EXIST::FUNCTION:
-ENGINE_load_public_key                  2479   EXIST::FUNCTION:
-ENGINE_get_DH                           2480   EXIST::FUNCTION:
-ENGINE_ctrl                             2481   EXIST::FUNCTION:
-ENGINE_get_init_function                2482   EXIST::FUNCTION:
-ENGINE_set_init_function                2483   EXIST::FUNCTION:
-ENGINE_set_default_DSA                  2484   EXIST::FUNCTION:
-ENGINE_get_name                         2485   EXIST::FUNCTION:
-ENGINE_get_last                         2486   EXIST::FUNCTION:
-ENGINE_get_prev                         2487   EXIST::FUNCTION:
-ENGINE_get_default_DH                   2488   EXIST::FUNCTION:
-ENGINE_get_RSA                          2489   EXIST::FUNCTION:
-ENGINE_set_default                      2490   EXIST::FUNCTION:
-ENGINE_get_RAND                         2491   EXIST::FUNCTION:
-ENGINE_get_first                        2492   EXIST::FUNCTION:
-ENGINE_by_id                            2493   EXIST::FUNCTION:
-ENGINE_set_finish_function              2494   EXIST::FUNCTION:
+ENGINE_finish                           2478   EXIST::FUNCTION:ENGINE
+ENGINE_load_public_key                  2479   EXIST::FUNCTION:ENGINE
+ENGINE_get_DH                           2480   EXIST::FUNCTION:ENGINE
+ENGINE_ctrl                             2481   EXIST::FUNCTION:ENGINE
+ENGINE_get_init_function                2482   EXIST::FUNCTION:ENGINE
+ENGINE_set_init_function                2483   EXIST::FUNCTION:ENGINE
+ENGINE_set_default_DSA                  2484   EXIST::FUNCTION:ENGINE
+ENGINE_get_name                         2485   EXIST::FUNCTION:ENGINE
+ENGINE_get_last                         2486   EXIST::FUNCTION:ENGINE
+ENGINE_get_prev                         2487   EXIST::FUNCTION:ENGINE
+ENGINE_get_default_DH                   2488   EXIST::FUNCTION:ENGINE
+ENGINE_get_RSA                          2489   EXIST::FUNCTION:ENGINE
+ENGINE_set_default                      2490   EXIST::FUNCTION:ENGINE
+ENGINE_get_RAND                         2491   EXIST::FUNCTION:ENGINE
+ENGINE_get_first                        2492   EXIST::FUNCTION:ENGINE
+ENGINE_by_id                            2493   EXIST::FUNCTION:ENGINE
+ENGINE_set_finish_function              2494   EXIST::FUNCTION:ENGINE
 ENGINE_get_def_BN_mod_exp_crt           2495   NOEXIST::FUNCTION:
 ENGINE_get_default_BN_mod_exp_crt       2495   NOEXIST::FUNCTION:
 RSA_get_default_openssl_method          2496   NOEXIST::FUNCTION:
-ENGINE_set_RSA                          2497   EXIST::FUNCTION:
-ENGINE_load_private_key                 2498   EXIST::FUNCTION:
-ENGINE_set_default_RAND                 2499   EXIST::FUNCTION:
+ENGINE_set_RSA                          2497   EXIST::FUNCTION:ENGINE
+ENGINE_load_private_key                 2498   EXIST::FUNCTION:ENGINE
+ENGINE_set_default_RAND                 2499   EXIST::FUNCTION:ENGINE
 ENGINE_set_BN_mod_exp                   2500   NOEXIST::FUNCTION:
-ENGINE_remove                           2501   EXIST::FUNCTION:
-ENGINE_free                             2502   EXIST::FUNCTION:
+ENGINE_remove                           2501   EXIST::FUNCTION:ENGINE
+ENGINE_free                             2502   EXIST::FUNCTION:ENGINE
 ENGINE_get_BN_mod_exp_crt               2503   NOEXIST::FUNCTION:
-ENGINE_get_next                         2504   EXIST::FUNCTION:
-ENGINE_set_name                         2505   EXIST::FUNCTION:
-ENGINE_get_default_DSA                  2506   EXIST::FUNCTION:
+ENGINE_get_next                         2504   EXIST::FUNCTION:ENGINE
+ENGINE_set_name                         2505   EXIST::FUNCTION:ENGINE
+ENGINE_get_default_DSA                  2506   EXIST::FUNCTION:ENGINE
 ENGINE_set_default_BN_mod_exp           2507   NOEXIST::FUNCTION:
-ENGINE_set_default_RSA                  2508   EXIST::FUNCTION:
-ENGINE_get_default_RAND                 2509   EXIST::FUNCTION:
+ENGINE_set_default_RSA                  2508   EXIST::FUNCTION:ENGINE
+ENGINE_get_default_RAND                 2509   EXIST::FUNCTION:ENGINE
 ENGINE_get_default_BN_mod_exp           2510   NOEXIST::FUNCTION:
-ENGINE_set_RAND                         2511   EXIST::FUNCTION:
-ENGINE_set_id                           2512   EXIST::FUNCTION:
+ENGINE_set_RAND                         2511   EXIST::FUNCTION:ENGINE
+ENGINE_set_id                           2512   EXIST::FUNCTION:ENGINE
 ENGINE_set_BN_mod_exp_crt               2513   NOEXIST::FUNCTION:
-ENGINE_set_default_DH                   2514   EXIST::FUNCTION:
-ENGINE_new                              2515   EXIST::FUNCTION:
-ENGINE_get_id                           2516   EXIST::FUNCTION:
+ENGINE_set_default_DH                   2514   EXIST::FUNCTION:ENGINE
+ENGINE_new                              2515   EXIST::FUNCTION:ENGINE
+ENGINE_get_id                           2516   EXIST::FUNCTION:ENGINE
 DSA_set_default_openssl_method          2517   NOEXIST::FUNCTION:
-ENGINE_add                              2518   EXIST::FUNCTION:
+ENGINE_add                              2518   EXIST::FUNCTION:ENGINE
 DH_set_default_openssl_method           2519   NOEXIST::FUNCTION:
-ENGINE_get_DSA                          2520   EXIST::FUNCTION:
-ENGINE_get_ctrl_function                2521   EXIST::FUNCTION:
-ENGINE_set_ctrl_function                2522   EXIST::FUNCTION:
+ENGINE_get_DSA                          2520   EXIST::FUNCTION:ENGINE
+ENGINE_get_ctrl_function                2521   EXIST::FUNCTION:ENGINE
+ENGINE_set_ctrl_function                2522   EXIST::FUNCTION:ENGINE
 BN_pseudo_rand_range                    2523   EXIST::FUNCTION:
 X509_STORE_CTX_set_verify_cb            2524   EXIST::FUNCTION:
 ERR_load_COMP_strings                   2525   EXIST::FUNCTION:
 PKCS12_item_decrypt_d2i                 2526   EXIST::FUNCTION:
 ASN1_UTF8STRING_it                      2527   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_UTF8STRING_it                      2527   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_unregister_ciphers               2528   EXIST::FUNCTION:
-ENGINE_get_ciphers                      2529   EXIST::FUNCTION:
+ENGINE_unregister_ciphers               2528   EXIST::FUNCTION:ENGINE
+ENGINE_get_ciphers                      2529   EXIST::FUNCTION:ENGINE
 d2i_OCSP_BASICRESP                      2530   EXIST::FUNCTION:
 KRB5_CHECKSUM_it                        2531   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_CHECKSUM_it                        2531   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -1959,15 +1959,15 @@ X509V3_add1_i2d                         2536    EXIST::FUNCTION:
 PKCS7_ENVELOPE_it                       2537   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_ENVELOPE_it                       2537   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_add_input_boolean                    2538   EXIST::FUNCTION:
-ENGINE_unregister_RSA                   2539   EXIST::FUNCTION:
+ENGINE_unregister_RSA                   2539   EXIST::FUNCTION:ENGINE
 X509V3_EXT_nconf                        2540   EXIST::FUNCTION:
 ASN1_GENERALSTRING_free                 2541   EXIST::FUNCTION:
 d2i_OCSP_CERTSTATUS                     2542   EXIST::FUNCTION:
 X509_REVOKED_set_serialNumber           2543   EXIST::FUNCTION:
 X509_print_ex                           2544   EXIST::FUNCTION:BIO
 OCSP_ONEREQ_get1_ext_d2i                2545   EXIST::FUNCTION:
-ENGINE_register_all_RAND                2546   EXIST::FUNCTION:
-ENGINE_load_dynamic                     2547   EXIST::FUNCTION:
+ENGINE_register_all_RAND                2546   EXIST::FUNCTION:ENGINE
+ENGINE_load_dynamic                     2547   EXIST::FUNCTION:ENGINE
 PBKDF2PARAM_it                          2548   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PBKDF2PARAM_it                          2548   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EXTENDED_KEY_USAGE_new                  2549   EXIST::FUNCTION:
@@ -1987,7 +1987,7 @@ X509_STORE_set_purpose                  2559      EXIST::FUNCTION:
 i2d_ASN1_GENERALSTRING                  2560   EXIST::FUNCTION:
 OCSP_response_status                    2561   EXIST::FUNCTION:
 i2d_OCSP_SERVICELOC                     2562   EXIST::FUNCTION:
-ENGINE_get_digest_engine                2563   EXIST::FUNCTION:
+ENGINE_get_digest_engine                2563   EXIST::FUNCTION:ENGINE
 EC_GROUP_set_curve_GFp                  2564   EXIST::FUNCTION:EC
 OCSP_REQUEST_get_ext_by_OBJ             2565   EXIST::FUNCTION:
 _ossl_old_des_random_key                2566   EXIST::FUNCTION:DES
@@ -2011,7 +2011,7 @@ _shadow_DES_rw_mode                     2581      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 _shadow_DES_rw_mode                     2581   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DES
 asn1_do_adb                             2582   EXIST::FUNCTION:
 ASN1_template_i2d                       2583   EXIST::FUNCTION:
-ENGINE_register_DH                      2584   EXIST::FUNCTION:
+ENGINE_register_DH                      2584   EXIST::FUNCTION:ENGINE
 UI_construct_prompt                     2585   EXIST::FUNCTION:
 X509_STORE_set_trust                    2586   EXIST::FUNCTION:
 UI_dup_input_string                     2587   EXIST::FUNCTION:
@@ -2039,7 +2039,7 @@ OCSP_resp_find                          2605      EXIST::FUNCTION:
 BN_nnmod                                2606   EXIST::FUNCTION:
 X509_CRL_sort                           2607   EXIST::FUNCTION:
 X509_REVOKED_set_revocationDate         2608   EXIST::FUNCTION:
-ENGINE_register_RAND                    2609   EXIST::FUNCTION:
+ENGINE_register_RAND                    2609   EXIST::FUNCTION:ENGINE
 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
@@ -2049,11 +2049,11 @@ SXNET_it                                2613    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 UI_dup_input_boolean                    2614   EXIST::FUNCTION:
 PKCS12_add_CSPName_asc                  2615   EXIST::FUNCTION:
 EC_POINT_is_at_infinity                 2616   EXIST::FUNCTION:EC
-ENGINE_load_cryptodev                   2617   EXIST::FUNCTION:
+ENGINE_load_cryptodev                   2617   EXIST::FUNCTION:ENGINE
 DSO_convert_filename                    2618   EXIST::FUNCTION:
 POLICYQUALINFO_it                       2619   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 POLICYQUALINFO_it                       2619   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_register_ciphers                 2620   EXIST::FUNCTION:
+ENGINE_register_ciphers                 2620   EXIST::FUNCTION:ENGINE
 BN_mod_lshift_quick                     2621   EXIST::FUNCTION:
 DSO_set_filename                        2622   EXIST::FUNCTION:
 ASN1_item_free                          2623   EXIST::FUNCTION:
@@ -2062,7 +2062,7 @@ AUTHORITY_KEYID_it                      2625      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 AUTHORITY_KEYID_it                      2625   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 KRB5_APREQBODY_new                      2626   EXIST::FUNCTION:
 X509V3_EXT_REQ_add_nconf                2627   EXIST::FUNCTION:
-ENGINE_ctrl_cmd_string                  2628   EXIST::FUNCTION:
+ENGINE_ctrl_cmd_string                  2628   EXIST::FUNCTION:ENGINE
 i2d_OCSP_RESPDATA                       2629   EXIST::FUNCTION:
 EVP_MD_CTX_init                         2630   EXIST::FUNCTION:
 EXTENDED_KEY_USAGE_free                 2631   EXIST::FUNCTION:
@@ -2071,8 +2071,8 @@ PKCS7_ATTR_SIGN_it                      2632      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 UI_add_error_string                     2633   EXIST::FUNCTION:
 KRB5_CHECKSUM_free                      2634   EXIST::FUNCTION:
 OCSP_REQUEST_get_ext                    2635   EXIST::FUNCTION:
-ENGINE_load_ubsec                       2636   EXIST::FUNCTION:STATIC_ENGINE
-ENGINE_register_all_digests             2637   EXIST::FUNCTION:
+ENGINE_load_ubsec                       2636   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ENGINE_register_all_digests             2637   EXIST::FUNCTION:ENGINE
 PKEY_USAGE_PERIOD_it                    2638   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKEY_USAGE_PERIOD_it                    2638   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 PKCS12_unpack_authsafes                 2639   EXIST::FUNCTION:
@@ -2098,16 +2098,16 @@ OCSP_CERTSTATUS_free                    2653    EXIST::FUNCTION:
 _ossl_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:
-ENGINE_get_cmd_defns                    2658   EXIST::FUNCTION:
-ENGINE_set_load_privkey_function        2659   EXIST:!VMS:FUNCTION:
-ENGINE_set_load_privkey_fn              2659   EXIST:VMS:FUNCTION:
+ENGINE_load_openssl                     2657   EXIST::FUNCTION:ENGINE
+ENGINE_get_cmd_defns                    2658   EXIST::FUNCTION:ENGINE
+ENGINE_set_load_privkey_function        2659   EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_set_load_privkey_fn              2659   EXIST:VMS:FUNCTION:ENGINE
 EVP_EncryptFinal_ex                     2660   EXIST::FUNCTION:
-ENGINE_set_default_digests              2661   EXIST::FUNCTION:
+ENGINE_set_default_digests              2661   EXIST::FUNCTION:ENGINE
 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:
+ENGINE_register_RSA                     2664   EXIST::FUNCTION:ENGINE
+ENGINE_unregister_DSA                   2665   EXIST::FUNCTION:ENGINE
 _ossl_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:
@@ -2120,7 +2120,7 @@ PKCS12_certbag2x509                     2672      EXIST::FUNCTION:
 _ossl_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:
+ENGINE_set_ciphers                      2676   EXIST::FUNCTION:ENGINE
 d2i_KRB5_APREQBODY                      2677   EXIST::FUNCTION:
 UI_method_get_flusher                   2678   EXIST::FUNCTION:
 X509_PUBKEY_it                          2679   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2156,7 +2156,7 @@ NCONF_get_number_e                      2704      EXIST::FUNCTION:
 _ossl_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:
+ENGINE_load_builtin_engines             2708   EXIST::FUNCTION:ENGINE
 i2d_OCSP_ONEREQ                         2709   EXIST::FUNCTION:
 OCSP_REQUEST_add_ext                    2710   EXIST::FUNCTION:
 OCSP_RESPBYTES_new                      2711   EXIST::FUNCTION:
@@ -2184,7 +2184,7 @@ X509_CERT_AUX_it                        2727      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 CERTIFICATEPOLICIES_it                  2728   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 CERTIFICATEPOLICIES_it                  2728   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 _ossl_old_des_ede3_cbc_encrypt          2729   EXIST::FUNCTION:DES
-RAND_set_rand_engine                    2730   EXIST::FUNCTION:
+RAND_set_rand_engine                    2730   EXIST::FUNCTION:ENGINE
 DSO_get_loaded_filename                 2731   EXIST::FUNCTION:
 X509_ATTRIBUTE_it                       2732   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_ATTRIBUTE_it                       2732   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2206,7 +2206,7 @@ i2d_OCSP_BASICRESP                      2744      EXIST::FUNCTION:
 i2d_OCSP_RESPBYTES                      2745   EXIST::FUNCTION:
 PKCS12_unpack_p7encdata                 2746   EXIST::FUNCTION:
 HMAC_CTX_init                           2747   EXIST::FUNCTION:HMAC
-ENGINE_get_digest                       2748   EXIST::FUNCTION:
+ENGINE_get_digest                       2748   EXIST::FUNCTION:ENGINE
 OCSP_RESPONSE_print                     2749   EXIST::FUNCTION:
 KRB5_TKTBODY_it                         2750   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_TKTBODY_it                         2750   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2219,16 +2219,16 @@ PBE2PARAM_it                            2753    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 PKCS12_certbag2x509crl                  2754   EXIST::FUNCTION:
 PKCS7_SIGNED_it                         2755   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS7_SIGNED_it                         2755   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_cipher                       2756   EXIST::FUNCTION:
+ENGINE_get_cipher                       2756   EXIST::FUNCTION:ENGINE
 i2d_OCSP_CRLID                          2757   EXIST::FUNCTION:
 OCSP_SINGLERESP_new                     2758   EXIST::FUNCTION:
-ENGINE_cmd_is_executable                2759   EXIST::FUNCTION:
+ENGINE_cmd_is_executable                2759   EXIST::FUNCTION:ENGINE
 RSA_up_ref                              2760   EXIST::FUNCTION:RSA
 ASN1_GENERALSTRING_it                   2761   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_GENERALSTRING_it                   2761   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_register_DSA                     2762   EXIST::FUNCTION:
+ENGINE_register_DSA                     2762   EXIST::FUNCTION:ENGINE
 X509V3_EXT_add_nconf_sk                 2763   EXIST::FUNCTION:
-ENGINE_set_load_pubkey_function         2764   EXIST::FUNCTION:
+ENGINE_set_load_pubkey_function         2764   EXIST::FUNCTION:ENGINE
 PKCS8_decrypt                           2765   EXIST::FUNCTION:
 PEM_bytes_read_bio                      2766   EXIST::FUNCTION:BIO
 DIRECTORYSTRING_it                      2767   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2265,7 +2265,7 @@ UI_method_set_flusher                   2789      EXIST::FUNCTION:
 X509_ocspid_print                       2790   EXIST::FUNCTION:BIO
 KRB5_ENCDATA_it                         2791   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_ENCDATA_it                         2791   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_load_pubkey_function         2792   EXIST::FUNCTION:
+ENGINE_get_load_pubkey_function         2792   EXIST::FUNCTION:ENGINE
 UI_add_user_data                        2793   EXIST::FUNCTION:
 OCSP_REQUEST_delete_ext                 2794   EXIST::FUNCTION:
 UI_get_method                           2795   EXIST::FUNCTION:
@@ -2289,16 +2289,16 @@ ASN1_FBOOLEAN_it                        2806    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_FBOOLEAN_it                        2806   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_set_ex_data                          2807   EXIST::FUNCTION:
 _ossl_old_des_string_to_key             2808   EXIST::FUNCTION:DES
-ENGINE_register_all_RSA                 2809   EXIST::FUNCTION:
+ENGINE_register_all_RSA                 2809   EXIST::FUNCTION:ENGINE
 d2i_KRB5_PRINCNAME                      2810   EXIST::FUNCTION:
 OCSP_RESPBYTES_it                       2811   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_RESPBYTES_it                       2811   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_CINF_it                            2812   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_CINF_it                            2812   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_unregister_digests               2813   EXIST::FUNCTION:
+ENGINE_unregister_digests               2813   EXIST::FUNCTION:ENGINE
 d2i_EDIPARTYNAME                        2814   EXIST::FUNCTION:
 d2i_OCSP_SERVICELOC                     2815   EXIST::FUNCTION:
-ENGINE_get_digests                      2816   EXIST::FUNCTION:
+ENGINE_get_digests                      2816   EXIST::FUNCTION:ENGINE
 _ossl_old_des_set_odd_parity            2817   EXIST::FUNCTION:DES
 OCSP_RESPDATA_free                      2818   EXIST::FUNCTION:
 d2i_KRB5_TICKET                         2819   EXIST::FUNCTION:
@@ -2309,7 +2309,7 @@ d2i_ASN1_GENERALSTRING                  2822      EXIST::FUNCTION:
 X509_CRL_set_version                    2823   EXIST::FUNCTION:
 BN_mod_sub                              2824   EXIST::FUNCTION:
 OCSP_SINGLERESP_get_ext_by_NID          2825   EXIST::FUNCTION:
-ENGINE_get_ex_new_index                 2826   EXIST::FUNCTION:
+ENGINE_get_ex_new_index                 2826   EXIST::FUNCTION:ENGINE
 OCSP_REQUEST_free                       2827   EXIST::FUNCTION:
 OCSP_REQUEST_add1_ext_i2d               2828   EXIST::FUNCTION:
 X509_VAL_it                             2829   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2343,7 +2343,7 @@ EC_POINT_method_of                      2852      EXIST::FUNCTION:EC
 i2d_KRB5_APREQBODY                      2853   EXIST::FUNCTION:
 _ossl_old_des_ecb3_encrypt              2854   EXIST::FUNCTION:DES
 CRYPTO_get_mem_ex_functions             2855   EXIST::FUNCTION:
-ENGINE_get_ex_data                      2856   EXIST::FUNCTION:
+ENGINE_get_ex_data                      2856   EXIST::FUNCTION:ENGINE
 UI_destroy_method                       2857   EXIST::FUNCTION:
 ASN1_item_i2d_bio                       2858   EXIST::FUNCTION:BIO
 OCSP_ONEREQ_get_ext_by_OBJ              2859   EXIST::FUNCTION:
@@ -2367,7 +2367,7 @@ PKCS12_SAFEBAGS_it                      2872      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 PKCS12_SAFEBAGS_it                      2872   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 d2i_OCSP_SIGNATURE                      2873   EXIST::FUNCTION:
 OCSP_request_add1_nonce                 2874   EXIST::FUNCTION:
-ENGINE_set_cmd_defns                    2875   EXIST::FUNCTION:
+ENGINE_set_cmd_defns                    2875   EXIST::FUNCTION:ENGINE
 OCSP_SERVICELOC_free                    2876   EXIST::FUNCTION:
 EC_GROUP_free                           2877   EXIST::FUNCTION:EC
 ASN1_BIT_STRING_it                      2878   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2384,7 +2384,7 @@ EC_GROUP_new_curve_GFp                  2885      EXIST::FUNCTION:EC
 OCSP_REQUEST_get1_ext_d2i               2886   EXIST::FUNCTION:
 PKCS12_item_pack_safebag                2887   EXIST::FUNCTION:
 asn1_ex_c2i                             2888   EXIST::FUNCTION:
-ENGINE_register_digests                 2889   EXIST::FUNCTION:
+ENGINE_register_digests                 2889   EXIST::FUNCTION:ENGINE
 i2d_OCSP_REVOKEDINFO                    2890   EXIST::FUNCTION:
 asn1_enc_restore                        2891   EXIST::FUNCTION:
 UI_free                                 2892   EXIST::FUNCTION:
@@ -2395,7 +2395,7 @@ EC_POINT_invert                         2896      EXIST::FUNCTION:EC
 OCSP_basic_sign                         2897   EXIST::FUNCTION:
 i2d_OCSP_RESPID                         2898   EXIST::FUNCTION:
 OCSP_check_nonce                        2899   EXIST::FUNCTION:
-ENGINE_ctrl_cmd                         2900   EXIST::FUNCTION:
+ENGINE_ctrl_cmd                         2900   EXIST::FUNCTION:ENGINE
 d2i_KRB5_ENCKEY                         2901   EXIST::FUNCTION:
 OCSP_parse_url                          2902   EXIST::FUNCTION:
 OCSP_SINGLERESP_get_ext                 2903   EXIST::FUNCTION:
@@ -2403,12 +2403,12 @@ OCSP_CRLID_free                         2904    EXIST::FUNCTION:
 OCSP_BASICRESP_get1_ext_d2i             2905   EXIST::FUNCTION:
 RSAPrivateKey_it                        2906   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
 RSAPrivateKey_it                        2906   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
-ENGINE_register_all_DH                  2907   EXIST::FUNCTION:
+ENGINE_register_all_DH                  2907   EXIST::FUNCTION:ENGINE
 i2d_EDIPARTYNAME                        2908   EXIST::FUNCTION:
 EC_POINT_get_affine_coordinates_GFp     2909   EXIST:!VMS:FUNCTION:EC
 EC_POINT_get_affine_coords_GFp          2909   EXIST:VMS:FUNCTION:EC
 OCSP_CRLID_new                          2910   EXIST::FUNCTION:
-ENGINE_get_flags                        2911   EXIST::FUNCTION:
+ENGINE_get_flags                        2911   EXIST::FUNCTION:ENGINE
 OCSP_ONEREQ_it                          2912   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_ONEREQ_it                          2912   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_process                              2913   EXIST::FUNCTION:
@@ -2416,8 +2416,8 @@ ASN1_INTEGER_it                         2914      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 ASN1_INTEGER_it                         2914   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 EVP_CipherInit_ex                       2915   EXIST::FUNCTION:
 UI_get_string_type                      2916   EXIST::FUNCTION:
-ENGINE_unregister_DH                    2917   EXIST::FUNCTION:
-ENGINE_register_all_DSA                 2918   EXIST::FUNCTION:
+ENGINE_unregister_DH                    2917   EXIST::FUNCTION:ENGINE
+ENGINE_register_all_DSA                 2918   EXIST::FUNCTION:ENGINE
 OCSP_ONEREQ_get_ext_by_critical         2919   EXIST::FUNCTION:
 bn_dup_expand                           2920   EXIST::FUNCTION:
 OCSP_cert_id_new                        2921   EXIST::FUNCTION:
@@ -2438,11 +2438,11 @@ BN_mod_sub_quick                        2933    EXIST::FUNCTION:
 OCSP_ONEREQ_add_ext                     2934   EXIST::FUNCTION:
 OCSP_request_sign                       2935   EXIST::FUNCTION:
 EVP_DigestFinal_ex                      2936   EXIST::FUNCTION:
-ENGINE_set_digests                      2937   EXIST::FUNCTION:
+ENGINE_set_digests                      2937   EXIST::FUNCTION:ENGINE
 OCSP_id_issuer_cmp                      2938   EXIST::FUNCTION:
 OBJ_NAME_do_all                         2939   EXIST::FUNCTION:
 EC_POINTs_mul                           2940   EXIST::FUNCTION:EC
-ENGINE_register_complete                2941   EXIST::FUNCTION:
+ENGINE_register_complete                2941   EXIST::FUNCTION:ENGINE
 X509V3_EXT_nconf_nid                    2942   EXIST::FUNCTION:
 ASN1_SEQUENCE_it                        2943   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_SEQUENCE_it                        2943   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2451,7 +2451,7 @@ RAND_query_egd_bytes                    2945      EXIST::FUNCTION:
 UI_method_get_writer                    2946   EXIST::FUNCTION:
 UI_OpenSSL                              2947   EXIST::FUNCTION:
 PEM_def_callback                        2948   EXIST::FUNCTION:
-ENGINE_cleanup                          2949   EXIST::FUNCTION:
+ENGINE_cleanup                          2949   EXIST::FUNCTION:ENGINE
 DIST_POINT_it                           2950   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 DIST_POINT_it                           2950   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 OCSP_SINGLERESP_it                      2951   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2475,7 +2475,7 @@ OCSP_RESPID_new                         2967      EXIST::FUNCTION:
 OCSP_RESPDATA_it                        2968   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_RESPDATA_it                        2968   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 d2i_OCSP_RESPDATA                       2969   EXIST::FUNCTION:
-ENGINE_register_all_complete            2970   EXIST::FUNCTION:
+ENGINE_register_all_complete            2970   EXIST::FUNCTION:ENGINE
 OCSP_check_validity                     2971   EXIST::FUNCTION:
 PKCS12_BAGS_it                          2972   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKCS12_BAGS_it                          2972   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2487,7 +2487,7 @@ KRB5_AUTHENTBODY_it                     2976      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 X509_supported_extension                2977   EXIST::FUNCTION:
 i2d_KRB5_AUTHDATA                       2978   EXIST::FUNCTION:
 UI_method_get_opener                    2979   EXIST::FUNCTION:
-ENGINE_set_ex_data                      2980   EXIST::FUNCTION:
+ENGINE_set_ex_data                      2980   EXIST::FUNCTION:ENGINE
 OCSP_REQUEST_print                      2981   EXIST::FUNCTION:
 CBIGNUM_it                              2982   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 CBIGNUM_it                              2982   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2501,7 +2501,7 @@ OCSP_single_get0_status                 2989      EXIST::FUNCTION:
 BN_swap                                 2990   EXIST::FUNCTION:
 POLICYINFO_it                           2991   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 POLICYINFO_it                           2991   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_set_destroy_function             2992   EXIST::FUNCTION:
+ENGINE_set_destroy_function             2992   EXIST::FUNCTION:ENGINE
 asn1_enc_free                           2993   EXIST::FUNCTION:
 OCSP_RESPID_it                          2994   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 OCSP_RESPID_it                          2994   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2523,8 +2523,8 @@ EDIPARTYNAME_it                         3005      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 NETSCAPE_SPKI_it                        3006   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 NETSCAPE_SPKI_it                        3006   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 UI_get0_test_string                     3007   EXIST::FUNCTION:
-ENGINE_get_cipher_engine                3008   EXIST::FUNCTION:
-ENGINE_register_all_ciphers             3009   EXIST::FUNCTION:
+ENGINE_get_cipher_engine                3008   EXIST::FUNCTION:ENGINE
+ENGINE_register_all_ciphers             3009   EXIST::FUNCTION:ENGINE
 EC_POINT_copy                           3010   EXIST::FUNCTION:EC
 BN_kronecker                            3011   EXIST::FUNCTION:
 _ossl_old_des_ede3_ofb64_encrypt        3012   EXIST:!VMS:FUNCTION:DES
@@ -2545,9 +2545,9 @@ OCSP_RESPONSE_new                       3023      EXIST::FUNCTION:
 AES_set_encrypt_key                     3024   EXIST::FUNCTION:AES
 OCSP_resp_count                         3025   EXIST::FUNCTION:
 KRB5_CHECKSUM_new                       3026   EXIST::FUNCTION:
-ENGINE_load_cswift                      3027   EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_cswift                      3027   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 OCSP_onereq_get0_id                     3028   EXIST::FUNCTION:
-ENGINE_set_default_ciphers              3029   EXIST::FUNCTION:
+ENGINE_set_default_ciphers              3029   EXIST::FUNCTION:ENGINE
 NOTICEREF_it                            3030   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 NOTICEREF_it                            3030   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509V3_EXT_CRL_add_nconf                3031   EXIST::FUNCTION:
@@ -2565,7 +2565,7 @@ AES_decrypt                             3040      EXIST::FUNCTION:AES
 asn1_enc_init                           3041   EXIST::FUNCTION:
 UI_get_result_maxsize                   3042   EXIST::FUNCTION:
 OCSP_CERTID_new                         3043   EXIST::FUNCTION:
-ENGINE_unregister_RAND                  3044   EXIST::FUNCTION:
+ENGINE_unregister_RAND                  3044   EXIST::FUNCTION:ENGINE
 UI_method_get_closer                    3045   EXIST::FUNCTION:
 d2i_KRB5_ENCDATA                        3046   EXIST::FUNCTION:
 OCSP_request_onereq_count               3047   EXIST::FUNCTION:
@@ -2576,7 +2576,7 @@ ASN1_primitive_free                     3051      EXIST::FUNCTION:
 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:STATIC_ENGINE
+ENGINE_load_nuron                       3055   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 _ossl_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:
@@ -2598,15 +2598,15 @@ ASN1_item_d2i_bio                       3069    EXIST::FUNCTION:BIO
 EC_POINT_dbl                            3070   EXIST::FUNCTION:EC
 asn1_get_choice_selector                3071   EXIST::FUNCTION:
 i2d_KRB5_CHECKSUM                       3072   EXIST::FUNCTION:
-ENGINE_set_table_flags                  3073   EXIST::FUNCTION:
+ENGINE_set_table_flags                  3073   EXIST::FUNCTION:ENGINE
 AES_options                             3074   EXIST::FUNCTION:AES
-ENGINE_load_chil                        3075   EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_chil                        3075   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 OCSP_id_cmp                             3076   EXIST::FUNCTION:
 OCSP_BASICRESP_new                      3077   EXIST::FUNCTION:
 OCSP_REQUEST_get_ext_by_NID             3078   EXIST::FUNCTION:
 KRB5_APREQ_it                           3079   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 KRB5_APREQ_it                           3079   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_destroy_function             3080   EXIST::FUNCTION:
+ENGINE_get_destroy_function             3080   EXIST::FUNCTION:ENGINE
 CONF_set_nconf                          3081   EXIST::FUNCTION:
 ASN1_PRINTABLE_free                     3082   EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_by_NID           3083   EXIST::FUNCTION:
@@ -2667,7 +2667,7 @@ OCSP_CRLID_it                           3127      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 OCSP_CRLID_it                           3127   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 i2d_KRB5_AUTHENTBODY                    3128   EXIST::FUNCTION:
 OCSP_REQUEST_get_ext_count              3129   EXIST::FUNCTION:
-ENGINE_load_atalla                      3130   EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_atalla                      3130   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 X509_NAME_it                            3131   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_NAME_it                            3131   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 USERNOTICE_it                           3132   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2685,7 +2685,7 @@ UI_method_set_opener                    3140      EXIST::FUNCTION:
 ASN1_item_ex_free                       3141   EXIST::FUNCTION:
 ASN1_BOOLEAN_it                         3142   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_BOOLEAN_it                         3142   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_table_flags                  3143   EXIST::FUNCTION:
+ENGINE_get_table_flags                  3143   EXIST::FUNCTION:ENGINE
 UI_create_method                        3144   EXIST::FUNCTION:
 OCSP_ONEREQ_add1_ext_i2d                3145   EXIST::FUNCTION:
 _shadow_DES_check_key                   3146   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DES
@@ -2709,7 +2709,7 @@ PKCS7_it                                3160      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 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:
+ENGINE_set_flags                        3162   EXIST::FUNCTION:ENGINE
 _ossl_old_des_ecb_encrypt               3163   EXIST::FUNCTION:DES
 OCSP_response_get1_basic                3164   EXIST::FUNCTION:
 EVP_Digest                              3165   EXIST::FUNCTION:
@@ -2721,8 +2721,8 @@ ASN1_TIME_to_generalizedtime            3169      EXIST::FUNCTION:
 BIGNUM_it                               3170   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 BIGNUM_it                               3170   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 AES_cbc_encrypt                         3171   EXIST::FUNCTION:AES
-ENGINE_get_load_privkey_function        3172   EXIST:!VMS:FUNCTION:
-ENGINE_get_load_privkey_fn              3172   EXIST:VMS:FUNCTION:
+ENGINE_get_load_privkey_function        3172   EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_get_load_privkey_fn              3172   EXIST:VMS:FUNCTION:ENGINE
 OCSP_RESPONSE_free                      3173   EXIST::FUNCTION:
 UI_method_set_reader                    3174   EXIST::FUNCTION:
 i2d_ASN1_T61STRING                      3175   EXIST::FUNCTION:
@@ -2736,7 +2736,7 @@ OCSP_crlID_new                          3181      EXIST:!OS2,!VMS,!WIN16:FUNCTION:
 OCSP_crlID2_new                         3181   EXIST:OS2,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:
+ENGINE_set_default_string               3184   EXIST::FUNCTION:ENGINE
 CONF_module_get_usr_data                3185   EXIST::FUNCTION:
 ASN1_add_oid_module                     3186   EXIST::FUNCTION:
 CONF_modules_finish                     3187   EXIST::FUNCTION:
@@ -2754,7 +2754,7 @@ CONF_imodule_get_name                   3198      EXIST::FUNCTION:
 ERR_peek_top_error                      3199   NOEXIST::FUNCTION:
 CONF_imodule_get_usr_data               3200   EXIST::FUNCTION:
 CONF_imodule_set_flags                  3201   EXIST::FUNCTION:
-ENGINE_add_conf_module                  3202   EXIST::FUNCTION:
+ENGINE_add_conf_module                  3202   EXIST::FUNCTION:ENGINE
 ERR_peek_last_error_line                3203   EXIST::FUNCTION:
 ERR_peek_last_error_line_data           3204   EXIST::FUNCTION:
 ERR_peek_last_error                     3205   EXIST::FUNCTION:
@@ -2762,8 +2762,8 @@ DES_read_2passwords                     3206      EXIST::FUNCTION:DES
 DES_read_password                       3207   EXIST::FUNCTION:DES
 UI_UTIL_read_pw                         3208   EXIST::FUNCTION:
 UI_UTIL_read_pw_string                  3209   EXIST::FUNCTION:
-ENGINE_load_aep                         3210   EXIST::FUNCTION:STATIC_ENGINE
-ENGINE_load_sureware                    3211   EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_aep                         3210   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ENGINE_load_sureware                    3211   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 OPENSSL_add_all_algorithms_noconf       3212   EXIST:!VMS:FUNCTION:
 OPENSSL_add_all_algo_noconf             3212   EXIST:VMS:FUNCTION:
 OPENSSL_add_all_algorithms_conf         3213   EXIST:!VMS:FUNCTION:
@@ -2772,7 +2772,7 @@ OPENSSL_load_builtin_modules            3214      EXIST::FUNCTION:
 AES_ofb128_encrypt                      3215   EXIST::FUNCTION:AES
 AES_ctr128_encrypt                      3216   EXIST::FUNCTION:AES
 AES_cfb128_encrypt                      3217   EXIST::FUNCTION:AES
-ENGINE_load_4758cca                     3218   EXIST::FUNCTION:STATIC_ENGINE
+ENGINE_load_4758cca                     3218   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 _ossl_096_des_random_seed               3219   EXIST::FUNCTION:DES
 EVP_aes_256_ofb                         3220   EXIST::FUNCTION:AES
 EVP_aes_192_ofb                         3221   EXIST::FUNCTION:AES
@@ -2793,7 +2793,7 @@ ASN1_UNIVERSALSTRING_it                 3234      EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 d2i_ASN1_UNIVERSALSTRING                3235   EXIST::FUNCTION:
 EVP_des_ede3_ecb                        3236   EXIST::FUNCTION:DES
 X509_REQ_print_ex                       3237   EXIST::FUNCTION:BIO
-ENGINE_up_ref                           3238   EXIST::FUNCTION:
+ENGINE_up_ref                           3238   EXIST::FUNCTION:ENGINE
 BUF_MEM_grow_clean                      3239   EXIST::FUNCTION:
 CRYPTO_realloc_clean                    3240   EXIST::FUNCTION:
 BUF_strlcat                             3241   EXIST::FUNCTION:
@@ -2802,12 +2802,12 @@ BUF_strlcpy                             3243    EXIST::FUNCTION:
 OpenSSLDie                              3244   EXIST::FUNCTION:
 OPENSSL_cleanse                         3245   EXIST::FUNCTION:
 BN_get0_nist_prime_384                  3246   EXIST::FUNCTION:
-ENGINE_register_ECDSA                   3247   EXIST::FUNCTION:
+ENGINE_register_ECDSA                   3247   EXIST::FUNCTION:ENGINE
 BN_nist_mod_192                         3248   EXIST::FUNCTION:
 EC_GROUP_get_trinomial_basis            3249   EXIST::FUNCTION:EC
 ECDH_get_default_method                 3250   EXIST::FUNCTION:ECDH
 PKCS12_add_safe                         3251   EXIST::FUNCTION:
-ENGINE_register_ECDH                    3252   EXIST::FUNCTION:
+ENGINE_register_ECDH                    3252   EXIST::FUNCTION:ENGINE
 i2d_ECPrivateKey                        3253   EXIST::FUNCTION:EC
 BN_get0_nist_prime_192                  3254   EXIST::FUNCTION:
 EC_POINT_set_affine_coordinates_GF2m    3255   EXIST:!VMS:FUNCTION:EC
@@ -2821,10 +2821,10 @@ EC_GROUP_check_discriminant             3261    EXIST::FUNCTION:EC
 EC_POINT_point2bn                       3262   EXIST::FUNCTION:EC
 EC_GROUP_new_curve_GF2m                 3263   EXIST::FUNCTION:EC
 EVP_PKEY_get1_EC_KEY                    3264   EXIST::FUNCTION:EC
-ENGINE_get_default_ECDH                 3265   EXIST::FUNCTION:
+ENGINE_get_default_ECDH                 3265   EXIST::FUNCTION:ENGINE
 ASN1_OCTET_STRING_NDEF_it               3266   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_OCTET_STRING_NDEF_it               3266   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_static_state                 3267   EXIST::FUNCTION:
+ENGINE_get_static_state                 3267   EXIST::FUNCTION:ENGINE
 ECDSA_SIG_new                           3268   EXIST::FUNCTION:ECDSA
 BN_GF2m_mod_sqr                         3269   EXIST::FUNCTION:
 EC_POINT_bn2point                       3270   EXIST::FUNCTION:EC
@@ -2845,7 +2845,7 @@ BN_GF2m_mod_arr                         3283      EXIST::FUNCTION:
 PEM_write_bio_X509_CERT_PAIR            3284   EXIST::FUNCTION:
 ECDH_get_ex_data                        3285   EXIST::FUNCTION:ECDH
 ECDSA_do_sign                           3286   EXIST::FUNCTION:ECDSA
-ENGINE_unregister_ECDH                  3287   EXIST::FUNCTION:
+ENGINE_unregister_ECDH                  3287   EXIST::FUNCTION:ENGINE
 ECDH_OpenSSL                            3288   EXIST::FUNCTION:ECDH
 EC_POINT_dup                            3289   EXIST::FUNCTION:EC
 EC_get_builtin_curves                   3290   EXIST::FUNCTION:EC
@@ -2863,7 +2863,7 @@ i2d_ECParameters                        3301      EXIST::FUNCTION:EC
 i2d_ECPKParameters                      3302   EXIST::FUNCTION:EC
 BN_ncopy                                3303   EXIST::FUNCTION:
 d2i_ECPKParameters                      3304   EXIST::FUNCTION:EC
-ENGINE_set_ECDH                         3305   EXIST::FUNCTION:
+ENGINE_set_ECDH                         3305   EXIST::FUNCTION:ENGINE
 PEM_write_bio_EC_PUBKEY                 3306   EXIST::FUNCTION:EC
 ECParameters_print                      3307   EXIST::FUNCTION:BIO,EC
 ASN1_generate_nconf                     3308   EXIST::FUNCTION:
@@ -2886,7 +2886,7 @@ X509_CERT_PAIR_it                       3324      EXIST:!EXPORT_VAR_AS_FUNCTION:VARIA
 X509_CERT_PAIR_it                       3324   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 BN_GF2m_mod_sqr_arr                     3325   EXIST::FUNCTION:
 EC_GROUP_set_curve_GF2m                 3326   EXIST::FUNCTION:EC
-ENGINE_set_default_ECDSA                3327   EXIST::FUNCTION:
+ENGINE_set_default_ECDSA                3327   EXIST::FUNCTION:ENGINE
 BN_GF2m_mod_sqrt                        3328   EXIST::FUNCTION:
 ECDH_set_default_method                 3329   EXIST::FUNCTION:ECDH
 EC_KEY_generate_key                     3330   EXIST::FUNCTION:EC
@@ -2911,7 +2911,7 @@ BN_GF2m_mod_exp                         3348      EXIST::FUNCTION:
 EC_GROUP_get0_seed                      3349   EXIST::FUNCTION:EC
 ecdsa_check                             3350   EXIST::FUNCTION:ECDSA
 BN_GF2m_mod_div_arr                     3351   EXIST::FUNCTION:
-ENGINE_set_ECDSA                        3352   EXIST::FUNCTION:
+ENGINE_set_ECDSA                        3352   EXIST::FUNCTION:ENGINE
 ECPKParameters_print                    3353   EXIST::FUNCTION:BIO,EC
 PEM_write_EC_PUBKEY                     3354   EXIST:!WIN16:FUNCTION:EC
 ECDH_set_method                         3355   EXIST::FUNCTION:ECDH
@@ -2935,14 +2935,14 @@ BN_nist_mod_384                         3370    EXIST::FUNCTION:
 i2d_X509_CERT_PAIR                      3371   EXIST::FUNCTION:
 PEM_write_ECPKParameters                3372   EXIST:!WIN16:FUNCTION:EC
 ECDH_compute_key                        3373   EXIST::FUNCTION:ECDH
-ENGINE_register_all_ECDH                3374   EXIST::FUNCTION:
+ENGINE_register_all_ECDH                3374   EXIST::FUNCTION:ENGINE
 BN_GF2m_mod_solve_quad                  3375   EXIST::FUNCTION:
 i2d_ECPrivateKey_fp                     3376   EXIST::FUNCTION:EC,FP_API
-ENGINE_register_all_ECDSA               3377   EXIST::FUNCTION:
+ENGINE_register_all_ECDSA               3377   EXIST::FUNCTION:ENGINE
 EC_POINT_get_affine_coordinates_GF2m    3378   EXIST:!VMS:FUNCTION:EC
 EC_POINT_get_affine_coords_GF2m         3378   EXIST:VMS:FUNCTION:EC
 EC_GROUP_dup                            3379   EXIST::FUNCTION:EC
-ENGINE_get_default_ECDSA                3380   EXIST::FUNCTION:
+ENGINE_get_default_ECDSA                3380   EXIST::FUNCTION:ENGINE
 EC_KEY_new                              3381   EXIST::FUNCTION:EC
 ECDSA_verify                            3382   EXIST::FUNCTION:ECDSA
 EC_POINT_point2hex                      3383   EXIST::FUNCTION:EC
@@ -2962,10 +2962,10 @@ ECDSA_size                              3396    EXIST::FUNCTION:ECDSA
 d2i_EC_PUBKEY_bio                       3397   EXIST::FUNCTION:BIO,EC
 BN_get0_nist_prime_521                  3398   EXIST::FUNCTION:
 PEM_read_bio_ECPrivateKey               3399   EXIST::FUNCTION:EC
-ENGINE_get_ECDH                         3400   EXIST::FUNCTION:
+ENGINE_get_ECDH                         3400   EXIST::FUNCTION:ENGINE
 d2i_ECDSA_SIG                           3401   EXIST::FUNCTION:ECDSA
 ECDSA_sign                              3402   EXIST::FUNCTION:ECDSA
-ENGINE_get_ECDSA                        3403   EXIST::FUNCTION:
+ENGINE_get_ECDSA                        3403   EXIST::FUNCTION:ENGINE
 EVP_ecdsa                               3404   EXIST::FUNCTION:SHA
 PKCS12_add_cert                         3405   EXIST::FUNCTION:
 ERR_load_ECDH_strings                   3406   EXIST::FUNCTION:ECDH
@@ -2982,12 +2982,12 @@ d2i_EC_PUBKEY_fp                        3416    EXIST::FUNCTION:EC,FP_API
 ecdh_check                              3417   EXIST::FUNCTION:ECDH
 ECDSA_DATA_new_method                   3418   EXIST::FUNCTION:ECDSA
 PEM_read_bio_X509_CERT_PAIR             3419   EXIST::FUNCTION:
-ENGINE_set_default_ECDH                 3420   EXIST::FUNCTION:
+ENGINE_set_default_ECDH                 3420   EXIST::FUNCTION:ENGINE
 PKCS12_add_key                          3421   EXIST::FUNCTION:
 DSO_merge                               3422   EXIST::FUNCTION:
 EC_POINT_hex2point                      3423   EXIST::FUNCTION:EC
 BN_GF2m_mod_inv_arr                     3424   EXIST::FUNCTION:
-ENGINE_unregister_ECDSA                 3425   EXIST::FUNCTION:
+ENGINE_unregister_ECDSA                 3425   EXIST::FUNCTION:ENGINE
 BN_GENCB_call                           3426   EXIST::FUNCTION:
 BN_is_prime_ex                          3427   EXIST::FUNCTION:
 RSA_generate_key_ex                     3428   EXIST::FUNCTION:RSA
@@ -2995,3 +2995,4 @@ DSA_generate_parameters_ex              3429      EXIST::FUNCTION:DSA
 BN_generate_prime_ex                    3430   EXIST::FUNCTION:
 DH_generate_parameters_ex               3431   EXIST::FUNCTION:DH
 BN_is_prime_fasttest_ex                 3432   EXIST::FUNCTION:
+ENGINE_load_gmp                         3433   EXIST::FUNCTION:ENGINE,STATIC_ENGINE