Initialize files that declare internal symbols

util/other-internal.syms is like util/other.syms, but for internal symbols.
Likewise, util/missingcrypto-internal.txt and util/missingssl-internal.txt
are like util/missingcrypto.txt and util/missingssl.txt

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11476)

diff --git a/util/missingcrypto-internal.txt b/util/missingcrypto-internal.txt
new file mode 100644 (file)
index 0000000..4c90857
--- /dev/null
+++ b/util/missingcrypto-internal.txt
@@ -0,0 +1,3 @@
+WPACKET(3)
+WPACKET_init_der(3)
+WPACKET_init_null_der(3)

diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index 73c5af9101d5c557b53afaca4313eb4cd6a6832e..6ce32388a24097d0773531e7bb9db43224614011 100644 (file)
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -1274,9 +1274,6 @@ WHIRLPOOL_BitUpdate(3)
 WHIRLPOOL_Final(3)
 WHIRLPOOL_Init(3)
 WHIRLPOOL_Update(3)
-WPACKET(3)
-WPACKET_init_der(3)
-WPACKET_init_null_der(3)
 X509V3_EXT_CRL_add_conf(3)
 X509V3_EXT_CRL_add_nconf(3)
 X509V3_EXT_REQ_add_conf(3)

diff --git a/util/missingssl-internal.txt b/util/missingssl-internal.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/util/other-internal.syms b/util/other-internal.syms
new file mode 100644 (file)
index 0000000..5688daa
--- /dev/null
+++ b/util/other-internal.syms
@@ -0,0 +1,3 @@
+ossl_cmp_allow_unprotected_cb_t         datatype
+#
+DEFINE_SPARSE_ARRAY_OF                  define

diff --git a/util/other.syms b/util/other.syms
index 90fba73ca9397d1be72196841663c079df3376d6..9f44034fd557a9e22fdc2d2ddd22fb0a49a0d11f 100644 (file)
--- a/util/other.syms
+++ b/util/other.syms
@@ -11,7 +11,9 @@ OPENSSL_instrument_bus2                 assembler
 #
 ADMISSION_SYNTAX                        datatype
 ADMISSIONS                              datatype
+ASN1_ITEM                               datatype
 ASN1_STRING_TABLE                       datatype
+ASYNC_callback_fn                       datatype
 BIO_ADDR                                datatype
 BIO_ADDRINFO                            datatype
 BIO_callback_fn                         datatype
@@ -37,7 +39,6 @@ GEN_SESSION_CB                          datatype
 OPENSSL_Applink                         external
 OPENSSL_CTX                             datatype
 NAMING_AUTHORITY                        datatype
-OCSP_parse_url                          define
 OSSL_HTTP_bio_cb_t                      datatype
 OSSL_PARAM                              datatype
 OSSL_PROVIDER                           datatype
@@ -68,6 +69,7 @@ RAND_poll_cb                            datatype
 SSL_CTX_allow_early_data_cb_fn          datatype
 SSL_CTX_keylog_cb_func                  datatype
 SSL_allow_early_data_cb_fn              datatype
+SSL_async_callback_fn                   datatype
 SSL_client_hello_cb_fn                  datatype
 SSL_custom_ext_add_cb_ex                datatype
 SSL_custom_ext_free_cb_ex               datatype
@@ -111,9 +113,8 @@ custom_ext_free_cb                      datatype
 custom_ext_parse_cb                     datatype
 pem_password_cb                         datatype
 ssl_ct_validation_cb                    datatype
-ASYNC_callback_fn                       datatype
-SSL_async_callback_fn                   datatype
 #
+ASN1_BIT_STRING_digest                  define
 BIO_append_filename                     define
 BIO_destroy_bio_pair                    define
 BIO_do_accept                           define
@@ -124,6 +125,8 @@ BIO_flush                               define
 BIO_get_accept_name                     define
 BIO_get_accept_port                     define
 BIO_get_accept_ip_family                define
+BIO_get_app_data                        define
+BIO_get_ex_new_index                    define
 BIO_get_peer_name                       define
 BIO_get_peer_port                       define
 BIO_get_bind_mode                       define
@@ -161,6 +164,7 @@ BIO_set_accept_bios                     define
 BIO_set_accept_name                     define
 BIO_set_accept_port                     define
 BIO_set_accept_ip_family                define
+BIO_set_app_data                        define
 BIO_set_bind_mode                       define
 BIO_set_buffer_read_data                define
 BIO_set_buffer_size                     define
@@ -315,6 +319,7 @@ EVP_rc5_32_12_16_cfb                    define
 EVP_seed_cfb                            define
 EVP_sm4_cfb                             define
 OBJ_cleanup                             define deprecated 1.1.0
+OCSP_parse_url                          define
 OPENSSL_FILE                            define
 OPENSSL_FUNC                            define
 OPENSSL_LINE                            define
@@ -366,7 +371,6 @@ OSSL_CMP_LOG_WARNING                    define
 OSSL_CMP_MSTR_HELPER                    define
 OSSL_CMP_MSTR                           define
 OSSL_CMP_P10CR                          define
-ossl_cmp_allow_unprotected_cb_t         datatype
 OSSL_CMP_certConf_cb_t                  datatype
 OSSL_CMP_log_cb_t                       datatype
 OSSL_CMP_severity                       datatype