Remove EXPORT_VAR_AS_FUNC
authorRich Salz <rsalz@akamai.com>
Mon, 1 Jul 2019 20:24:08 +0000 (16:24 -0400)
committerRich Salz <rsalz@akamai.com>
Tue, 2 Jul 2019 00:13:03 +0000 (20:13 -0400)
We only export functions, not global, so remove the config option
and some of the #ifdef stuff.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9285)

13 files changed:
CHANGES
Configurations/10-main.conf
Configurations/50-win-onecore.conf
Configurations/README
Configure
include/openssl/asn1.h
include/openssl/asn1t.h
include/openssl/opensslconf.h.in
util/find-doc-nits
util/libcrypto.num
util/mkdef.pl
util/perl/OpenSSL/Ordinals.pm
util/perl/OpenSSL/ParseC.pm

diff --git a/CHANGES b/CHANGES
index accaee5..cc7a964 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@
 
   *) Removed DES_check_key.  Also removed OPENSSL_IMPLEMENT_GLOBAL,
      OPENSSL_GLOBAL_REF, OPENSSL_DECLARE_GLOBAL.
+     Also removed "export var as function" capability; we do not export
+     variables, only functions.
      [Rich Salz]
 
   *) RC5_32_set_key has been changed to return an int type, with 0 indicating
index ad85990..9b08cf4 100644 (file)
@@ -1274,7 +1274,6 @@ my %targets = (
         shared_target    => "win-shared", # meaningless except it gives Configure a hint
         thread_scheme    => "winthreads",
         dso_scheme       => "win32",
-        bn_ops           => "EXPORT_VAR_AS_FN",
         perl_platform    => 'Windows::MSVC',
         # additional parameter to build_scheme denotes install-path "flavour"
         build_scheme     => add("VC-common", { separator => undef }),
@@ -1426,7 +1425,6 @@ my %targets = (
                                     threads("-D_MT")),
         lib_cppflags     => "-DL_ENDIAN",
         ex_libs          => add("-lws2_32 -lgdi32 -lcrypt32"),
-        bn_ops           => "EXPORT_VAR_AS_FN",
         thread_scheme    => "winthreads",
         dso_scheme       => "win32",
         shared_target    => "mingw-shared",
index 2cc3928..42a1ee0 100644 (file)
@@ -47,7 +47,7 @@ my %targets = (
         inherit_from    => [ "VC-noCE-common" ],
         defines         => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE",
                                "OPENSSL_SYS_WIN_CORE"),
-        bn_ops          => "BN_LLONG RC4_CHAR EXPORT_VAR_AS_FN",
+        bn_ops          => "BN_LLONG RC4_CHAR",
         lflags          => add("/NODEFAULTLIB:kernel32.lib"),
         ex_libs         => "onecore.lib",
         multilib        => "-arm",
@@ -56,7 +56,7 @@ my %targets = (
         inherit_from    => [ "VC-noCE-common" ],
         defines         => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE",
                                "OPENSSL_SYS_WIN_CORE"),
-        bn_ops          => "SIXTY_FOUR_BIT RC4_CHAR EXPORT_VAR_AS_FN",
+        bn_ops          => "SIXTY_FOUR_BIT RC4_CHAR",
         lflags          => add("/NODEFAULTLIB:kernel32.lib"),
         ex_libs         => "onecore.lib",
         multilib        => "-arm64",
index fa99539..a0618ca 100644 (file)
@@ -236,9 +236,6 @@ In each table entry, the following keys are significant:
                                                 up of 'unsigned char's;
                            RC4_INT              RC4 key schedule is made
                                                 up of 'unsigned int's;
-                           EXPORT_VAR_AS_FN     for shared libraries,
-                                                export vars as
-                                                accessor functions.
 
 
 [1] as part of the target configuration, one can have a key called
index 987eb74..30f9e61 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1456,7 +1456,6 @@ if (!$disabled{asm} && !$predefined_C{__MACH__} && $^O ne 'VMS') {
 # Deal with bn_ops ###################################################
 
 $config{bn_ll}                  =0;
-$config{export_var_as_fn}       =0;
 my $def_int="unsigned int";
 $config{rc4_int}                =$def_int;
 ($config{b64l},$config{b64},$config{b32})=(0,0,1);
@@ -1464,7 +1463,6 @@ $config{rc4_int}                =$def_int;
 my $count = 0;
 foreach (sort split(/\s+/,$target{bn_ops})) {
     $count++ if /SIXTY_FOUR_BIT|SIXTY_FOUR_BIT_LONG|THIRTY_TWO_BIT/;
-    $config{export_var_as_fn}=1                 if $_ eq 'EXPORT_VAR_AS_FN';
     $config{bn_ll}=1                            if $_ eq 'BN_LLONG';
     $config{rc4_int}="unsigned char"            if $_ eq 'RC4_CHAR';
     ($config{b64l},$config{b64},$config{b32})
index 3790c6b..3268db1 100644 (file)
@@ -310,23 +310,6 @@ TYPEDEF_D2I2D_OF(void);
  *
  */
 
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM ASN1_ITEM_EXP;
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr)
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#  define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#  define DECLARE_ASN1_ITEM(name) \
-        OPENSSL_EXTERN const ASN1_ITEM name##_it;
-
-# else
 
 /*
  * Platforms that can't easily handle shared global variables are declared as
@@ -337,18 +320,16 @@ typedef const ASN1_ITEM ASN1_ITEM_EXP;
 typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
 
 /* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr())
+# define ASN1_ITEM_ptr(iptr) (iptr())
 
 /* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (iptr##_it)
+# define ASN1_ITEM_ref(iptr) (iptr##_it)
 
-#  define ASN1_ITEM_rptr(ref) (ref##_it())
+# define ASN1_ITEM_rptr(ref) (ref##_it())
 
-#  define DECLARE_ASN1_ITEM(name) \
+# define DECLARE_ASN1_ITEM(name) \
         const ASN1_ITEM * name##_it(void);
 
-# endif
-
 /* Parameters used by ASN1_STRING_print_ex() */
 
 /*
index 8158c41..568b347 100644 (file)
 extern "C" {
 #endif
 
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        const ASN1_ITEM itname##_it = {
-
-#  define static_ASN1_ITEM_start(itname) \
-        static const ASN1_ITEM itname##_it = {
-
-#  define ASN1_ITEM_end(itname)                 \
-                };
-
-# else
-
 /* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)((iptr)()))
+# define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)((iptr)()))
 
 /* Macros for start and end of ASN1_ITEM definition */
 
-#  define ASN1_ITEM_start(itname) \
+# define ASN1_ITEM_start(itname) \
         const ASN1_ITEM * itname##_it(void) \
         { \
                 static const ASN1_ITEM local_it = {
 
-#  define static_ASN1_ITEM_start(itname) \
+# define static_ASN1_ITEM_start(itname) \
         static ASN1_ITEM_start(itname)
 
-#  define ASN1_ITEM_end(itname) \
+# define ASN1_ITEM_end(itname) \
                 }; \
         return &local_it; \
         }
 
-# endif
-
 /* Macros to aid ASN1 template writing */
 
 # define ASN1_ITEM_TEMPLATE(tname) \
@@ -335,13 +315,9 @@ extern "C" {
 
 /* Any defined by macros: the field used is in the table itself */
 
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-# else
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
-# endif
+# define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
+# define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
+
 /* Plain simple type */
 # define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
 /* Embedded simple type */
@@ -421,23 +397,7 @@ extern "C" {
 # define ASN1_ADB(name) \
         static const ASN1_ADB_TABLE name##_adbtbl[]
 
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#  define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
-        ;\
-        static const ASN1_ADB name##_adb = {\
-                flags,\
-                offsetof(name, field),\
-                adb_cb,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-        }
-
-# else
-
-#  define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
+# define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
         ;\
         static const ASN1_ITEM *name##_adb(void) \
         { \
@@ -455,8 +415,6 @@ extern "C" {
         } \
         void dummy_function(void)
 
-# endif
-
 # define ADB_ENTRY(val, template) {val, template}
 
 # define ASN1_ADB_TEMPLATE(name) \
index 0f99079..6c6b4f3 100644 (file)
@@ -165,8 +165,6 @@ extern "C" {
 /* Generate 80386 code? */
 {- $config{processor} eq "386" ? "# define" : "# undef" -} I386_ONLY
 
-{- $config{export_var_as_fn} ? "# define" : "# undef" -} OPENSSL_EXPORT_VAR_AS_FUNCTION
-
 /*
  * The following are cipher-specific, but are part of the public API.
  */
index f6a638c..ecd9f9a 100755 (executable)
@@ -266,7 +266,6 @@ sub parsenum()
     while ( <$IN> ) {
         next if /^#/;
         next if /\bNOEXIST\b/;
-        next if /\bEXPORT_VAR_AS_FUNC\b/;
         my @fields = split();
         die "Malformed line $_"
             if scalar @fields != 2 && scalar @fields != 4;
index 7d77513..d003124 100644 (file)
@@ -13,8 +13,7 @@ X509_NAME_get0_der                      12    3_0_0   EXIST::FUNCTION:
 i2d_ESS_ISSUER_SERIAL                   13     3_0_0   EXIST::FUNCTION:
 X509at_get_attr_by_NID                  14     3_0_0   EXIST::FUNCTION:
 X509_PUBKEY_set0_param                  15     3_0_0   EXIST::FUNCTION:
-PKCS12_it                               16     3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS12_it                               16     3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS12_it                               16     3_0_0   EXIST::FUNCTION:
 i2d_ASN1_OCTET_STRING                   17     3_0_0   EXIST::FUNCTION:
 EC_KEY_set_private_key                  18     3_0_0   EXIST::FUNCTION:EC
 SRP_VBASE_get_by_user                   19     3_0_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SRP
@@ -40,8 +39,7 @@ PEM_read_bio_PUBKEY                     39    3_0_0   EXIST::FUNCTION:
 X509_NAME_delete_entry                  40     3_0_0   EXIST::FUNCTION:
 EVP_PKEY_meth_set_verify_recover        41     3_0_0   EXIST::FUNCTION:
 UI_set_method                           42     3_0_0   EXIST::FUNCTION:
-PKCS7_ISSUER_AND_SERIAL_it              43     3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_ISSUER_AND_SERIAL_it              43     3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_ISSUER_AND_SERIAL_it              43     3_0_0   EXIST::FUNCTION:
 EC_GROUP_method_of                      44     3_0_0   EXIST::FUNCTION:EC
 RSA_blinding_on                         45     3_0_0   EXIST::FUNCTION:RSA
 X509_get0_signature                     47     3_0_0   EXIST::FUNCTION:
@@ -181,8 +179,7 @@ OCSP_response_status                    182 3_0_0   EXIST::FUNCTION:OCSP
 i2d_ASN1_PRINTABLESTRING                183    3_0_0   EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_hostflags         184    3_0_0   EXIST::FUNCTION:
 SCT_get0_log_id                         185    3_0_0   EXIST::FUNCTION:CT
-ASN1_IA5STRING_it                       186    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_IA5STRING_it                       186    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_IA5STRING_it                       186    3_0_0   EXIST::FUNCTION:
 PEM_write_bio_ECPrivateKey              187    3_0_0   EXIST::FUNCTION:EC
 BN_consttime_swap                       188    3_0_0   EXIST::FUNCTION:
 BIO_f_buffer                            189    3_0_0   EXIST::FUNCTION:
@@ -214,8 +211,7 @@ PEM_write_PKCS8_PRIV_KEY_INFO           214 3_0_0   EXIST::FUNCTION:STDIO
 X509at_get0_data_by_OBJ                 215    3_0_0   EXIST::FUNCTION:
 b2i_PublicKey_bio                       216    3_0_0   EXIST::FUNCTION:DSA
 s2i_ASN1_OCTET_STRING                   217    3_0_0   EXIST::FUNCTION:
-POLICYINFO_it                           218    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-POLICYINFO_it                           218    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+POLICYINFO_it                           218    3_0_0   EXIST::FUNCTION:
 OBJ_create                              219    3_0_0   EXIST::FUNCTION:
 d2i_NOTICEREF                           220    3_0_0   EXIST::FUNCTION:
 BN_get_rfc2409_prime_768                221    3_0_0   EXIST::FUNCTION:
@@ -264,8 +260,7 @@ PKCS7_add1_attrib_digest                265 3_0_0   EXIST::FUNCTION:
 EC_POINT_get_affine_coordinates_GFp     266    3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC
 EVP_seed_ecb                            267    3_0_0   EXIST::FUNCTION:SEED
 BIO_dgram_sctp_wait_for_dry             268    3_0_0   EXIST::FUNCTION:DGRAM,SCTP
-ASN1_OCTET_STRING_NDEF_it               269    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_OCTET_STRING_NDEF_it               269    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_OCTET_STRING_NDEF_it               269    3_0_0   EXIST::FUNCTION:
 EVP_PKEY_asn1_get_count                 270    3_0_0   EXIST::FUNCTION:
 WHIRLPOOL_Init                          271    3_0_0   EXIST::FUNCTION:WHIRLPOOL
 EVP_OpenInit                            272    3_0_0   EXIST::FUNCTION:RSA
@@ -340,13 +335,11 @@ BIO_get_host_ip                         340       3_0_0   EXIST::FUNCTION:DEPRECATEDIN_1
 PKCS7_add_certificate                   341    3_0_0   EXIST::FUNCTION:
 TS_REQ_get_ext                          342    3_0_0   EXIST::FUNCTION:TS
 X509_NAME_cmp                           343    3_0_0   EXIST::FUNCTION:
-DIST_POINT_it                           344    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-DIST_POINT_it                           344    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+DIST_POINT_it                           344    3_0_0   EXIST::FUNCTION:
 PEM_read_X509_CRL                       345    3_0_0   EXIST::FUNCTION:STDIO
 OPENSSL_sk_sort                         346    3_0_0   EXIST::FUNCTION:
 CTLOG_STORE_load_file                   347    3_0_0   EXIST::FUNCTION:CT
-ASN1_SEQUENCE_it                        348    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_SEQUENCE_it                        348    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_SEQUENCE_it                        348    3_0_0   EXIST::FUNCTION:
 TS_RESP_CTX_get_tst_info                349    3_0_0   EXIST::FUNCTION:TS
 RC4                                     350    3_0_0   EXIST::FUNCTION:RC4
 PKCS7_stream                            352    3_0_0   EXIST::FUNCTION:
@@ -360,8 +353,7 @@ PKCS12_mac_present                      359 3_0_0   EXIST::FUNCTION:
 d2i_PUBKEY_bio                          360    3_0_0   EXIST::FUNCTION:
 BN_asc2bn                               361    3_0_0   EXIST::FUNCTION:
 EVP_desx_cbc                            362    3_0_0   EXIST::FUNCTION:DES
-SXNETID_it                              363    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-SXNETID_it                              363    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+SXNETID_it                              363    3_0_0   EXIST::FUNCTION:
 CRYPTO_gcm128_encrypt                   364    3_0_0   EXIST::FUNCTION:
 EVP_PKEY_CTX_ctrl_str                   365    3_0_0   EXIST::FUNCTION:
 CMS_signed_add1_attr_by_txt             366    3_0_0   EXIST::FUNCTION:CMS
@@ -470,8 +462,7 @@ OCSP_RESPID_free                        470 3_0_0   EXIST::FUNCTION:OCSP
 PKCS5_pbe2_set                          471    3_0_0   EXIST::FUNCTION:
 SCT_set_signature_nid                   473    3_0_0   EXIST::FUNCTION:CT
 i2d_RSA_PUBKEY_fp                       474    3_0_0   EXIST::FUNCTION:RSA,STDIO
-PKCS12_BAGS_it                          475    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS12_BAGS_it                          475    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS12_BAGS_it                          475    3_0_0   EXIST::FUNCTION:
 X509_pubkey_digest                      476    3_0_0   EXIST::FUNCTION:
 ENGINE_register_all_RSA                 477    3_0_0   EXIST::FUNCTION:ENGINE
 CRYPTO_THREAD_set_local                 478    3_0_0   EXIST::FUNCTION:
@@ -489,14 +480,12 @@ X509_STORE_set_trust                    489       3_0_0   EXIST::FUNCTION:
 d2i_POLICYINFO                          490    3_0_0   EXIST::FUNCTION:
 DES_cbc_encrypt                         491    3_0_0   EXIST::FUNCTION:DES
 BN_GF2m_mod_sqr_arr                     492    3_0_0   EXIST::FUNCTION:EC2M
-ASN1_PRINTABLESTRING_it                 493    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_PRINTABLESTRING_it                 493    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_PRINTABLESTRING_it                 493    3_0_0   EXIST::FUNCTION:
 BIO_f_cipher                            494    3_0_0   EXIST::FUNCTION:
 UI_destroy_method                       495    3_0_0   EXIST::FUNCTION:
 BN_get_rfc3526_prime_3072               496    3_0_0   EXIST::FUNCTION:
 X509_INFO_new                           497    3_0_0   EXIST::FUNCTION:
-OCSP_RESPDATA_it                        498    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_RESPDATA_it                        498    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_RESPDATA_it                        498    3_0_0   EXIST::FUNCTION:OCSP
 X509_CRL_print                          499    3_0_0   EXIST::FUNCTION:
 WHIRLPOOL_Update                        500    3_0_0   EXIST::FUNCTION:WHIRLPOOL
 DSA_get_ex_data                         501    3_0_0   EXIST::FUNCTION:DSA
@@ -542,8 +531,7 @@ ENGINE_unregister_RAND                  542 3_0_0   EXIST::FUNCTION:ENGINE
 PEM_write_bio_RSAPrivateKey             543    3_0_0   EXIST::FUNCTION:RSA
 CONF_get_number                         544    3_0_0   EXIST::FUNCTION:
 X509_EXTENSION_get_object               545    3_0_0   EXIST::FUNCTION:
-X509_EXTENSIONS_it                      546    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_EXTENSIONS_it                      546    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_EXTENSIONS_it                      546    3_0_0   EXIST::FUNCTION:
 EC_POINT_set_compressed_coordinates_GF2m 547   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M
 RSA_sign_ASN1_OCTET_STRING              548    3_0_0   EXIST::FUNCTION:RSA
 d2i_X509_CRL_fp                         549    3_0_0   EXIST::FUNCTION:STDIO
@@ -595,11 +583,9 @@ RAND_query_egd_bytes                    596        3_0_0   EXIST::FUNCTION:EGD
 i2d_ASN1_PRINTABLE                      597    3_0_0   EXIST::FUNCTION:
 ENGINE_cmd_is_executable                598    3_0_0   EXIST::FUNCTION:ENGINE
 BIO_puts                                599    3_0_0   EXIST::FUNCTION:
-RSAPublicKey_it                         601    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
-RSAPublicKey_it                         601    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+RSAPublicKey_it                         601    3_0_0   EXIST::FUNCTION:RSA
 ISSUING_DIST_POINT_new                  602    3_0_0   EXIST::FUNCTION:
-X509_VAL_it                             603    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_VAL_it                             603    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_VAL_it                             603    3_0_0   EXIST::FUNCTION:
 EVP_DigestVerifyInit                    604    3_0_0   EXIST::FUNCTION:
 i2d_IPAddressChoice                     605    3_0_0   EXIST::FUNCTION:RFC3779
 EVP_md5                                 606    3_0_0   EXIST::FUNCTION:MD5
@@ -615,8 +601,7 @@ BN_is_negative                          615 3_0_0   EXIST::FUNCTION:
 EVP_PKEY_get_attr_count                 616    3_0_0   EXIST::FUNCTION:
 X509_REVOKED_get_ext_by_critical        617    3_0_0   EXIST::FUNCTION:
 X509at_get_attr                         618    3_0_0   EXIST::FUNCTION:
-X509_PUBKEY_it                          619    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_PUBKEY_it                          619    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_PUBKEY_it                          619    3_0_0   EXIST::FUNCTION:
 DES_ede3_ofb64_encrypt                  620    3_0_0   EXIST::FUNCTION:DES
 EC_KEY_METHOD_get_compute_key           621    3_0_0   EXIST::FUNCTION:EC
 RC2_cfb64_encrypt                       622    3_0_0   EXIST::FUNCTION:RC2
@@ -634,8 +619,7 @@ OCSP_REQ_CTX_nbio_d2i                   634 3_0_0   EXIST::FUNCTION:OCSP
 d2i_X509_REQ_fp                         635    3_0_0   EXIST::FUNCTION:STDIO
 DH_OpenSSL                              636    3_0_0   EXIST::FUNCTION:DH
 BN_get_rfc3526_prime_8192               637    3_0_0   EXIST::FUNCTION:
-X509_REVOKED_it                         638    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_REVOKED_it                         638    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_REVOKED_it                         638    3_0_0   EXIST::FUNCTION:
 CRYPTO_THREAD_write_lock                639    3_0_0   EXIST::FUNCTION:
 X509V3_NAME_from_section                640    3_0_0   EXIST::FUNCTION:
 EC_POINT_set_compressed_coordinates_GFp 641    3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC
@@ -670,8 +654,7 @@ PKCS5_pbe_set0_algor                    670 3_0_0   EXIST::FUNCTION:
 ENGINE_get_table_flags                  671    3_0_0   EXIST::FUNCTION:ENGINE
 PKCS12_MAC_DATA_new                     672    3_0_0   EXIST::FUNCTION:
 X509_chain_up_ref                       673    3_0_0   EXIST::FUNCTION:
-OCSP_REQINFO_it                         674    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_REQINFO_it                         674    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_REQINFO_it                         674    3_0_0   EXIST::FUNCTION:OCSP
 PKCS12_add_localkeyid                   675    3_0_0   EXIST::FUNCTION:
 PKCS12_SAFEBAG_get0_type                676    3_0_0   EXIST::FUNCTION:
 X509_TRUST_set_default                  677    3_0_0   EXIST::FUNCTION:
@@ -680,8 +663,7 @@ BN_sub                                  679 3_0_0   EXIST::FUNCTION:
 ASRange_free                            680    3_0_0   EXIST::FUNCTION:RFC3779
 EVP_aes_192_cfb8                        681    3_0_0   EXIST::FUNCTION:
 DSO_global_lookup                       682    3_0_0   EXIST::FUNCTION:
-PKCS7_SIGNER_INFO_it                    683    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_SIGNER_INFO_it                    683    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_SIGNER_INFO_it                    683    3_0_0   EXIST::FUNCTION:
 CRYPTO_ocb128_copy_ctx                  684    3_0_0   EXIST::FUNCTION:OCB
 TS_REQ_get_ext_d2i                      685    3_0_0   EXIST::FUNCTION:TS
 AES_ige_encrypt                         686    3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3
@@ -701,8 +683,7 @@ TS_RESP_CTX_set_signer_key              699 3_0_0   EXIST::FUNCTION:TS
 i2d_DSAPrivateKey_bio                   700    3_0_0   EXIST::FUNCTION:DSA
 ASN1_item_d2i                           702    3_0_0   EXIST::FUNCTION:
 BIO_int_ctrl                            703    3_0_0   EXIST::FUNCTION:
-CMS_ReceiptRequest_it                   704    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
-CMS_ReceiptRequest_it                   704    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
+CMS_ReceiptRequest_it                   704    3_0_0   EXIST::FUNCTION:CMS
 X509_ATTRIBUTE_get0_type                705    3_0_0   EXIST::FUNCTION:
 EVP_MD_meth_set_copy                    706    3_0_0   EXIST::FUNCTION:
 d2i_ASN1_ENUMERATED                     707    3_0_0   EXIST::FUNCTION:
@@ -720,8 +701,7 @@ BIO_new_PKCS7                           719 3_0_0   EXIST::FUNCTION:
 UI_get0_user_data                       720    3_0_0   EXIST::FUNCTION:
 TS_RESP_get_token                       721    3_0_0   EXIST::FUNCTION:TS
 OCSP_RESPID_new                         722    3_0_0   EXIST::FUNCTION:OCSP
-ASN1_SET_ANY_it                         723    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_SET_ANY_it                         723    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_SET_ANY_it                         723    3_0_0   EXIST::FUNCTION:
 d2i_TS_RESP_bio                         724    3_0_0   EXIST::FUNCTION:TS
 PEM_write_X509_REQ                      725    3_0_0   EXIST::FUNCTION:STDIO
 BIO_snprintf                            726    3_0_0   EXIST::FUNCTION:
@@ -825,8 +805,7 @@ PKCS7_DIGEST_free                       824 3_0_0   EXIST::FUNCTION:
 OBJ_nid2ln                              825    3_0_0   EXIST::FUNCTION:
 COMP_CTX_new                            826    3_0_0   EXIST::FUNCTION:COMP
 BIO_ADDR_family                         827    3_0_0   EXIST::FUNCTION:SOCK
-OCSP_RESPONSE_it                        828    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_RESPONSE_it                        828    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_RESPONSE_it                        828    3_0_0   EXIST::FUNCTION:OCSP
 BIO_ADDRINFO_socktype                   829    3_0_0   EXIST::FUNCTION:SOCK
 d2i_X509_REQ_bio                        830    3_0_0   EXIST::FUNCTION:
 EVP_PBE_cleanup                         831    3_0_0   EXIST::FUNCTION:
@@ -834,8 +813,7 @@ X509_STORE_CTX_get0_current_crl         832 3_0_0   EXIST::FUNCTION:
 CMS_get0_SignerInfos                    833    3_0_0   EXIST::FUNCTION:CMS
 EVP_PKEY_paramgen                       834    3_0_0   EXIST::FUNCTION:
 PEM_write_PKCS8PrivateKey_nid           835    3_0_0   EXIST::FUNCTION:STDIO
-PKCS7_ATTR_VERIFY_it                    836    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_ATTR_VERIFY_it                    836    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_ATTR_VERIFY_it                    836    3_0_0   EXIST::FUNCTION:
 OCSP_response_status_str                837    3_0_0   EXIST::FUNCTION:OCSP
 CRYPTO_gcm128_new                       838    3_0_0   EXIST::FUNCTION:
 SMIME_read_PKCS7                        839    3_0_0   EXIST::FUNCTION:
@@ -862,8 +840,7 @@ TXT_DB_insert                           860 3_0_0   EXIST::FUNCTION:
 EC_POINTs_make_affine                   861    3_0_0   EXIST::FUNCTION:EC
 RSA_padding_add_PKCS1_PSS               862    3_0_0   EXIST::FUNCTION:RSA
 BF_options                              863    3_0_0   EXIST::FUNCTION:BF
-OCSP_BASICRESP_it                       864    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_BASICRESP_it                       864    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_BASICRESP_it                       864    3_0_0   EXIST::FUNCTION:OCSP
 X509_VERIFY_PARAM_get0_name             865    3_0_0   EXIST::FUNCTION:
 TS_RESP_CTX_set_signer_digest           866    3_0_0   EXIST::FUNCTION:TS
 X509_VERIFY_PARAM_set1_email            867    3_0_0   EXIST::FUNCTION:
@@ -873,8 +850,7 @@ BN_GF2m_mod_sqrt_arr                    870 3_0_0   EXIST::FUNCTION:EC2M
 X509_get0_extensions                    871    3_0_0   EXIST::FUNCTION:
 TS_STATUS_INFO_set_status               872    3_0_0   EXIST::FUNCTION:TS
 RSA_verify                              873    3_0_0   EXIST::FUNCTION:RSA
-ASN1_FBOOLEAN_it                        874    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_FBOOLEAN_it                        874    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_FBOOLEAN_it                        874    3_0_0   EXIST::FUNCTION:
 d2i_ASN1_TIME                           875    3_0_0   EXIST::FUNCTION:
 EVP_PKEY_meth_get_signctx               876    3_0_0   EXIST::FUNCTION:
 EC_KEY_METHOD_set_compute_key           877    3_0_0   EXIST::FUNCTION:EC
@@ -892,8 +868,7 @@ X509_VERIFY_PARAM_set_purpose           889 3_0_0   EXIST::FUNCTION:
 i2d_TS_MSG_IMPRINT_bio                  890    3_0_0   EXIST::FUNCTION:TS
 X509_EXTENSION_set_object               891    3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_get_app_data             892    3_0_0   EXIST::FUNCTION:
-CRL_DIST_POINTS_it                      893    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-CRL_DIST_POINTS_it                      893    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+CRL_DIST_POINTS_it                      893    3_0_0   EXIST::FUNCTION:
 DIRECTORYSTRING_new                     894    3_0_0   EXIST::FUNCTION:
 ERR_load_ASYNC_strings                  895    3_0_0   EXIST::FUNCTION:
 EVP_bf_cfb64                            896    3_0_0   EXIST::FUNCTION:BF
@@ -934,8 +909,7 @@ X509at_add1_attr_by_NID                 931 3_0_0   EXIST::FUNCTION:
 DHparams_dup                            932    3_0_0   EXIST::FUNCTION:DH
 X509_get_ext                            933    3_0_0   EXIST::FUNCTION:
 X509_issuer_and_serial_hash             934    3_0_0   EXIST::FUNCTION:
-ASN1_BMPSTRING_it                       935    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_BMPSTRING_it                       935    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_BMPSTRING_it                       935    3_0_0   EXIST::FUNCTION:
 PEM_read_EC_PUBKEY                      936    3_0_0   EXIST::FUNCTION:EC,STDIO
 d2i_ASN1_IA5STRING                      937    3_0_0   EXIST::FUNCTION:
 TS_TST_INFO_ext_free                    938    3_0_0   EXIST::FUNCTION:TS
@@ -950,8 +924,7 @@ i2d_ECPrivateKey                        947 3_0_0   EXIST::FUNCTION:EC
 X509_NAME_ENTRY_create_by_OBJ           948    3_0_0   EXIST::FUNCTION:
 TS_VERIFY_CTX_cleanup                   949    3_0_0   EXIST::FUNCTION:TS
 ASN1_INTEGER_get                        950    3_0_0   EXIST::FUNCTION:
-ASN1_PRINTABLE_it                       951    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_PRINTABLE_it                       951    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_PRINTABLE_it                       951    3_0_0   EXIST::FUNCTION:
 EVP_VerifyFinal                         952    3_0_0   EXIST::FUNCTION:
 TS_ASN1_INTEGER_print_bio               953    3_0_0   EXIST::FUNCTION:TS
 X509_NAME_ENTRY_set_object              954    3_0_0   EXIST::FUNCTION:
@@ -970,10 +943,8 @@ TS_RESP_dup                             966        3_0_0   EXIST::FUNCTION:TS
 ERR_set_error_data                      967    3_0_0   EXIST::FUNCTION:
 BN_RECP_CTX_new                         968    3_0_0   EXIST::FUNCTION:
 DES_options                             969    3_0_0   EXIST::FUNCTION:DES
-IPAddressChoice_it                      970    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-IPAddressChoice_it                      970    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
-ASN1_UNIVERSALSTRING_it                 971    3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_UNIVERSALSTRING_it                 971    3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+IPAddressChoice_it                      970    3_0_0   EXIST::FUNCTION:RFC3779
+ASN1_UNIVERSALSTRING_it                 971    3_0_0   EXIST::FUNCTION:
 d2i_DSAPublicKey                        972    3_0_0   EXIST::FUNCTION:DSA
 ENGINE_get_name                         973    3_0_0   EXIST::FUNCTION:ENGINE
 CRYPTO_THREAD_read_lock                 974    3_0_0   EXIST::FUNCTION:
@@ -1001,8 +972,7 @@ a2i_IPADDRESS                           996        3_0_0   EXIST::FUNCTION:
 ERR_peek_error_line_data                997    3_0_0   EXIST::FUNCTION:
 ERR_unload_strings                      998    3_0_0   EXIST::FUNCTION:
 SEED_cfb128_encrypt                     999    3_0_0   EXIST::FUNCTION:SEED
-ASN1_BIT_STRING_it                      1000   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_BIT_STRING_it                      1000   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_BIT_STRING_it                      1000   3_0_0   EXIST::FUNCTION:
 PKCS12_decrypt_skey                     1001   3_0_0   EXIST::FUNCTION:
 ENGINE_register_EC                      1002   3_0_0   EXIST::FUNCTION:ENGINE
 OCSP_RESPONSE_new                       1003   3_0_0   EXIST::FUNCTION:OCSP
@@ -1015,8 +985,7 @@ ASN1_item_digest                        1009       3_0_0   EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_trust             1010   3_0_0   EXIST::FUNCTION:
 X509_STORE_CTX_get_error                1011   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_meth_set_encrypt               1012   3_0_0   EXIST::FUNCTION:
-ASN1_UTCTIME_it                         1013   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_UTCTIME_it                         1013   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_UTCTIME_it                         1013   3_0_0   EXIST::FUNCTION:
 i2d_DSA_PUBKEY_fp                       1014   3_0_0   EXIST::FUNCTION:DSA,STDIO
 X509at_get_attr_by_OBJ                  1015   3_0_0   EXIST::FUNCTION:
 EVP_MD_CTX_copy_ex                      1016   3_0_0   EXIST::FUNCTION:
@@ -1031,13 +1000,11 @@ X509_set_subject_name                   1025    3_0_0   EXIST::FUNCTION:
 i2d_PKCS8PrivateKey_nid_bio             1026   3_0_0   EXIST::FUNCTION:
 ERR_put_error                           1027   3_0_0   EXIST::FUNCTION:
 ERR_add_error_data                      1028   3_0_0   EXIST::FUNCTION:
-X509_ALGORS_it                          1029   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_ALGORS_it                          1029   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_ALGORS_it                          1029   3_0_0   EXIST::FUNCTION:
 MD5_Update                              1030   3_0_0   EXIST::FUNCTION:MD5
 X509_policy_check                       1031   3_0_0   EXIST::FUNCTION:
 X509_CRL_METHOD_new                     1032   3_0_0   EXIST::FUNCTION:
-ASN1_ANY_it                             1033   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_ANY_it                             1033   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_ANY_it                             1033   3_0_0   EXIST::FUNCTION:
 d2i_DSA_SIG                             1034   3_0_0   EXIST::FUNCTION:DSA
 DH_free                                 1035   3_0_0   EXIST::FUNCTION:DH
 ENGINE_register_all_DSA                 1036   3_0_0   EXIST::FUNCTION:ENGINE
@@ -1101,8 +1068,7 @@ ERR_load_PEM_strings                    1094      3_0_0   EXIST::FUNCTION:
 ENGINE_unregister_pkey_asn1_meths       1095   3_0_0   EXIST::FUNCTION:ENGINE
 IPAddressFamily_free                    1096   3_0_0   EXIST::FUNCTION:RFC3779
 UI_method_get_prompt_constructor        1097   3_0_0   EXIST::FUNCTION:
-ASN1_NULL_it                            1098   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_NULL_it                            1098   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_NULL_it                            1098   3_0_0   EXIST::FUNCTION:
 X509_REQ_get_pubkey                     1099   3_0_0   EXIST::FUNCTION:
 X509_CRL_set1_nextUpdate                1100   3_0_0   EXIST::FUNCTION:
 EVP_des_ede3_cfb64                      1101   3_0_0   EXIST::FUNCTION:DES
@@ -1127,8 +1093,7 @@ RSA_print_fp                            1119      3_0_0   EXIST::FUNCTION:RSA,STDIO
 OPENSSL_INIT_set_config_appname         1120   3_0_0   EXIST::FUNCTION:STDIO
 EC_KEY_print_fp                         1121   3_0_0   EXIST::FUNCTION:EC,STDIO
 BIO_dup_chain                           1122   3_0_0   EXIST::FUNCTION:
-PKCS8_PRIV_KEY_INFO_it                  1123   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS8_PRIV_KEY_INFO_it                  1123   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS8_PRIV_KEY_INFO_it                  1123   3_0_0   EXIST::FUNCTION:
 RSA_OAEP_PARAMS_free                    1124   3_0_0   EXIST::FUNCTION:RSA
 ASN1_item_new                           1125   3_0_0   EXIST::FUNCTION:
 CRYPTO_cts128_encrypt                   1126   3_0_0   EXIST::FUNCTION:
@@ -1137,8 +1102,7 @@ PEM_write                               1128      3_0_0   EXIST::FUNCTION:STDIO
 EVP_CIPHER_meth_get_get_asn1_params     1129   3_0_0   EXIST::FUNCTION:
 i2d_OCSP_RESPBYTES                      1130   3_0_0   EXIST::FUNCTION:OCSP
 d2i_ASN1_UTF8STRING                     1131   3_0_0   EXIST::FUNCTION:
-EXTENDED_KEY_USAGE_it                   1132   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-EXTENDED_KEY_USAGE_it                   1132   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+EXTENDED_KEY_USAGE_it                   1132   3_0_0   EXIST::FUNCTION:
 EVP_CipherInit                          1133   3_0_0   EXIST::FUNCTION:
 PKCS12_add_safe                         1134   3_0_0   EXIST::FUNCTION:
 ENGINE_get_digest                       1135   3_0_0   EXIST::FUNCTION:ENGINE
@@ -1171,8 +1135,7 @@ ASN1_tag2str                            1161      3_0_0   EXIST::FUNCTION:
 BN_zero_ex                              1162   3_0_0   EXIST::FUNCTION:
 X509_NAME_dup                           1163   3_0_0   EXIST::FUNCTION:
 SCT_LIST_print                          1164   3_0_0   EXIST::FUNCTION:CT
-NOTICEREF_it                            1165   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NOTICEREF_it                            1165   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+NOTICEREF_it                            1165   3_0_0   EXIST::FUNCTION:
 CMS_add0_crl                            1166   3_0_0   EXIST::FUNCTION:CMS
 d2i_DSAparams                           1167   3_0_0   EXIST::FUNCTION:DSA
 EVP_CIPHER_CTX_set_app_data             1168   3_0_0   EXIST::FUNCTION:
@@ -1219,15 +1182,13 @@ ENGINE_register_DSA                     1208    3_0_0   EXIST::FUNCTION:ENGINE
 OPENSSL_LH_node_stats                   1209   3_0_0   EXIST::FUNCTION:STDIO
 X509_policy_tree_free                   1210   3_0_0   EXIST::FUNCTION:
 EC_GFp_simple_method                    1211   3_0_0   EXIST::FUNCTION:EC
-X509_it                                 1212   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_it                                 1212   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_it                                 1212   3_0_0   EXIST::FUNCTION:
 d2i_PROXY_POLICY                        1213   3_0_0   EXIST::FUNCTION:
 MDC2_Update                             1214   3_0_0   EXIST::FUNCTION:MDC2
 EC_KEY_new_by_curve_name                1215   3_0_0   EXIST::FUNCTION:EC
 X509_CRL_free                           1216   3_0_0   EXIST::FUNCTION:
 i2d_PKCS7_SIGN_ENVELOPE                 1217   3_0_0   EXIST::FUNCTION:
-OCSP_CERTSTATUS_it                      1218   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_CERTSTATUS_it                      1218   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_CERTSTATUS_it                      1218   3_0_0   EXIST::FUNCTION:OCSP
 BIO_f_reliable                          1219   3_0_0   EXIST::FUNCTION:
 OCSP_resp_count                         1220   3_0_0   EXIST::FUNCTION:OCSP
 i2d_X509_AUX                            1221   3_0_0   EXIST::FUNCTION:
@@ -1299,8 +1260,7 @@ EC_KEY_new_method                       1288      3_0_0   EXIST::FUNCTION:EC
 i2d_RSAPublicKey_fp                     1289   3_0_0   EXIST::FUNCTION:RSA,STDIO
 CRYPTO_ctr128_encrypt_ctr32             1290   3_0_0   EXIST::FUNCTION:
 X509_VERIFY_PARAM_move_peername         1291   3_0_0   EXIST::FUNCTION:
-OCSP_SINGLERESP_it                      1292   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_SINGLERESP_it                      1292   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_SINGLERESP_it                      1292   3_0_0   EXIST::FUNCTION:OCSP
 BN_num_bits                             1293   3_0_0   EXIST::FUNCTION:
 X509_CRL_METHOD_free                    1294   3_0_0   EXIST::FUNCTION:
 PEM_read_NETSCAPE_CERT_SEQUENCE         1295   3_0_0   EXIST::FUNCTION:STDIO
@@ -1313,11 +1273,9 @@ TS_ACCURACY_free                        1301     3_0_0   EXIST::FUNCTION:TS
 PEM_write_DSA_PUBKEY                    1302   3_0_0   EXIST::FUNCTION:DSA,STDIO
 BN_rshift1                              1303   3_0_0   EXIST::FUNCTION:
 i2d_PKCS7_ENVELOPE                      1304   3_0_0   EXIST::FUNCTION:
-PBKDF2PARAM_it                          1305   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PBKDF2PARAM_it                          1305   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PBKDF2PARAM_it                          1305   3_0_0   EXIST::FUNCTION:
 UI_get_result_maxsize                   1306   3_0_0   EXIST::FUNCTION:
-PBEPARAM_it                             1307   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PBEPARAM_it                             1307   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PBEPARAM_it                             1307   3_0_0   EXIST::FUNCTION:
 TS_ACCURACY_set_seconds                 1308   3_0_0   EXIST::FUNCTION:TS
 UI_get0_action_string                   1309   3_0_0   EXIST::FUNCTION:
 RC2_decrypt                             1310   3_0_0   EXIST::FUNCTION:RC2
@@ -1338,8 +1296,7 @@ SMIME_read_CMS                          1324      3_0_0   EXIST::FUNCTION:CMS
 X509_subject_name_cmp                   1325   3_0_0   EXIST::FUNCTION:
 CRYPTO_ocb128_finish                    1326   3_0_0   EXIST::FUNCTION:OCB
 EVP_CIPHER_do_all                       1327   3_0_0   EXIST::FUNCTION:
-POLICY_MAPPINGS_it                      1328   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-POLICY_MAPPINGS_it                      1328   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+POLICY_MAPPINGS_it                      1328   3_0_0   EXIST::FUNCTION:
 SCT_set0_log_id                         1329   3_0_0   EXIST::FUNCTION:CT
 CRYPTO_cfb128_encrypt                   1330   3_0_0   EXIST::FUNCTION:
 RSA_padding_add_PKCS1_type_2            1331   3_0_0   EXIST::FUNCTION:RSA
@@ -1386,8 +1343,7 @@ BN_GENCB_set_old                        1373      3_0_0   EXIST::FUNCTION:
 PEM_write_bio_X509                      1374   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_asn1_free                      1375   3_0_0   EXIST::FUNCTION:
 ENGINE_unregister_DH                    1376   3_0_0   EXIST::FUNCTION:ENGINE
-PROXY_CERT_INFO_EXTENSION_it            1377   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PROXY_CERT_INFO_EXTENSION_it            1377   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PROXY_CERT_INFO_EXTENSION_it            1377   3_0_0   EXIST::FUNCTION:
 CT_POLICY_EVAL_CTX_set1_cert            1378   3_0_0   EXIST::FUNCTION:CT
 X509_NAME_hash                          1379   3_0_0   EXIST::FUNCTION:
 SCT_set_timestamp                       1380   3_0_0   EXIST::FUNCTION:CT
@@ -1437,11 +1393,9 @@ CRYPTO_nistcts128_encrypt               1425     3_0_0   EXIST::FUNCTION:
 CONF_modules_finish                     1426   3_0_0   EXIST::FUNCTION:
 BN_value_one                            1427   3_0_0   EXIST::FUNCTION:
 RSA_padding_add_SSLv23                  1428   3_0_0   EXIST::FUNCTION:RSA
-OCSP_RESPBYTES_it                       1429   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_RESPBYTES_it                       1429   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_RESPBYTES_it                       1429   3_0_0   EXIST::FUNCTION:OCSP
 EVP_aes_192_wrap                        1430   3_0_0   EXIST::FUNCTION:
-OCSP_CERTID_it                          1431   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_CERTID_it                          1431   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_CERTID_it                          1431   3_0_0   EXIST::FUNCTION:OCSP
 ENGINE_get_RSA                          1432   3_0_0   EXIST::FUNCTION:ENGINE
 RAND_get_rand_method                    1433   3_0_0   EXIST::FUNCTION:
 ERR_load_DSA_strings                    1434   3_0_0   EXIST::FUNCTION:DSA
@@ -1497,8 +1451,7 @@ BIO_accept_ex                           1484      3_0_0   EXIST::FUNCTION:SOCK
 CRYPTO_get_mem_functions                1485   3_0_0   EXIST::FUNCTION:
 PEM_read_bio                            1486   3_0_0   EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_by_critical      1487   3_0_0   EXIST::FUNCTION:OCSP
-SXNET_it                                1488   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-SXNET_it                                1488   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+SXNET_it                                1488   3_0_0   EXIST::FUNCTION:
 BIO_indent                              1489   3_0_0   EXIST::FUNCTION:
 i2d_X509_fp                             1490   3_0_0   EXIST::FUNCTION:STDIO
 d2i_ASN1_TYPE                           1491   3_0_0   EXIST::FUNCTION:
@@ -1603,8 +1556,7 @@ X509_STORE_set_flags                    1590      3_0_0   EXIST::FUNCTION:
 UI_get0_output_string                   1591   3_0_0   EXIST::FUNCTION:
 ERR_get_error_line_data                 1592   3_0_0   EXIST::FUNCTION:
 CTLOG_get0_name                         1593   3_0_0   EXIST::FUNCTION:CT
-ASN1_TBOOLEAN_it                        1594   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_TBOOLEAN_it                        1594   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_TBOOLEAN_it                        1594   3_0_0   EXIST::FUNCTION:
 RC2_set_key                             1595   3_0_0   EXIST::FUNCTION:RC2
 X509_REVOKED_get_ext_by_NID             1596   3_0_0   EXIST::FUNCTION:
 RSA_padding_add_none                    1597   3_0_0   EXIST::FUNCTION:RSA
@@ -1650,8 +1602,7 @@ PKCS7_ENCRYPT_free                      1638      3_0_0   EXIST::FUNCTION:
 i2d_DIST_POINT                          1639   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_paramgen_init                  1640   3_0_0   EXIST::FUNCTION:
 TS_MSG_IMPRINT_dup                      1641   3_0_0   EXIST::FUNCTION:TS
-CMS_ContentInfo_it                      1642   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
-CMS_ContentInfo_it                      1642   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMS
+CMS_ContentInfo_it                      1642   3_0_0   EXIST::FUNCTION:CMS
 OCSP_resp_get0_signature                1643   3_0_0   EXIST::FUNCTION:OCSP
 X509_STORE_CTX_get1_issuer              1644   3_0_0   EXIST::FUNCTION:
 EVP_Digest                              1645   3_0_0   EXIST::FUNCTION:
@@ -1684,8 +1635,7 @@ OCSP_crlID_new                          1673      3_0_0   EXIST:!VMS:FUNCTION:OCSP
 OCSP_crlID2_new                         1673   3_0_0   EXIST:VMS:FUNCTION:OCSP
 PEM_write_PKCS7                         1674   3_0_0   EXIST::FUNCTION:STDIO
 PKCS7_add_signer                        1675   3_0_0   EXIST::FUNCTION:
-X509_SIG_it                             1676   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_SIG_it                             1676   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_SIG_it                             1676   3_0_0   EXIST::FUNCTION:
 ASYNC_start_job                         1677   3_0_0   EXIST::FUNCTION:
 TS_TST_INFO_dup                         1678   3_0_0   EXIST::FUNCTION:TS
 EVP_aes_192_ctr                         1679   3_0_0   EXIST::FUNCTION:
@@ -1707,8 +1657,7 @@ d2i_PKCS12_MAC_DATA                     1694      3_0_0   EXIST::FUNCTION:
 ENGINE_ctrl_cmd                         1695   3_0_0   EXIST::FUNCTION:ENGINE
 PKCS12_SAFEBAG_get_bag_nid              1696   3_0_0   EXIST::FUNCTION:
 TS_CONF_set_digests                     1697   3_0_0   EXIST::FUNCTION:TS
-PKCS7_SIGNED_it                         1698   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_SIGNED_it                         1698   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_SIGNED_it                         1698   3_0_0   EXIST::FUNCTION:
 b2i_PublicKey                           1699   3_0_0   EXIST::FUNCTION:DSA
 X509_PURPOSE_cleanup                    1700   3_0_0   EXIST::FUNCTION:
 ESS_SIGNING_CERT_dup                    1701   3_0_0   EXIST::FUNCTION:
@@ -1768,8 +1717,7 @@ ASYNC_init_thread                       1755      3_0_0   EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_by_OBJ           1756   3_0_0   EXIST::FUNCTION:OCSP
 X509_reject_clear                       1757   3_0_0   EXIST::FUNCTION:
 DH_security_bits                        1758   3_0_0   EXIST::FUNCTION:DH
-LONG_it                                 1759   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DEPRECATEDIN_3
-LONG_it                                 1759   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DEPRECATEDIN_3
+LONG_it                                 1759   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3
 ASN1_dup                                1760   3_0_0   EXIST::FUNCTION:
 TS_RESP_new                             1761   3_0_0   EXIST::FUNCTION:TS
 i2d_PKCS8PrivateKeyInfo_fp              1762   3_0_0   EXIST::FUNCTION:STDIO
@@ -1786,8 +1734,7 @@ ASN1_tag2bit                            1772      3_0_0   EXIST::FUNCTION:
 TS_REQ_add_ext                          1773   3_0_0   EXIST::FUNCTION:TS
 X509_digest                             1776   3_0_0   EXIST::FUNCTION:
 CRYPTO_THREAD_cleanup_local             1777   3_0_0   EXIST::FUNCTION:
-NETSCAPE_CERT_SEQUENCE_it               1778   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NETSCAPE_CERT_SEQUENCE_it               1778   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+NETSCAPE_CERT_SEQUENCE_it               1778   3_0_0   EXIST::FUNCTION:
 EVP_aes_128_wrap                        1779   3_0_0   EXIST::FUNCTION:
 X509V3_conf_free                        1780   3_0_0   EXIST::FUNCTION:
 TS_TST_INFO_get_ext_by_NID              1781   3_0_0   EXIST::FUNCTION:TS
@@ -1796,8 +1743,7 @@ X509_issuer_name_cmp                    1783      3_0_0   EXIST::FUNCTION:
 CMS_RecipientEncryptedKey_get0_id       1784   3_0_0   EXIST::FUNCTION:CMS
 EVP_PKEY_meth_get_verify_recover        1785   3_0_0   EXIST::FUNCTION:
 NAME_CONSTRAINTS_check                  1786   3_0_0   EXIST::FUNCTION:
-X509_CERT_AUX_it                        1787   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CERT_AUX_it                        1787   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CERT_AUX_it                        1787   3_0_0   EXIST::FUNCTION:
 X509_get_X509_PUBKEY                    1789   3_0_0   EXIST::FUNCTION:
 TXT_DB_create_index                     1790   3_0_0   EXIST::FUNCTION:
 RAND_set_rand_engine                    1791   3_0_0   EXIST::FUNCTION:ENGINE
@@ -1834,15 +1780,13 @@ X509V3_EXT_add_list                     1821    3_0_0   EXIST::FUNCTION:
 CMS_compress                            1822   3_0_0   EXIST::FUNCTION:CMS
 X509_get_ext_by_critical                1823   3_0_0   EXIST::FUNCTION:
 ASYNC_WAIT_CTX_clear_fd                 1824   3_0_0   EXIST::FUNCTION:
-ZLONG_it                                1825   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DEPRECATEDIN_3
-ZLONG_it                                1825   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DEPRECATEDIN_3
+ZLONG_it                                1825   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3
 OPENSSL_sk_find_ex                      1826   3_0_0   EXIST::FUNCTION:
 ASN1_ENUMERATED_to_BN                   1827   3_0_0   EXIST::FUNCTION:
 X509_CRL_get_ext_d2i                    1828   3_0_0   EXIST::FUNCTION:
 i2d_AUTHORITY_KEYID                     1829   3_0_0   EXIST::FUNCTION:
 TS_TST_INFO_get_time                    1830   3_0_0   EXIST::FUNCTION:TS
-ASN1_VISIBLESTRING_it                   1831   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_VISIBLESTRING_it                   1831   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_VISIBLESTRING_it                   1831   3_0_0   EXIST::FUNCTION:
 X509V3_EXT_REQ_add_conf                 1832   3_0_0   EXIST::FUNCTION:
 ASN1_STRING_to_UTF8                     1833   3_0_0   EXIST::FUNCTION:
 EVP_MD_meth_set_update                  1835   3_0_0   EXIST::FUNCTION:
@@ -1856,15 +1800,13 @@ X509_CRL_get_ext_count                  1842    3_0_0   EXIST::FUNCTION:
 PKCS12_add_key                          1843   3_0_0   EXIST::FUNCTION:
 EVP_camellia_128_cfb1                   1844   3_0_0   EXIST::FUNCTION:CAMELLIA
 BIO_find_type                           1845   3_0_0   EXIST::FUNCTION:
-ISSUING_DIST_POINT_it                   1846   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ISSUING_DIST_POINT_it                   1846   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ISSUING_DIST_POINT_it                   1846   3_0_0   EXIST::FUNCTION:
 BIO_ctrl_wpending                       1847   3_0_0   EXIST::FUNCTION:
 X509_ALGOR_cmp                          1848   3_0_0   EXIST::FUNCTION:
 i2d_ASN1_bio_stream                     1849   3_0_0   EXIST::FUNCTION:
 CRYPTO_THREAD_init_local                1850   3_0_0   EXIST::FUNCTION:
 TS_RESP_CTX_set_serial_cb               1851   3_0_0   EXIST::FUNCTION:TS
-POLICY_MAPPING_it                       1852   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-POLICY_MAPPING_it                       1852   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+POLICY_MAPPING_it                       1852   3_0_0   EXIST::FUNCTION:
 ERR_load_KDF_strings                    1853   3_0_0   EXIST::FUNCTION:
 UI_method_set_reader                    1854   3_0_0   EXIST::FUNCTION:
 BIO_next                                1855   3_0_0   EXIST::FUNCTION:
@@ -1877,8 +1819,7 @@ PKCS7_digest_from_attributes            1861      3_0_0   EXIST::FUNCTION:
 EC_GROUP_set_curve_GFp                  1862   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC
 X509_PURPOSE_get0                       1863   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_set1_DSA                       1864   3_0_0   EXIST::FUNCTION:DSA
-X509_NAME_it                            1865   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_NAME_it                            1865   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_NAME_it                            1865   3_0_0   EXIST::FUNCTION:
 OBJ_add_object                          1866   3_0_0   EXIST::FUNCTION:
 DSA_generate_key                        1867   3_0_0   EXIST::FUNCTION:DSA
 EVP_DigestUpdate                        1868   3_0_0   EXIST::FUNCTION:
@@ -1901,8 +1842,7 @@ CMS_add1_crl                            1884      3_0_0   EXIST::FUNCTION:CMS
 d2i_EDIPARTYNAME                        1885   3_0_0   EXIST::FUNCTION:
 X509_STORE_CTX_set0_trusted_stack       1886   3_0_0   EXIST::FUNCTION:
 BIO_ADDR_service_string                 1887   3_0_0   EXIST::FUNCTION:SOCK
-ASN1_BOOLEAN_it                         1888   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_BOOLEAN_it                         1888   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_BOOLEAN_it                         1888   3_0_0   EXIST::FUNCTION:
 TS_RESP_CTX_set_time_cb                 1889   3_0_0   EXIST::FUNCTION:TS
 IDEA_cbc_encrypt                        1890   3_0_0   EXIST::FUNCTION:IDEA
 BN_CTX_secure_new                       1891   3_0_0   EXIST::FUNCTION:
@@ -1977,8 +1917,7 @@ ENGINE_get_pkey_asn1_meth               1962      3_0_0   EXIST::FUNCTION:ENGINE
 SHA256_Update                           1963   3_0_0   EXIST::FUNCTION:
 d2i_PKCS7_ISSUER_AND_SERIAL             1964   3_0_0   EXIST::FUNCTION:
 PKCS12_unpack_authsafes                 1965   3_0_0   EXIST::FUNCTION:
-X509_CRL_it                             1966   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CRL_it                             1966   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CRL_it                             1966   3_0_0   EXIST::FUNCTION:
 d2i_X509_ALGOR                          1967   3_0_0   EXIST::FUNCTION:
 PKCS12_PBE_keyivgen                     1968   3_0_0   EXIST::FUNCTION:
 BIO_test_flags                          1969   3_0_0   EXIST::FUNCTION:
@@ -1990,8 +1929,7 @@ i2d_OCSP_REQINFO                        1974      3_0_0   EXIST::FUNCTION:OCSP
 EVP_PKEY_sign                           1975   3_0_0   EXIST::FUNCTION:
 TS_REQ_get_ext_by_critical              1976   3_0_0   EXIST::FUNCTION:TS
 EC_KEY_key2buf                          1977   3_0_0   EXIST::FUNCTION:EC
-X509_EXTENSION_it                       1978   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_EXTENSION_it                       1978   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_EXTENSION_it                       1978   3_0_0   EXIST::FUNCTION:
 i2d_PKCS8_fp                            1979   3_0_0   EXIST::FUNCTION:STDIO
 UTF8_getc                               1980   3_0_0   EXIST::FUNCTION:
 ASN1_IA5STRING_free                     1981   3_0_0   EXIST::FUNCTION:
@@ -2004,16 +1942,14 @@ EVP_PKEY_get0_DSA                       1987    3_0_0   EXIST::FUNCTION:DSA
 d2i_CMS_ContentInfo                     1988   3_0_0   EXIST::FUNCTION:CMS
 EVP_CIPHER_meth_get_do_cipher           1989   3_0_0   EXIST::FUNCTION:
 i2d_DSA_PUBKEY                          1990   3_0_0   EXIST::FUNCTION:DSA
-GENERAL_NAME_it                         1991   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-GENERAL_NAME_it                         1991   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+GENERAL_NAME_it                         1991   3_0_0   EXIST::FUNCTION:
 EVP_des_ede_ecb                         1992   3_0_0   EXIST::FUNCTION:DES
 i2d_CRL_DIST_POINTS                     1993   3_0_0   EXIST::FUNCTION:
 PEM_write_bio_X509_REQ_NEW              1994   3_0_0   EXIST::FUNCTION:
 RC5_32_ofb64_encrypt                    1995   3_0_0   EXIST::FUNCTION:RC5
 i2d_PKCS7                               1996   3_0_0   EXIST::FUNCTION:
 BN_mod_lshift_quick                     1997   3_0_0   EXIST::FUNCTION:
-DIST_POINT_NAME_it                      1998   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-DIST_POINT_NAME_it                      1998   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+DIST_POINT_NAME_it                      1998   3_0_0   EXIST::FUNCTION:
 PEM_read_PrivateKey                     1999   3_0_0   EXIST::FUNCTION:STDIO
 X509V3_get_d2i                          2000   3_0_0   EXIST::FUNCTION:
 PKCS7_SIGNER_INFO_sign                  2001   3_0_0   EXIST::FUNCTION:
@@ -2058,12 +1994,10 @@ AES_wrap_key                            2040    3_0_0   EXIST::FUNCTION:
 EVP_md_null                             2041   3_0_0   EXIST::FUNCTION:
 i2d_SCT_LIST                            2042   3_0_0   EXIST::FUNCTION:CT
 PKCS7_get_issuer_and_serial             2043   3_0_0   EXIST::FUNCTION:
-PKCS7_SIGN_ENVELOPE_it                  2044   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_SIGN_ENVELOPE_it                  2044   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_SIGN_ENVELOPE_it                  2044   3_0_0   EXIST::FUNCTION:
 ASN1_d2i_fp                             2045   3_0_0   EXIST::FUNCTION:STDIO
 EVP_DecryptFinal                        2046   3_0_0   EXIST::FUNCTION:
-ASN1_ENUMERATED_it                      2047   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_ENUMERATED_it                      2047   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_ENUMERATED_it                      2047   3_0_0   EXIST::FUNCTION:
 o2i_ECPublicKey                         2048   3_0_0   EXIST::FUNCTION:EC
 ERR_load_BUF_strings                    2049   3_0_0   EXIST::FUNCTION:
 PEM_read_bio_RSA_PUBKEY                 2050   3_0_0   EXIST::FUNCTION:RSA
@@ -2126,8 +2060,7 @@ i2d_TS_REQ                              2106      3_0_0   EXIST::FUNCTION:TS
 OCSP_ONEREQ_add1_ext_i2d                2107   3_0_0   EXIST::FUNCTION:OCSP
 ENGINE_register_pkey_meths              2108   3_0_0   EXIST::FUNCTION:ENGINE
 ENGINE_load_public_key                  2109   3_0_0   EXIST::FUNCTION:ENGINE
-ASIdOrRange_it                          2110   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-ASIdOrRange_it                          2110   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+ASIdOrRange_it                          2110   3_0_0   EXIST::FUNCTION:RFC3779
 DHparams_print_fp                       2111   3_0_0   EXIST::FUNCTION:DH,STDIO
 ERR_load_CRYPTO_strings                 2112   3_0_0   EXIST:!VMS:FUNCTION:
 ERR_load_CRYPTOlib_strings              2112   3_0_0   EXIST:VMS:FUNCTION:
@@ -2149,8 +2082,7 @@ EVP_mdc2                                2127      3_0_0   EXIST::FUNCTION:MDC2
 EVP_des_cfb64                           2128   3_0_0   EXIST::FUNCTION:DES
 PKCS7_sign                              2129   3_0_0   EXIST::FUNCTION:
 OCSP_SINGLERESP_get_ext_by_critical     2130   3_0_0   EXIST::FUNCTION:OCSP
-EDIPARTYNAME_it                         2131   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-EDIPARTYNAME_it                         2131   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+EDIPARTYNAME_it                         2131   3_0_0   EXIST::FUNCTION:
 ERR_print_errors_fp                     2132   3_0_0   EXIST::FUNCTION:STDIO
 BN_GF2m_mod_div_arr                     2133   3_0_0   EXIST::FUNCTION:EC2M
 PKCS12_SAFEBAG_get0_attr                2134   3_0_0   EXIST::FUNCTION:
@@ -2166,12 +2098,10 @@ SEED_cbc_encrypt                        2143    3_0_0   EXIST::FUNCTION:SEED
 EVP_rc2_40_cbc                          2144   3_0_0   EXIST::FUNCTION:RC2
 ECDSA_SIG_new                           2145   3_0_0   EXIST::FUNCTION:EC
 i2d_PKCS8PrivateKey_nid_fp              2146   3_0_0   EXIST::FUNCTION:STDIO
-X509_NAME_ENTRY_it                      2147   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_NAME_ENTRY_it                      2147   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_NAME_ENTRY_it                      2147   3_0_0   EXIST::FUNCTION:
 CRYPTO_THREAD_compare_id                2148   3_0_0   EXIST::FUNCTION:
 d2i_IPAddressChoice                     2149   3_0_0   EXIST::FUNCTION:RFC3779
-IPAddressFamily_it                      2150   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-IPAddressFamily_it                      2150   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+IPAddressFamily_it                      2150   3_0_0   EXIST::FUNCTION:RFC3779
 ERR_load_OCSP_strings                   2151   3_0_0   EXIST::FUNCTION:OCSP
 BIO_push                                2152   3_0_0   EXIST::FUNCTION:
 ASN1_BMPSTRING_new                      2153   3_0_0   EXIST::FUNCTION:
@@ -2187,10 +2117,8 @@ OPENSSL_sk_set                          2162     3_0_0   EXIST::FUNCTION:
 OCSP_request_sign                       2163   3_0_0   EXIST::FUNCTION:OCSP
 BN_GF2m_mod_solve_quad                  2164   3_0_0   EXIST::FUNCTION:EC2M
 EC_POINT_method_of                      2165   3_0_0   EXIST::FUNCTION:EC
-PKCS7_ENCRYPT_it                        2166   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_ENCRYPT_it                        2166   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-AUTHORITY_INFO_ACCESS_it                2167   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-AUTHORITY_INFO_ACCESS_it                2167   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_ENCRYPT_it                        2166   3_0_0   EXIST::FUNCTION:
+AUTHORITY_INFO_ACCESS_it                2167   3_0_0   EXIST::FUNCTION:
 X509_EXTENSION_create_by_NID            2168   3_0_0   EXIST::FUNCTION:
 i2d_RSAPrivateKey                       2169   3_0_0   EXIST::FUNCTION:RSA
 d2i_CERTIFICATEPOLICIES                 2170   3_0_0   EXIST::FUNCTION:
@@ -2204,8 +2132,7 @@ OCSP_ONEREQ_get_ext                     2177      3_0_0   EXIST::FUNCTION:OCSP
 BN_get_rfc3526_prime_4096               2179   3_0_0   EXIST::FUNCTION:
 d2i_PKCS7_fp                            2180   3_0_0   EXIST::FUNCTION:STDIO
 PEM_write_bio_NETSCAPE_CERT_SEQUENCE    2181   3_0_0   EXIST::FUNCTION:
-PKCS12_AUTHSAFES_it                     2182   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS12_AUTHSAFES_it                     2182   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS12_AUTHSAFES_it                     2182   3_0_0   EXIST::FUNCTION:
 EVP_MD_CTX_free                         2183   3_0_0   EXIST::FUNCTION:
 CMS_RecipientInfo_kari_orig_id_cmp      2184   3_0_0   EXIST::FUNCTION:CMS
 NETSCAPE_SPKI_b64_encode                2185   3_0_0   EXIST::FUNCTION:
@@ -2267,8 +2194,7 @@ SRP_VBASE_init                          2241      3_0_0   EXIST::FUNCTION:SRP
 SHA224_Final                            2242   3_0_0   EXIST::FUNCTION:
 OCSP_CERTSTATUS_free                    2243   3_0_0   EXIST::FUNCTION:OCSP
 d2i_TS_TST_INFO                         2244   3_0_0   EXIST::FUNCTION:TS
-IPAddressOrRange_it                     2245   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-IPAddressOrRange_it                     2245   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+IPAddressOrRange_it                     2245   3_0_0   EXIST::FUNCTION:RFC3779
 ENGINE_get_cipher                       2246   3_0_0   EXIST::FUNCTION:ENGINE
 TS_TST_INFO_delete_ext                  2247   3_0_0   EXIST::FUNCTION:TS
 TS_OBJ_print_bio                        2248   3_0_0   EXIST::FUNCTION:TS
@@ -2278,8 +2204,7 @@ ERR_load_X509_strings                   2251      3_0_0   EXIST::FUNCTION:
 SHA1_Transform                          2252   3_0_0   EXIST::FUNCTION:
 CMS_signed_get_attr_by_NID              2253   3_0_0   EXIST::FUNCTION:CMS
 X509_STORE_CTX_get_by_subject           2254   3_0_0   EXIST::FUNCTION:
-ASN1_OCTET_STRING_it                    2255   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_OCTET_STRING_it                    2255   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_OCTET_STRING_it                    2255   3_0_0   EXIST::FUNCTION:
 OPENSSL_sk_set_cmp_func                 2256   3_0_0   EXIST::FUNCTION:
 X509_VERIFY_PARAM_table_cleanup         2257   3_0_0   EXIST::FUNCTION:
 i2d_re_X509_REQ_tbs                     2258   3_0_0   EXIST::FUNCTION:
@@ -2293,8 +2218,7 @@ ERR_get_state                           2265      3_0_0   EXIST::FUNCTION:
 d2i_DSAPrivateKey_bio                   2266   3_0_0   EXIST::FUNCTION:DSA
 X509_PURPOSE_get_trust                  2267   3_0_0   EXIST::FUNCTION:
 EC_GROUP_get_point_conversion_form      2268   3_0_0   EXIST::FUNCTION:EC
-ASN1_OBJECT_it                          2269   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_OBJECT_it                          2269   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_OBJECT_it                          2269   3_0_0   EXIST::FUNCTION:
 BN_mod_add_quick                        2270   3_0_0   EXIST::FUNCTION:
 NCONF_free                              2271   3_0_0   EXIST::FUNCTION:
 NETSCAPE_SPKI_b64_decode                2272   3_0_0   EXIST::FUNCTION:
@@ -2387,8 +2311,7 @@ EVP_PKEY_up_ref                         2359      3_0_0   EXIST::FUNCTION:
 X509_getm_notBefore                     2360   3_0_0   EXIST::FUNCTION:
 BN_nist_mod_224                         2361   3_0_0   EXIST::FUNCTION:
 DES_decrypt3                            2362   3_0_0   EXIST::FUNCTION:DES
-OTHERNAME_it                            2363   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-OTHERNAME_it                            2363   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+OTHERNAME_it                            2363   3_0_0   EXIST::FUNCTION:
 X509at_add1_attr_by_txt                 2364   3_0_0   EXIST::FUNCTION:
 PKCS7_SIGN_ENVELOPE_free                2365   3_0_0   EXIST::FUNCTION:
 BIO_dgram_is_sctp                       2366   3_0_0   EXIST::FUNCTION:DGRAM,SCTP
@@ -2402,8 +2325,7 @@ DES_encrypt3                            2373      3_0_0   EXIST::FUNCTION:DES
 PKCS7_get_signer_info                   2374   3_0_0   EXIST::FUNCTION:
 ASN1_OCTET_STRING_set                   2375   3_0_0   EXIST::FUNCTION:
 BN_mask_bits                            2376   3_0_0   EXIST::FUNCTION:
-ASN1_UTF8STRING_it                      2377   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_UTF8STRING_it                      2377   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_UTF8STRING_it                      2377   3_0_0   EXIST::FUNCTION:
 ASN1_SCTX_set_app_data                  2378   3_0_0   EXIST::FUNCTION:
 CMS_add0_cert                           2379   3_0_0   EXIST::FUNCTION:CMS
 i2d_GENERAL_NAME                        2380   3_0_0   EXIST::FUNCTION:
@@ -2449,8 +2371,7 @@ i2d_OCSP_CERTSTATUS                     2421      3_0_0   EXIST::FUNCTION:OCSP
 X509_REVOKED_get0_revocationDate        2422   3_0_0   EXIST::FUNCTION:
 PKCS7_add_crl                           2423   3_0_0   EXIST::FUNCTION:
 ECDSA_do_sign                           2424   3_0_0   EXIST::FUNCTION:EC
-ASN1_GENERALIZEDTIME_it                 2425   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_GENERALIZEDTIME_it                 2425   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_GENERALIZEDTIME_it                 2425   3_0_0   EXIST::FUNCTION:
 PKCS8_pkey_get0                         2426   3_0_0   EXIST::FUNCTION:
 OCSP_sendreq_new                        2427   3_0_0   EXIST::FUNCTION:OCSP
 EVP_aes_256_cfb128                      2428   3_0_0   EXIST::FUNCTION:
@@ -2470,8 +2391,7 @@ BN_hex2bn                               2441      3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_meth_set_impl_ctx_size       2442   3_0_0   EXIST::FUNCTION:
 ASIdentifiers_new                       2443   3_0_0   EXIST::FUNCTION:RFC3779
 CONF_imodule_get_flags                  2444   3_0_0   EXIST::FUNCTION:
-PKCS12_SAFEBAG_it                       2445   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS12_SAFEBAG_it                       2445   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS12_SAFEBAG_it                       2445   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_meth_set_set_asn1_params     2446   3_0_0   EXIST::FUNCTION:
 EC_KEY_get_enc_flags                    2447   3_0_0   EXIST::FUNCTION:EC
 X509_OBJECT_idx_by_subject              2448   3_0_0   EXIST::FUNCTION:
@@ -2481,8 +2401,7 @@ CRYPTO_ocb128_decrypt                   2451      3_0_0   EXIST::FUNCTION:OCB
 ASYNC_WAIT_CTX_free                     2452   3_0_0   EXIST::FUNCTION:
 d2i_PKCS7_DIGEST                        2453   3_0_0   EXIST::FUNCTION:
 d2i_TS_TST_INFO_bio                     2454   3_0_0   EXIST::FUNCTION:TS
-BIGNUM_it                               2455   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-BIGNUM_it                               2455   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+BIGNUM_it                               2455   3_0_0   EXIST::FUNCTION:
 BN_BLINDING_get_flags                   2456   3_0_0   EXIST::FUNCTION:
 X509_EXTENSION_get_critical             2457   3_0_0   EXIST::FUNCTION:
 DSA_set_default_method                  2458   3_0_0   EXIST::FUNCTION:DSA
@@ -2498,8 +2417,7 @@ X509_signature_print                    2467      3_0_0   EXIST::FUNCTION:
 EVP_camellia_128_ecb                    2468   3_0_0   EXIST::FUNCTION:CAMELLIA
 MD2_Final                               2469   3_0_0   EXIST::FUNCTION:MD2
 OCSP_REQ_CTX_add1_header                2470   3_0_0   EXIST::FUNCTION:OCSP
-NETSCAPE_SPKAC_it                       2471   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NETSCAPE_SPKAC_it                       2471   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+NETSCAPE_SPKAC_it                       2471   3_0_0   EXIST::FUNCTION:
 ASIdOrRange_free                        2472   3_0_0   EXIST::FUNCTION:RFC3779
 EC_POINT_get_Jprojective_coordinates_GFp 2473  3_0_0   EXIST::FUNCTION:EC
 EVP_aes_128_cbc_hmac_sha256             2474   3_0_0   EXIST::FUNCTION:
@@ -2508,8 +2426,7 @@ TS_VERIFY_CTX_set_data                  2476      3_0_0   EXIST::FUNCTION:TS
 BN_pseudo_rand_range                    2477   3_0_0   EXIST::FUNCTION:
 X509V3_EXT_add_nconf                    2478   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_ctrl                     2479   3_0_0   EXIST::FUNCTION:
-ASN1_T61STRING_it                       2480   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_T61STRING_it                       2480   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_T61STRING_it                       2480   3_0_0   EXIST::FUNCTION:
 ENGINE_get_prev                         2481   3_0_0   EXIST::FUNCTION:ENGINE
 OCSP_accept_responses_new               2482   3_0_0   EXIST::FUNCTION:OCSP
 ERR_load_EC_strings                     2483   3_0_0   EXIST::FUNCTION:EC
@@ -2605,8 +2522,7 @@ ASN1_item_ex_d2i                        2575      3_0_0   EXIST::FUNCTION:
 EVP_MD_meth_free                        2576   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_meth_new                       2577   3_0_0   EXIST::FUNCTION:
 RSA_padding_check_PKCS1_OAEP            2578   3_0_0   EXIST::FUNCTION:RSA
-OCSP_SERVICELOC_it                      2579   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_SERVICELOC_it                      2579   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_SERVICELOC_it                      2579   3_0_0   EXIST::FUNCTION:OCSP
 PKCS12_SAFEBAG_get_nid                  2580   3_0_0   EXIST::FUNCTION:
 EVP_MD_CTX_set_update_fn                2581   3_0_0   EXIST::FUNCTION:
 BIO_f_asn1                              2582   3_0_0   EXIST::FUNCTION:
@@ -2633,21 +2549,18 @@ DH_set_method                           2602    3_0_0   EXIST::FUNCTION:DH
 EVP_rc2_64_cbc                          2603   3_0_0   EXIST::FUNCTION:RC2
 CRYPTO_THREAD_get_current_id            2604   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_CTX_set_cb                     2605   3_0_0   EXIST::FUNCTION:
-PROXY_POLICY_it                         2606   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PROXY_POLICY_it                         2606   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PROXY_POLICY_it                         2606   3_0_0   EXIST::FUNCTION:
 ENGINE_register_complete                2607   3_0_0   EXIST::FUNCTION:ENGINE
 EVP_DecodeUpdate                        2609   3_0_0   EXIST::FUNCTION:
 ENGINE_get_default_RAND                 2610   3_0_0   EXIST::FUNCTION:ENGINE
 ERR_peek_last_error_line                2611   3_0_0   EXIST::FUNCTION:
 ENGINE_get_ssl_client_cert_function     2612   3_0_0   EXIST::FUNCTION:ENGINE
 OPENSSL_LH_node_usage_stats             2613   3_0_0   EXIST::FUNCTION:STDIO
-DIRECTORYSTRING_it                      2614   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-DIRECTORYSTRING_it                      2614   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+DIRECTORYSTRING_it                      2614   3_0_0   EXIST::FUNCTION:
 BIO_write                               2615   3_0_0   EXIST::FUNCTION:
 OCSP_ONEREQ_get_ext_by_OBJ              2616   3_0_0   EXIST::FUNCTION:OCSP
 SEED_encrypt                            2617   3_0_0   EXIST::FUNCTION:SEED
-IPAddressRange_it                       2618   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-IPAddressRange_it                       2618   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+IPAddressRange_it                       2618   3_0_0   EXIST::FUNCTION:RFC3779
 PEM_read_bio_DSAPrivateKey              2619   3_0_0   EXIST::FUNCTION:DSA
 CMS_get0_type                           2620   3_0_0   EXIST::FUNCTION:CMS
 ASN1_PCTX_free                          2621   3_0_0   EXIST::FUNCTION:
@@ -2661,10 +2574,8 @@ OBJ_add_sigid                           2628     3_0_0   EXIST::FUNCTION:
 d2i_SXNETID                             2629   3_0_0   EXIST::FUNCTION:
 CMS_get1_certs                          2630   3_0_0   EXIST::FUNCTION:CMS
 X509_CRL_check_suiteb                   2631   3_0_0   EXIST::FUNCTION:
-PKCS7_ENVELOPE_it                       2632   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_ENVELOPE_it                       2632   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ASIdentifierChoice_it                   2633   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-ASIdentifierChoice_it                   2633   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+PKCS7_ENVELOPE_it                       2632   3_0_0   EXIST::FUNCTION:
+ASIdentifierChoice_it                   2633   3_0_0   EXIST::FUNCTION:RFC3779
 CMS_RecipientEncryptedKey_cert_cmp      2634   3_0_0   EXIST::FUNCTION:CMS
 EVP_PKEY_CTX_get_app_data               2635   3_0_0   EXIST::FUNCTION:
 EC_GROUP_clear_free                     2636   3_0_0   EXIST::FUNCTION:EC
@@ -2677,8 +2588,7 @@ EVP_PKEY_meth_add0                      2642      3_0_0   EXIST::FUNCTION:
 EVP_rc4_40                              2643   3_0_0   EXIST::FUNCTION:RC4
 RSA_bits                                2645   3_0_0   EXIST::FUNCTION:RSA
 ASN1_item_dup                           2646   3_0_0   EXIST::FUNCTION:
-GENERAL_NAMES_it                        2647   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-GENERAL_NAMES_it                        2647   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+GENERAL_NAMES_it                        2647   3_0_0   EXIST::FUNCTION:
 X509_issuer_name_hash                   2648   3_0_0   EXIST::FUNCTION:
 TS_TST_INFO_get_nonce                   2649   3_0_0   EXIST::FUNCTION:TS
 MD4_Init                                2650   3_0_0   EXIST::FUNCTION:MD4
@@ -2711,15 +2621,13 @@ i2d_EXTENDED_KEY_USAGE                  2677    3_0_0   EXIST::FUNCTION:
 PEM_write_bio_DSAparams                 2678   3_0_0   EXIST::FUNCTION:DSA
 X509_cmp_time                           2679   3_0_0   EXIST::FUNCTION:
 d2i_CMS_ReceiptRequest                  2680   3_0_0   EXIST::FUNCTION:CMS
-X509_CRL_INFO_it                        2681   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CRL_INFO_it                        2681   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CRL_INFO_it                        2681   3_0_0   EXIST::FUNCTION:
 BUF_reverse                             2682   3_0_0   EXIST::FUNCTION:
 d2i_OCSP_SIGNATURE                      2683   3_0_0   EXIST::FUNCTION:OCSP
 X509_REQ_delete_attr                    2684   3_0_0   EXIST::FUNCTION:
 TS_RESP_CTX_set_signer_cert             2685   3_0_0   EXIST::FUNCTION:TS
 X509V3_EXT_d2i                          2686   3_0_0   EXIST::FUNCTION:
-ASN1_GENERALSTRING_it                   2687   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_GENERALSTRING_it                   2687   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_GENERALSTRING_it                   2687   3_0_0   EXIST::FUNCTION:
 POLICYQUALINFO_free                     2688   3_0_0   EXIST::FUNCTION:
 EC_KEY_set_group                        2689   3_0_0   EXIST::FUNCTION:EC
 OCSP_check_validity                     2690   3_0_0   EXIST::FUNCTION:OCSP
@@ -2766,8 +2674,7 @@ CMS_ContentInfo_print_ctx               2730      3_0_0   EXIST::FUNCTION:CMS
 d2i_PKCS7_SIGNED                        2731   3_0_0   EXIST::FUNCTION:
 GENERAL_NAMES_free                      2732   3_0_0   EXIST::FUNCTION:
 SCT_get_timestamp                       2733   3_0_0   EXIST::FUNCTION:CT
-OCSP_SIGNATURE_it                       2734   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_SIGNATURE_it                       2734   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_SIGNATURE_it                       2734   3_0_0   EXIST::FUNCTION:OCSP
 CMS_verify_receipt                      2735   3_0_0   EXIST::FUNCTION:CMS
 CRYPTO_THREAD_lock_new                  2736   3_0_0   EXIST::FUNCTION:
 BIO_get_ex_data                         2737   3_0_0   EXIST::FUNCTION:
@@ -2790,8 +2697,7 @@ TS_REQ_get_policy_id                    2753      3_0_0   EXIST::FUNCTION:TS
 RC5_32_cbc_encrypt                      2754   3_0_0   EXIST::FUNCTION:RC5
 BN_is_zero                              2755   3_0_0   EXIST::FUNCTION:
 CT_POLICY_EVAL_CTX_new                  2756   3_0_0   EXIST::FUNCTION:CT
-NETSCAPE_SPKI_it                        2757   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NETSCAPE_SPKI_it                        2757   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+NETSCAPE_SPKI_it                        2757   3_0_0   EXIST::FUNCTION:
 CRYPTO_THREAD_unlock                    2758   3_0_0   EXIST::FUNCTION:
 UI_method_set_writer                    2759   3_0_0   EXIST::FUNCTION:
 UI_dup_info_string                      2760   3_0_0   EXIST::FUNCTION:
@@ -2802,24 +2708,20 @@ EVP_SealFinal                           2764    3_0_0   EXIST::FUNCTION:RSA
 CONF_imodule_set_flags                  2766   3_0_0   EXIST::FUNCTION:
 i2d_ASN1_SET_ANY                        2767   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_decrypt                        2768   3_0_0   EXIST::FUNCTION:
-OCSP_RESPID_it                          2769   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_RESPID_it                          2769   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_RESPID_it                          2769   3_0_0   EXIST::FUNCTION:OCSP
 EVP_des_ede3_cbc                        2770   3_0_0   EXIST::FUNCTION:DES
 X509_up_ref                             2771   3_0_0   EXIST::FUNCTION:
 OBJ_NAME_do_all_sorted                  2772   3_0_0   EXIST::FUNCTION:
 ENGINE_unregister_DSA                   2773   3_0_0   EXIST::FUNCTION:ENGINE
 ASN1_bn_print                           2774   3_0_0   EXIST::FUNCTION:
 CMS_is_detached                         2775   3_0_0   EXIST::FUNCTION:CMS
-X509_REQ_INFO_it                        2776   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_REQ_INFO_it                        2776   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-RSAPrivateKey_it                        2777   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
-RSAPrivateKey_it                        2777   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+X509_REQ_INFO_it                        2776   3_0_0   EXIST::FUNCTION:
+RSAPrivateKey_it                        2777   3_0_0   EXIST::FUNCTION:RSA
 X509_NAME_ENTRY_free                    2778   3_0_0   EXIST::FUNCTION:
 BIO_new_fd                              2779   3_0_0   EXIST::FUNCTION:
 OPENSSL_sk_value                        2781   3_0_0   EXIST::FUNCTION:
 NCONF_get_section                       2782   3_0_0   EXIST::FUNCTION:
-PKCS12_MAC_DATA_it                      2783   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS12_MAC_DATA_it                      2783   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS12_MAC_DATA_it                      2783   3_0_0   EXIST::FUNCTION:
 X509_REQ_add1_attr_by_NID               2784   3_0_0   EXIST::FUNCTION:
 ASN1_sign                               2785   3_0_0   EXIST::FUNCTION:
 CMS_RecipientInfo_encrypt               2786   3_0_0   EXIST::FUNCTION:CMS
@@ -2838,8 +2740,7 @@ X509_REQ_get0_signature                 2799      3_0_0   EXIST::FUNCTION:
 PKEY_USAGE_PERIOD_free                  2800   3_0_0   EXIST::FUNCTION:
 EC_GROUP_set_point_conversion_form      2801   3_0_0   EXIST::FUNCTION:EC
 CMS_dataFinal                           2802   3_0_0   EXIST::FUNCTION:CMS
-ASN1_TIME_it                            2803   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_TIME_it                            2803   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_TIME_it                            2803   3_0_0   EXIST::FUNCTION:
 ENGINE_get_static_state                 2804   3_0_0   EXIST::FUNCTION:ENGINE
 EC_KEY_set_asn1_flag                    2805   3_0_0   EXIST::FUNCTION:EC
 EC_GFp_mont_method                      2806   3_0_0   EXIST::FUNCTION:EC
@@ -2888,13 +2789,11 @@ ASN1_UNIVERSALSTRING_free               2849    3_0_0   EXIST::FUNCTION:
 EC_KEY_precompute_mult                  2850   3_0_0   EXIST::FUNCTION:EC
 CRYPTO_mem_debug_realloc                2851   3_0_0   EXIST::FUNCTION:CRYPTO_MDEBUG
 PKCS7_new                               2852   3_0_0   EXIST::FUNCTION:
-BASIC_CONSTRAINTS_it                    2853   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-BASIC_CONSTRAINTS_it                    2853   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+BASIC_CONSTRAINTS_it                    2853   3_0_0   EXIST::FUNCTION:
 ASN1_generate_v3                        2854   3_0_0   EXIST::FUNCTION:
 PEM_write_bio_PrivateKey                2855   3_0_0   EXIST::FUNCTION:
 ASN1_UTCTIME_check                      2856   3_0_0   EXIST::FUNCTION:
-ACCESS_DESCRIPTION_it                   2857   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ACCESS_DESCRIPTION_it                   2857   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ACCESS_DESCRIPTION_it                   2857   3_0_0   EXIST::FUNCTION:
 TS_MSG_IMPRINT_get_msg                  2859   3_0_0   EXIST::FUNCTION:TS
 PKCS8_add_keyusage                      2860   3_0_0   EXIST::FUNCTION:
 X509_EXTENSION_dup                      2861   3_0_0   EXIST::FUNCTION:
@@ -2916,8 +2815,7 @@ NCONF_get_number_e                      2876      3_0_0   EXIST::FUNCTION:
 OPENSSL_cleanse                         2877   3_0_0   EXIST::FUNCTION:
 SCT_set0_signature                      2878   3_0_0   EXIST::FUNCTION:CT
 X509_CRL_sign                           2879   3_0_0   EXIST::FUNCTION:
-X509_CINF_it                            2880   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CINF_it                            2880   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CINF_it                            2880   3_0_0   EXIST::FUNCTION:
 TS_CONF_set_accuracy                    2881   3_0_0   EXIST::FUNCTION:TS
 DES_crypt                               2882   3_0_0   EXIST::FUNCTION:DES
 BN_BLINDING_create_param                2883   3_0_0   EXIST::FUNCTION:
@@ -2925,8 +2823,7 @@ OCSP_SERVICELOC_free                    2884      3_0_0   EXIST::FUNCTION:OCSP
 DIST_POINT_NAME_free                    2885   3_0_0   EXIST::FUNCTION:
 BIO_listen                              2886   3_0_0   EXIST::FUNCTION:SOCK
 BIO_ADDR_path_string                    2887   3_0_0   EXIST::FUNCTION:SOCK
-POLICY_CONSTRAINTS_it                   2888   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-POLICY_CONSTRAINTS_it                   2888   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+POLICY_CONSTRAINTS_it                   2888   3_0_0   EXIST::FUNCTION:
 NCONF_free_data                         2889   3_0_0   EXIST::FUNCTION:
 BIO_asn1_set_prefix                     2890   3_0_0   EXIST::FUNCTION:
 PEM_SignUpdate                          2891   3_0_0   EXIST::FUNCTION:
@@ -2936,8 +2833,7 @@ IPAddressChoice_free                    2894      3_0_0   EXIST::FUNCTION:RFC3779
 d2i_X509_AUX                            2895   3_0_0   EXIST::FUNCTION:
 X509_get_default_cert_area              2896   3_0_0   EXIST::FUNCTION:
 ERR_load_DSO_strings                    2897   3_0_0   EXIST::FUNCTION:
-ASIdentifiers_it                        2898   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-ASIdentifiers_it                        2898   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+ASIdentifiers_it                        2898   3_0_0   EXIST::FUNCTION:RFC3779
 BN_mod_lshift                           2899   3_0_0   EXIST::FUNCTION:
 ENGINE_get_last                         2900   3_0_0   EXIST::FUNCTION:ENGINE
 EVP_PKEY_encrypt_init                   2901   3_0_0   EXIST::FUNCTION:
@@ -2957,8 +2853,7 @@ X509_PUBKEY_get0                        2914      3_0_0   EXIST::FUNCTION:
 X509_STORE_CTX_get0_parent_ctx          2915   3_0_0   EXIST::FUNCTION:
 EC_GROUP_set_seed                       2916   3_0_0   EXIST::FUNCTION:EC
 X509_STORE_CTX_free                     2917   3_0_0   EXIST::FUNCTION:
-AUTHORITY_KEYID_it                      2918   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-AUTHORITY_KEYID_it                      2918   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+AUTHORITY_KEYID_it                      2918   3_0_0   EXIST::FUNCTION:
 X509V3_get_value_int                    2919   3_0_0   EXIST::FUNCTION:
 ASN1_UTCTIME_set_string                 2920   3_0_0   EXIST::FUNCTION:
 RC5_32_decrypt                          2921   3_0_0   EXIST::FUNCTION:RC5
@@ -3011,8 +2906,7 @@ SHA384_Init                             2968      3_0_0   EXIST::FUNCTION:
 ASN1_UNIVERSALSTRING_new                2969   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_print_private                  2970   3_0_0   EXIST::FUNCTION:
 ASN1_INTEGER_new                        2971   3_0_0   EXIST::FUNCTION:
-NAME_CONSTRAINTS_it                     2972   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NAME_CONSTRAINTS_it                     2972   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+NAME_CONSTRAINTS_it                     2972   3_0_0   EXIST::FUNCTION:
 TS_REQ_get_cert_req                     2973   3_0_0   EXIST::FUNCTION:TS
 BIO_pop                                 2974   3_0_0   EXIST::FUNCTION:
 SHA256_Final                            2975   3_0_0   EXIST::FUNCTION:
@@ -3060,8 +2954,7 @@ OCSP_request_is_signed                  3017      3_0_0   EXIST::FUNCTION:OCSP
 i2d_BASIC_CONSTRAINTS                   3018   3_0_0   EXIST::FUNCTION:
 EC_KEY_get_method                       3019   3_0_0   EXIST::FUNCTION:EC
 EC_POINT_bn2point                       3021   3_0_0   EXIST::FUNCTION:EC
-PBE2PARAM_it                            3022   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PBE2PARAM_it                            3022   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PBE2PARAM_it                            3022   3_0_0   EXIST::FUNCTION:
 BN_rand                                 3023   3_0_0   EXIST::FUNCTION:
 ASN1_TYPE_unpack_sequence               3024   3_0_0   EXIST::FUNCTION:
 X509_CRL_sign_ctx                       3025   3_0_0   EXIST::FUNCTION:
@@ -3073,8 +2966,7 @@ PEM_write_bio_PKCS8PrivateKey_nid       3030      3_0_0   EXIST::FUNCTION:
 BN_MONT_CTX_new                         3031   3_0_0   EXIST::FUNCTION:
 CRYPTO_free_ex_index                    3032   3_0_0   EXIST::FUNCTION:
 ASYNC_WAIT_CTX_new                      3033   3_0_0   EXIST::FUNCTION:
-PKCS7_it                                3034   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_it                                3034   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_it                                3034   3_0_0   EXIST::FUNCTION:
 CMS_unsigned_get_attr_by_OBJ            3035   3_0_0   EXIST::FUNCTION:CMS
 BN_clear                                3036   3_0_0   EXIST::FUNCTION:
 BIO_socket_ioctl                        3037   3_0_0   EXIST::FUNCTION:SOCK
@@ -3082,8 +2974,7 @@ GENERAL_NAME_cmp                        3038      3_0_0   EXIST::FUNCTION:
 X509_STORE_CTX_set_purpose              3039   3_0_0   EXIST::FUNCTION:
 X509_REVOKED_get_ext_d2i                3040   3_0_0   EXIST::FUNCTION:
 X509V3_set_conf_lhash                   3041   3_0_0   EXIST::FUNCTION:
-PKCS7_ENC_CONTENT_it                    3042   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_ENC_CONTENT_it                    3042   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_ENC_CONTENT_it                    3042   3_0_0   EXIST::FUNCTION:
 PKCS12_item_pack_safebag                3043   3_0_0   EXIST::FUNCTION:
 i2d_OCSP_RESPDATA                       3044   3_0_0   EXIST::FUNCTION:OCSP
 i2d_X509_PUBKEY                         3045   3_0_0   EXIST::FUNCTION:
@@ -3164,8 +3055,7 @@ ASN1_BIT_STRING_set                     3119      3_0_0   EXIST::FUNCTION:
 PKCS5_PBKDF2_HMAC_SHA1                  3120   3_0_0   EXIST::FUNCTION:
 RSA_padding_check_PKCS1_type_2          3121   3_0_0   EXIST::FUNCTION:RSA
 EVP_des_ede3_ecb                        3122   3_0_0   EXIST::FUNCTION:DES
-CBIGNUM_it                              3123   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-CBIGNUM_it                              3123   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+CBIGNUM_it                              3123   3_0_0   EXIST::FUNCTION:
 BIO_new_NDEF                            3124   3_0_0   EXIST::FUNCTION:
 EVP_aes_256_wrap                        3125   3_0_0   EXIST::FUNCTION:
 ASN1_STRING_print                       3126   3_0_0   EXIST::FUNCTION:
@@ -3294,8 +3184,7 @@ EVP_aes_192_ecb                         3249      3_0_0   EXIST::FUNCTION:
 ASN1_OCTET_STRING_new                   3250   3_0_0   EXIST::FUNCTION:
 CMS_set1_eContentType                   3251   3_0_0   EXIST::FUNCTION:CMS
 EVP_des_ede3_wrap                       3252   3_0_0   EXIST::FUNCTION:DES
-GENERAL_SUBTREE_it                      3253   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-GENERAL_SUBTREE_it                      3253   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+GENERAL_SUBTREE_it                      3253   3_0_0   EXIST::FUNCTION:
 EVP_read_pw_string_min                  3254   3_0_0   EXIST::FUNCTION:
 X509_set1_notBefore                     3255   3_0_0   EXIST::FUNCTION:
 MD4                                     3256   3_0_0   EXIST::FUNCTION:MD4
@@ -3340,8 +3229,7 @@ i2s_ASN1_IA5STRING                      3295      3_0_0   EXIST::FUNCTION:
 EC_KEY_get_default_method               3296   3_0_0   EXIST::FUNCTION:EC
 PKCS8_decrypt                           3297   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_CTX_get_data                   3298   3_0_0   EXIST::FUNCTION:
-POLICYQUALINFO_it                       3299   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-POLICYQUALINFO_it                       3299   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+POLICYQUALINFO_it                       3299   3_0_0   EXIST::FUNCTION:
 PKCS7_ISSUER_AND_SERIAL_free            3300   3_0_0   EXIST::FUNCTION:
 DSA_SIG_free                            3301   3_0_0   EXIST::FUNCTION:DSA
 BIO_asn1_set_suffix                     3302   3_0_0   EXIST::FUNCTION:
@@ -3391,8 +3279,7 @@ OCSP_SERVICELOC_new                     3346      3_0_0   EXIST::FUNCTION:OCSP
 ASN1_VISIBLESTRING_new                  3347   3_0_0   EXIST::FUNCTION:
 BN_set_flags                            3348   3_0_0   EXIST::FUNCTION:
 d2i_PrivateKey_bio                      3349   3_0_0   EXIST::FUNCTION:
-ASN1_SEQUENCE_ANY_it                    3350   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_SEQUENCE_ANY_it                    3350   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_SEQUENCE_ANY_it                    3350   3_0_0   EXIST::FUNCTION:
 ASN1_UTCTIME_adj                        3351   3_0_0   EXIST::FUNCTION:
 BN_mod_sqrt                             3352   3_0_0   EXIST::FUNCTION:
 OPENSSL_sk_is_sorted                    3353   3_0_0   EXIST::FUNCTION:
@@ -3417,15 +3304,13 @@ CMS_add1_cert                           3371    3_0_0   EXIST::FUNCTION:CMS
 DSO_convert_filename                    3372   3_0_0   EXIST::FUNCTION:
 RSA_padding_check_SSLv23                3373   3_0_0   EXIST::FUNCTION:RSA
 CRYPTO_gcm128_finish                    3374   3_0_0   EXIST::FUNCTION:
-PKCS12_SAFEBAGS_it                      3375   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS12_SAFEBAGS_it                      3375   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS12_SAFEBAGS_it                      3375   3_0_0   EXIST::FUNCTION:
 PKCS12_PBE_add                          3376   3_0_0   EXIST::FUNCTION:
 EC_KEY_set_public_key_affine_coordinates 3377  3_0_0   EXIST::FUNCTION:EC
 EVP_EncryptInit_ex                      3378   3_0_0   EXIST::FUNCTION:
 ENGINE_add                              3379   3_0_0   EXIST::FUNCTION:ENGINE
 OPENSSL_LH_error                        3380   3_0_0   EXIST::FUNCTION:
-PKCS7_DIGEST_it                         3381   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_DIGEST_it                         3381   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_DIGEST_it                         3381   3_0_0   EXIST::FUNCTION:
 X509_CINF_new                           3382   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_keygen_init                    3383   3_0_0   EXIST::FUNCTION:
 EVP_aes_192_ocb                         3384   3_0_0   EXIST::FUNCTION:OCB
@@ -3558,8 +3443,7 @@ EVP_PKEY_add1_attr_by_NID               3513      3_0_0   EXIST::FUNCTION:
 i2d_PKCS8_PRIV_KEY_INFO_bio             3514   3_0_0   EXIST::FUNCTION:
 X509_NAME_get_index_by_NID              3515   3_0_0   EXIST::FUNCTION:
 ENGINE_get_first                        3516   3_0_0   EXIST::FUNCTION:ENGINE
-CERTIFICATEPOLICIES_it                  3517   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-CERTIFICATEPOLICIES_it                  3517   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+CERTIFICATEPOLICIES_it                  3517   3_0_0   EXIST::FUNCTION:
 EVP_MD_CTX_ctrl                         3518   3_0_0   EXIST::FUNCTION:
 PKCS7_final                             3519   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_size                           3520   3_0_0   EXIST::FUNCTION:
@@ -3606,10 +3490,8 @@ RAND_file_name                          3564     3_0_0   EXIST::FUNCTION:
 EVP_CipherInit_ex                       3566   3_0_0   EXIST::FUNCTION:
 BIO_dgram_sctp_notification_cb          3567   3_0_0   EXIST::FUNCTION:DGRAM,SCTP
 ERR_load_RAND_strings                   3568   3_0_0   EXIST::FUNCTION:
-X509_ATTRIBUTE_it                       3569   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_ATTRIBUTE_it                       3569   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-X509_ALGOR_it                           3570   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_ALGOR_it                           3570   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_ATTRIBUTE_it                       3569   3_0_0   EXIST::FUNCTION:
+X509_ALGOR_it                           3570   3_0_0   EXIST::FUNCTION:
 OCSP_CRLID_free                         3571   3_0_0   EXIST::FUNCTION:OCSP
 CRYPTO_ccm128_aad                       3572   3_0_0   EXIST::FUNCTION:
 IPAddressFamily_new                     3573   3_0_0   EXIST::FUNCTION:RFC3779
@@ -3633,8 +3515,7 @@ X509_issuer_and_serial_cmp              3590      3_0_0   EXIST::FUNCTION:
 OCSP_response_create                    3591   3_0_0   EXIST::FUNCTION:OCSP
 SHA224                                  3592   3_0_0   EXIST::FUNCTION:
 MD2_options                             3593   3_0_0   EXIST::FUNCTION:MD2
-X509_REQ_it                             3595   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_REQ_it                             3595   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_REQ_it                             3595   3_0_0   EXIST::FUNCTION:
 RAND_bytes                              3596   3_0_0   EXIST::FUNCTION:
 PKCS7_free                              3597   3_0_0   EXIST::FUNCTION:
 X509_NAME_ENTRY_create_by_txt           3598   3_0_0   EXIST::FUNCTION:
@@ -3680,8 +3561,7 @@ PEM_read_PUBKEY                         3638      3_0_0   EXIST::FUNCTION:STDIO
 RSA_PKCS1_OpenSSL                       3639   3_0_0   EXIST::FUNCTION:RSA
 AUTHORITY_INFO_ACCESS_free              3640   3_0_0   EXIST::FUNCTION:
 SCT_get0_signature                      3641   3_0_0   EXIST::FUNCTION:CT
-DISPLAYTEXT_it                          3643   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-DISPLAYTEXT_it                          3643   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+DISPLAYTEXT_it                          3643   3_0_0   EXIST::FUNCTION:
 OPENSSL_gmtime_adj                      3644   3_0_0   EXIST::FUNCTION:
 ASN1_INTEGER_dup                        3645   3_0_0   EXIST::FUNCTION:
 DSA_print                               3646   3_0_0   EXIST::FUNCTION:DSA
@@ -3739,8 +3619,7 @@ OCSP_sendreq_nbio                       3698      3_0_0   EXIST::FUNCTION:OCSP
 PKCS8_encrypt                           3699   3_0_0   EXIST::FUNCTION:
 i2d_PKCS7_fp                            3700   3_0_0   EXIST::FUNCTION:STDIO
 i2d_X509_REQ                            3701   3_0_0   EXIST::FUNCTION:
-OCSP_CRLID_it                           3702   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_CRLID_it                           3702   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_CRLID_it                           3702   3_0_0   EXIST::FUNCTION:OCSP
 PEM_ASN1_write_bio                      3703   3_0_0   EXIST::FUNCTION:
 X509_get0_reject_objects                3704   3_0_0   EXIST::FUNCTION:
 BIO_set_tcp_ndelay                      3705   3_0_0   EXIST::FUNCTION:SOCK
@@ -3750,8 +3629,7 @@ X509_CRL_get0_by_serial                 3708      3_0_0   EXIST::FUNCTION:
 PKCS12_add_friendlyname_asc             3709   3_0_0   EXIST::FUNCTION:
 X509_STORE_CTX_get1_chain               3710   3_0_0   EXIST::FUNCTION:
 ASN1_mbstring_ncopy                     3711   3_0_0   EXIST::FUNCTION:
-PKCS7_RECIP_INFO_it                     3712   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_RECIP_INFO_it                     3712   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_RECIP_INFO_it                     3712   3_0_0   EXIST::FUNCTION:
 ENGINE_register_all_digests             3713   3_0_0   EXIST::FUNCTION:ENGINE
 X509_REQ_get_version                    3714   3_0_0   EXIST::FUNCTION:
 i2d_ASN1_UTCTIME                        3715   3_0_0   EXIST::FUNCTION:
@@ -3809,8 +3687,7 @@ BIO_ADDRINFO_family                     3766      3_0_0   EXIST::FUNCTION:SOCK
 PEM_write_DHxparams                     3767   3_0_0   EXIST::FUNCTION:DH,STDIO
 BN_mod_exp2_mont                        3768   3_0_0   EXIST::FUNCTION:
 ASN1_PRINTABLE_free                     3769   3_0_0   EXIST::FUNCTION:
-PKCS7_ATTR_SIGN_it                      3771   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKCS7_ATTR_SIGN_it                      3771   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PKCS7_ATTR_SIGN_it                      3771   3_0_0   EXIST::FUNCTION:
 EVP_MD_CTX_copy                         3772   3_0_0   EXIST::FUNCTION:
 ENGINE_set_ctrl_function                3773   3_0_0   EXIST::FUNCTION:ENGINE
 OCSP_id_get0_info                       3774   3_0_0   EXIST::FUNCTION:OCSP
@@ -3818,8 +3695,7 @@ BIO_ADDRINFO_next                       3775      3_0_0   EXIST::FUNCTION:SOCK
 OCSP_RESPBYTES_free                     3776   3_0_0   EXIST::FUNCTION:OCSP
 EC_KEY_METHOD_set_init                  3777   3_0_0   EXIST::FUNCTION:EC
 EVP_PKEY_asn1_copy                      3778   3_0_0   EXIST::FUNCTION:
-RSA_PSS_PARAMS_it                       3779   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
-RSA_PSS_PARAMS_it                       3779   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+RSA_PSS_PARAMS_it                       3779   3_0_0   EXIST::FUNCTION:RSA
 X509_STORE_CTX_get_error_depth          3780   3_0_0   EXIST::FUNCTION:
 ASN1_GENERALIZEDTIME_set_string         3781   3_0_0   EXIST::FUNCTION:
 EC_GROUP_new_curve_GFp                  3782   3_0_0   EXIST::FUNCTION:EC
@@ -3849,10 +3725,8 @@ EVP_bf_ecb                              3805     3_0_0   EXIST::FUNCTION:BF
 v2i_GENERAL_NAME_ex                     3806   3_0_0   EXIST::FUNCTION:
 CMS_signed_delete_attr                  3807   3_0_0   EXIST::FUNCTION:CMS
 ASN1_TYPE_pack_sequence                 3808   3_0_0   EXIST::FUNCTION:
-USERNOTICE_it                           3809   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-USERNOTICE_it                           3809   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-PKEY_USAGE_PERIOD_it                    3810   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PKEY_USAGE_PERIOD_it                    3810   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+USERNOTICE_it                           3809   3_0_0   EXIST::FUNCTION:
+PKEY_USAGE_PERIOD_it                    3810   3_0_0   EXIST::FUNCTION:
 BN_mul_word                             3811   3_0_0   EXIST::FUNCTION:
 i2d_IPAddressRange                      3813   3_0_0   EXIST::FUNCTION:RFC3779
 CMS_unsigned_add1_attr_by_txt           3814   3_0_0   EXIST::FUNCTION:CMS
@@ -3860,8 +3734,7 @@ d2i_RSA_PUBKEY                          3815      3_0_0   EXIST::FUNCTION:RSA
 PKCS12_gen_mac                          3816   3_0_0   EXIST::FUNCTION:
 ERR_load_ENGINE_strings                 3817   3_0_0   EXIST::FUNCTION:ENGINE
 ERR_load_CT_strings                     3818   3_0_0   EXIST::FUNCTION:CT
-OCSP_ONEREQ_it                          3819   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_ONEREQ_it                          3819   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_ONEREQ_it                          3819   3_0_0   EXIST::FUNCTION:OCSP
 X509_PURPOSE_get_by_sname               3820   3_0_0   EXIST::FUNCTION:
 X509_PURPOSE_set                        3821   3_0_0   EXIST::FUNCTION:
 BN_mod_inverse                          3822   3_0_0   EXIST::FUNCTION:
@@ -3904,10 +3777,8 @@ i2o_ECPublicKey                         3858     3_0_0   EXIST::FUNCTION:EC
 PKCS12_SAFEBAG_create0_pkcs8            3859   3_0_0   EXIST::FUNCTION:
 OBJ_get0_data                           3860   3_0_0   EXIST::FUNCTION:
 EC_GROUP_get0_seed                      3861   3_0_0   EXIST::FUNCTION:EC
-OCSP_REQUEST_it                         3862   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_REQUEST_it                         3862   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
-ASRange_it                              3863   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779
-ASRange_it                              3863   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779
+OCSP_REQUEST_it                         3862   3_0_0   EXIST::FUNCTION:OCSP
+ASRange_it                              3863   3_0_0   EXIST::FUNCTION:RFC3779
 i2d_TS_RESP                             3864   3_0_0   EXIST::FUNCTION:TS
 TS_TST_INFO_get_ext_by_OBJ              3865   3_0_0   EXIST::FUNCTION:TS
 d2i_PKCS7_RECIP_INFO                    3866   3_0_0   EXIST::FUNCTION:
@@ -3915,8 +3786,7 @@ d2i_X509_CRL                            3867      3_0_0   EXIST::FUNCTION:
 ASN1_OCTET_STRING_dup                   3868   3_0_0   EXIST::FUNCTION:
 CRYPTO_nistcts128_decrypt_block         3869   3_0_0   EXIST::FUNCTION:
 CMS_stream                              3870   3_0_0   EXIST::FUNCTION:CMS
-RSA_OAEP_PARAMS_it                      3871   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
-RSA_OAEP_PARAMS_it                      3871   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+RSA_OAEP_PARAMS_it                      3871   3_0_0   EXIST::FUNCTION:RSA
 BN_bn2mpi                               3872   3_0_0   EXIST::FUNCTION:
 X509_STORE_CTX_cleanup                  3873   3_0_0   EXIST::FUNCTION:
 OCSP_onereq_get0_id                     3874   3_0_0   EXIST::FUNCTION:OCSP
@@ -3928,8 +3798,7 @@ CMS_add0_RevocationInfoChoice           3880      3_0_0   EXIST::FUNCTION:CMS
 ASN1_PCTX_get_flags                     3881   3_0_0   EXIST::FUNCTION:
 EVP_MD_meth_set_result_size             3882   3_0_0   EXIST::FUNCTION:
 i2d_X509_CRL                            3883   3_0_0   EXIST::FUNCTION:
-ASN1_INTEGER_it                         3885   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_INTEGER_it                         3885   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_INTEGER_it                         3885   3_0_0   EXIST::FUNCTION:
 TS_ACCURACY_new                         3886   3_0_0   EXIST::FUNCTION:TS
 i2d_SXNETID                             3887   3_0_0   EXIST::FUNCTION:
 BN_mod_mul_montgomery                   3888   3_0_0   EXIST::FUNCTION:
@@ -3939,8 +3808,7 @@ PBKDF2PARAM_new                         3891      3_0_0   EXIST::FUNCTION:
 ENGINE_set_RSA                          3892   3_0_0   EXIST::FUNCTION:ENGINE
 i2d_X509_ATTRIBUTE                      3893   3_0_0   EXIST::FUNCTION:
 PKCS7_ctrl                              3894   3_0_0   EXIST::FUNCTION:
-OCSP_REVOKEDINFO_it                     3895   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:OCSP
-OCSP_REVOKEDINFO_it                     3895   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:OCSP
+OCSP_REVOKEDINFO_it                     3895   3_0_0   EXIST::FUNCTION:OCSP
 X509V3_set_ctx                          3896   3_0_0   EXIST::FUNCTION:
 ASN1_ENUMERATED_set_int64               3897   3_0_0   EXIST::FUNCTION:
 o2i_SCT                                 3898   3_0_0   EXIST::FUNCTION:CT
@@ -3967,13 +3835,10 @@ BN_BLINDING_unlock                      3918    3_0_0   EXIST::FUNCTION:
 EC_GROUP_new_from_ecpkparameters        3919   3_0_0   EXIST::FUNCTION:EC
 EC_GROUP_get_ecpkparameters             3920   3_0_0   EXIST::FUNCTION:EC
 EC_GROUP_new_from_ecparameters          3921   3_0_0   EXIST::FUNCTION:EC
-ECPARAMETERS_it                         3922   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC
-ECPARAMETERS_it                         3922   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC
-ECPKPARAMETERS_it                       3923   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:EC
-ECPKPARAMETERS_it                       3923   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:EC
+ECPARAMETERS_it                         3922   3_0_0   EXIST::FUNCTION:EC
+ECPKPARAMETERS_it                       3923   3_0_0   EXIST::FUNCTION:EC
 EC_GROUP_get_ecparameters               3924   3_0_0   EXIST::FUNCTION:EC
-DHparams_it                             3925   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DH
-DHparams_it                             3925   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DH
+DHparams_it                             3925   3_0_0   EXIST::FUNCTION:DH
 EVP_blake2s256                          3926   3_0_0   EXIST::FUNCTION:BLAKE2
 EVP_blake2b512                          3927   3_0_0   EXIST::FUNCTION:BLAKE2
 X509_SIG_get0                           3928   3_0_0   EXIST::FUNCTION:
@@ -4251,22 +4116,14 @@ EVP_aria_128_ctr                        4204    3_0_0   EXIST::FUNCTION:ARIA
 EVP_aria_192_ctr                        4205   3_0_0   EXIST::FUNCTION:ARIA
 UI_null                                 4206   3_0_0   EXIST::FUNCTION:
 EC_KEY_get0_engine                      4207   3_0_0   EXIST::FUNCTION:EC
-INT32_it                                4208   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-INT32_it                                4208   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-UINT64_it                               4209   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-UINT64_it                               4209   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ZINT32_it                               4210   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ZINT32_it                               4210   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ZUINT64_it                              4211   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ZUINT64_it                              4211   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-INT64_it                                4212   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-INT64_it                                4212   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ZUINT32_it                              4213   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ZUINT32_it                              4213   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-UINT32_it                               4214   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-UINT32_it                               4214   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ZINT64_it                               4215   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ZINT64_it                               4215   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+INT32_it                                4208   3_0_0   EXIST::FUNCTION:
+UINT64_it                               4209   3_0_0   EXIST::FUNCTION:
+ZINT32_it                               4210   3_0_0   EXIST::FUNCTION:
+ZUINT64_it                              4211   3_0_0   EXIST::FUNCTION:
+INT64_it                                4212   3_0_0   EXIST::FUNCTION:
+ZUINT32_it                              4213   3_0_0   EXIST::FUNCTION:
+UINT32_it                               4214   3_0_0   EXIST::FUNCTION:
+ZINT64_it                               4215   3_0_0   EXIST::FUNCTION:
 CRYPTO_mem_leaks_cb                     4216   3_0_0   EXIST::FUNCTION:CRYPTO_MDEBUG
 BIO_lookup_ex                           4217   3_0_0   EXIST::FUNCTION:SOCK
 X509_CRL_print_ex                       4218   3_0_0   EXIST::FUNCTION:
@@ -4362,8 +4219,7 @@ SCRYPT_PARAMS_new                       4310      3_0_0   EXIST::FUNCTION:SCRYPT
 SCRYPT_PARAMS_free                      4311   3_0_0   EXIST::FUNCTION:SCRYPT
 i2d_SCRYPT_PARAMS                       4312   3_0_0   EXIST::FUNCTION:SCRYPT
 d2i_SCRYPT_PARAMS                       4313   3_0_0   EXIST::FUNCTION:SCRYPT
-SCRYPT_PARAMS_it                        4314   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:SCRYPT
-SCRYPT_PARAMS_it                        4314   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:SCRYPT
+SCRYPT_PARAMS_it                        4314   3_0_0   EXIST::FUNCTION:SCRYPT
 CRYPTO_secure_clear_free                4315   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_meth_get0                      4316   3_0_0   EXIST::FUNCTION:
 EVP_PKEY_meth_get_count                 4317   3_0_0   EXIST::FUNCTION:
@@ -4433,8 +4289,7 @@ d2i_ADMISSION_SYNTAX                    4384      3_0_0   EXIST::FUNCTION:
 NAMING_AUTHORITY_set0_authorityId       4385   3_0_0   EXIST::FUNCTION:
 NAMING_AUTHORITY_set0_authorityURL      4386   3_0_0   EXIST::FUNCTION:
 d2i_PROFESSION_INFO                     4387   3_0_0   EXIST::FUNCTION:
-NAMING_AUTHORITY_it                     4388   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NAMING_AUTHORITY_it                     4388   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+NAMING_AUTHORITY_it                     4388   3_0_0   EXIST::FUNCTION:
 ADMISSION_SYNTAX_get0_contentsOfAdmissions 4389        3_0_0   EXIST::FUNCTION:
 PROFESSION_INFO_set0_professionItems    4390   3_0_0   EXIST::FUNCTION:
 NAMING_AUTHORITY_new                    4391   3_0_0   EXIST::FUNCTION:
@@ -4444,8 +4299,7 @@ PROFESSION_INFO_new                     4394      3_0_0   EXIST::FUNCTION:
 ADMISSIONS_new                          4395   3_0_0   EXIST::FUNCTION:
 ADMISSION_SYNTAX_set0_admissionAuthority 4396  3_0_0   EXIST::FUNCTION:
 PROFESSION_INFO_get0_professionOIDs     4397   3_0_0   EXIST::FUNCTION:
-PROFESSION_INFO_it                      4398   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-PROFESSION_INFO_it                      4398   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+PROFESSION_INFO_it                      4398   3_0_0   EXIST::FUNCTION:
 i2d_PROFESSION_INFO                     4399   3_0_0   EXIST::FUNCTION:
 ADMISSIONS_set0_professionInfos         4400   3_0_0   EXIST::FUNCTION:
 PROFESSION_INFO_get0_namingAuthority    4401   3_0_0   EXIST::FUNCTION:
@@ -4454,8 +4308,7 @@ PROFESSION_INFO_set0_addProfessionInfo  4403      3_0_0   EXIST::FUNCTION:
 PROFESSION_INFO_set0_registrationNumber 4404   3_0_0   EXIST::FUNCTION:
 ADMISSION_SYNTAX_set0_contentsOfAdmissions 4405        3_0_0   EXIST::FUNCTION:
 NAMING_AUTHORITY_get0_authorityId       4406   3_0_0   EXIST::FUNCTION:
-ADMISSION_SYNTAX_it                     4407   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ADMISSION_SYNTAX_it                     4407   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ADMISSION_SYNTAX_it                     4407   3_0_0   EXIST::FUNCTION:
 i2d_ADMISSION_SYNTAX                    4408   3_0_0   EXIST::FUNCTION:
 NAMING_AUTHORITY_get0_authorityText     4409   3_0_0   EXIST::FUNCTION:
 PROFESSION_INFO_set0_namingAuthority    4410   3_0_0   EXIST::FUNCTION:
@@ -4470,8 +4323,7 @@ PROFESSION_INFO_get0_professionItems    4418      3_0_0   EXIST::FUNCTION:
 ADMISSIONS_get0_admissionAuthority      4419   3_0_0   EXIST::FUNCTION:
 PROFESSION_INFO_set0_professionOIDs     4420   3_0_0   EXIST::FUNCTION:
 d2i_NAMING_AUTHORITY                    4421   3_0_0   EXIST::FUNCTION:
-ADMISSIONS_it                           4422   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ADMISSIONS_it                           4422   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ADMISSIONS_it                           4422   3_0_0   EXIST::FUNCTION:
 ADMISSIONS_get0_namingAuthority         4423   3_0_0   EXIST::FUNCTION:
 NAMING_AUTHORITY_set0_authorityText     4424   3_0_0   EXIST::FUNCTION:
 ADMISSIONS_set0_namingAuthority         4425   3_0_0   EXIST::FUNCTION:
@@ -4662,50 +4514,42 @@ d2i_OSSL_CRMF_ENCRYPTEDVALUE            4619    3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_ENCRYPTEDVALUE            4620   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_ENCRYPTEDVALUE_free           4621   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_ENCRYPTEDVALUE_new            4622   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDVALUE_it             4623   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_ENCRYPTEDVALUE_it             4623   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDVALUE_it             4623   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_MSG                       4624   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_MSG                       4625   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_MSG_free                      4626   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_MSG_new                       4627   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_MSG_it                        4628   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_MSG_it                        4628   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_MSG_it                        4628   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_PBMPARAMETER              4629   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_PBMPARAMETER              4630   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_PBMPARAMETER_free             4631   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_PBMPARAMETER_new              4632   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_PBMPARAMETER_it               4633   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_PBMPARAMETER_it               4633   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_PBMPARAMETER_it               4633   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_CERTID                    4634   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_CERTID                    4635   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTID_free                   4636   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTID_new                    4637   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_CERTID_it                     4638   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_CERTID_it                     4638   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_CERTID_it                     4638   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_PKIPUBLICATIONINFO        4639   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_PKIPUBLICATIONINFO        4640   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_PKIPUBLICATIONINFO_free       4641   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_PKIPUBLICATIONINFO_new        4642   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_PKIPUBLICATIONINFO_it         4643   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_PKIPUBLICATIONINFO_it         4643   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_PKIPUBLICATIONINFO_it         4643   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_SINGLEPUBINFO             4644   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_SINGLEPUBINFO             4645   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_SINGLEPUBINFO_free            4646   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_SINGLEPUBINFO_new             4647   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_SINGLEPUBINFO_it              4648   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_SINGLEPUBINFO_it              4648   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_SINGLEPUBINFO_it              4648   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_CERTTEMPLATE              4649   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_CERTTEMPLATE              4650   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTTEMPLATE_free             4651   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTTEMPLATE_new              4652   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_CERTTEMPLATE_it               4653   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_CERTTEMPLATE_it               4653   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_CERTTEMPLATE_it               4653   3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_MSGS                      4654   3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_MSGS                      4655   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_MSGS_free                     4656   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_MSGS_new                      4657   3_0_0   EXIST::FUNCTION:CRMF
-OSSL_CRMF_MSGS_it                       4658   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CRMF
-OSSL_CRMF_MSGS_it                       4658   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CRMF
+OSSL_CRMF_MSGS_it                       4658   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_pbmp_new                      4659   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_pbm_new                       4660   3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_MSG_set1_regCtrl_regToken     4661   3_0_0   EXIST::FUNCTION:CRMF
@@ -4798,18 +4642,15 @@ i2d_KeyParams                           4747    3_0_0   EXIST::FUNCTION:
 d2i_KeyParams                           4748   3_0_0   EXIST::FUNCTION:
 i2d_KeyParams_bio                       4749   3_0_0   EXIST::FUNCTION:
 d2i_KeyParams_bio                       4750   3_0_0   EXIST::FUNCTION:
-OSSL_CMP_PKISTATUS_it                   4751   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
-OSSL_CMP_PKISTATUS_it                   4751   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
+OSSL_CMP_PKISTATUS_it                   4751   3_0_0   EXIST::FUNCTION:CMP
 d2i_OSSL_CMP_PKIHEADER                  4752   3_0_0   EXIST::FUNCTION:CMP
 i2d_OSSL_CMP_PKIHEADER                  4753   3_0_0   EXIST::FUNCTION:CMP
 OSSL_CMP_PKIHEADER_free                 4754   3_0_0   EXIST::FUNCTION:CMP
 OSSL_CMP_PKIHEADER_new                  4755   3_0_0   EXIST::FUNCTION:CMP
-OSSL_CMP_PKIHEADER_it                   4756   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
-OSSL_CMP_PKIHEADER_it                   4756   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
+OSSL_CMP_PKIHEADER_it                   4756   3_0_0   EXIST::FUNCTION:CMP
 d2i_OSSL_CMP_MSG                        4757   3_0_0   EXIST::FUNCTION:CMP
 i2d_OSSL_CMP_MSG                        4758   3_0_0   EXIST::FUNCTION:CMP
-OSSL_CMP_MSG_it                         4759   3_0_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
-OSSL_CMP_MSG_it                         4759   3_0_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
+OSSL_CMP_MSG_it                         4759   3_0_0   EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_create                    4760   3_0_0   EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_set0                      4761   3_0_0   EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_get0_type                 4762   3_0_0   EXIST::FUNCTION:CMP
index 83c9d79..a860db6 100755 (executable)
@@ -109,24 +109,20 @@ my $libname = platform->sharedname($name);
 my %OS_data = (
     solaris     => { writer     => \&writer_linux,
                      sort       => sorter_linux(),
-                     platforms  => { UNIX                       => 1,
-                                     EXPORT_VAR_AS_FUNCTION     => 0 } },
+                     platforms  => { UNIX                       => 1 } },
     linux       => 'solaris',   # alias
     "bsd-gcc"   => 'solaris',   # alias
     aix         => { writer     => \&writer_aix,
                      sort       => sorter_unix(),
-                     platforms  => { UNIX                       => 1,
-                                     EXPORT_VAR_AS_FUNCTION     => 0 } },
+                     platforms  => { UNIX                       => 1 } },
     VMS         => { writer     => \&writer_VMS,
                      sort       => OpenSSL::Ordinals::by_number(),
-                     platforms  => { VMS                        => 1,
-                                     EXPORT_VAR_AS_FUNCTION     => 0 } },
+                     platforms  => { VMS                        => 1 } },
     vms         => 'VMS',       # alias
     WINDOWS     => { writer     => \&writer_windows,
                      sort       => OpenSSL::Ordinals::by_name(),
                      platforms  => { WIN32                      => 1,
-                                     _WIN32                     => 1,
-                                     EXPORT_VAR_AS_FUNCTION     => 1 } },
+                                     _WIN32                     => 1 } },
     windows     => 'WINDOWS',   # alias
     WIN32       => 'WINDOWS',   # alias
     win32       => 'WIN32',     # alias
index c26a866..302d58f 100644 (file)
@@ -342,8 +342,6 @@ sub _parse_platforms {
 #       if ($def =~ m{^__DragonFly__$})             { $platforms{$&} = $op; }
 #       if ($def =~ m{^__OpenBSD__$})               { $platforms{$&} = $op; }
 #       if ($def =~ m{^__NetBSD__$})                { $platforms{$&} = $op; }
-        if ($def =~
-            m{^OPENSSL_(EXPORT_VAR_AS_FUNCTION)$})  { $platforms{$1} = $op; }
         if ($def =~ m{^OPENSSL_SYS_})               { $platforms{$'} = $op; }
     }
 
index 8e5b8b2..286fa7e 100644 (file)
@@ -400,11 +400,7 @@ EOF
     { regexp   => qr/DECLARE_ASN1_ITEM<<<\((.*)\)>>>/,
       massager => sub {
           return (<<"EOF");
-#ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-OPENSSL_EXTERN const ASN1_ITEM *$1_it;
-#else
 const ASN1_ITEM *$1_it(void);
-#endif
 EOF
       },
     },