git: 5ffb5c849c86 - main - openssl: don't export nonexistant symbols
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Apr 2024 20:29:15 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=5ffb5c849c86fbc300e2b35bb9ee42997c3535e7
commit 5ffb5c849c86fbc300e2b35bb9ee42997c3535e7
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-04-22 19:13:28 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-04-22 20:28:51 +0000
openssl: don't export nonexistant symbols
These are all OpenSSL 1.1.0 and 1.1.1 symbols that aren't present in our
OpenSSL 3.0 builds.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D44249
---
secure/lib/libcrypto/Version.map | 133 ---------------------------------------
secure/lib/libssl/Version.map | 4 --
2 files changed, 137 deletions(-)
diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version.map
index 557b4a4b7b84..86575078bf6c 100644
--- a/secure/lib/libcrypto/Version.map
+++ b/secure/lib/libcrypto/Version.map
@@ -813,7 +813,6 @@ OPENSSL_1_1_0 {
CRYPTO_get_ex_new_index;
CRYPTO_get_mem_functions;
CRYPTO_malloc;
- CRYPTO_mem_ctrl;
CRYPTO_memcmp;
CRYPTO_memdup;
CRYPTO_new_ex_data;
@@ -843,7 +842,6 @@ OPENSSL_1_1_0 {
CRYPTO_secure_used;
CRYPTO_secure_zalloc;
CRYPTO_set_ex_data;
- CRYPTO_set_mem_debug;
CRYPTO_set_mem_functions;
CRYPTO_strdup;
CRYPTO_strndup;
@@ -1362,7 +1360,6 @@ OPENSSL_1_1_0 {
ERR_load_CT_strings;
ERR_load_DH_strings;
ERR_load_DSA_strings;
- ERR_load_DSO_strings;
ERR_load_EC_strings;
ERR_load_ENGINE_strings;
ERR_load_ERR_strings;
@@ -1390,7 +1387,6 @@ OPENSSL_1_1_0 {
ERR_print_errors;
ERR_print_errors_cb;
ERR_print_errors_fp;
- ERR_put_error;
ERR_reason_error_string;
ERR_remove_state;
ERR_remove_thread_state;
@@ -1407,23 +1403,17 @@ OPENSSL_1_1_0 {
ESS_SIGNING_CERT_free;
ESS_SIGNING_CERT_new;
EVP_BytesToKey;
- EVP_CIPHER_CTX_block_size;
EVP_CIPHER_CTX_buf_noconst;
EVP_CIPHER_CTX_cipher;
EVP_CIPHER_CTX_clear_flags;
EVP_CIPHER_CTX_copy;
EVP_CIPHER_CTX_ctrl;
- EVP_CIPHER_CTX_encrypting;
EVP_CIPHER_CTX_free;
EVP_CIPHER_CTX_get_app_data;
EVP_CIPHER_CTX_get_cipher_data;
EVP_CIPHER_CTX_iv;
- EVP_CIPHER_CTX_iv_length;
EVP_CIPHER_CTX_iv_noconst;
- EVP_CIPHER_CTX_key_length;
EVP_CIPHER_CTX_new;
- EVP_CIPHER_CTX_nid;
- EVP_CIPHER_CTX_num;
EVP_CIPHER_CTX_original_iv;
EVP_CIPHER_CTX_rand_key;
EVP_CIPHER_CTX_reset;
@@ -1435,14 +1425,10 @@ OPENSSL_1_1_0 {
EVP_CIPHER_CTX_set_padding;
EVP_CIPHER_CTX_test_flags;
EVP_CIPHER_asn1_to_param;
- EVP_CIPHER_block_size;
EVP_CIPHER_do_all;
EVP_CIPHER_do_all_sorted;
- EVP_CIPHER_flags;
EVP_CIPHER_get_asn1_iv;
EVP_CIPHER_impl_ctx_size;
- EVP_CIPHER_iv_length;
- EVP_CIPHER_key_length;
EVP_CIPHER_meth_dup;
EVP_CIPHER_meth_free;
EVP_CIPHER_meth_get_cleanup;
@@ -1461,10 +1447,8 @@ OPENSSL_1_1_0 {
EVP_CIPHER_meth_set_init;
EVP_CIPHER_meth_set_iv_length;
EVP_CIPHER_meth_set_set_asn1_params;
- EVP_CIPHER_nid;
EVP_CIPHER_param_to_asn1;
EVP_CIPHER_set_asn1_iv;
- EVP_CIPHER_type;
EVP_CipherFinal;
EVP_CipherFinal_ex;
EVP_CipherInit;
@@ -1509,18 +1493,14 @@ OPENSSL_1_1_0 {
EVP_MD_CTX_ctrl;
EVP_MD_CTX_free;
EVP_MD_CTX_md;
- EVP_MD_CTX_md_data;
EVP_MD_CTX_new;
- EVP_MD_CTX_pkey_ctx;
EVP_MD_CTX_reset;
EVP_MD_CTX_set_flags;
EVP_MD_CTX_set_update_fn;
EVP_MD_CTX_test_flags;
EVP_MD_CTX_update_fn;
- EVP_MD_block_size;
EVP_MD_do_all;
EVP_MD_do_all_sorted;
- EVP_MD_flags;
EVP_MD_meth_dup;
EVP_MD_meth_free;
EVP_MD_meth_get_app_datasize;
@@ -1544,9 +1524,6 @@ OPENSSL_1_1_0 {
EVP_MD_meth_set_input_blocksize;
EVP_MD_meth_set_result_size;
EVP_MD_meth_set_update;
- EVP_MD_pkey_type;
- EVP_MD_size;
- EVP_MD_type;
EVP_OpenFinal;
EVP_OpenInit;
EVP_PBE_CipherInit;
@@ -1599,8 +1576,6 @@ OPENSSL_1_1_0 {
EVP_PKEY_asn1_set_public;
EVP_PKEY_asn1_set_security_bits;
EVP_PKEY_assign;
- EVP_PKEY_base_id;
- EVP_PKEY_bits;
EVP_PKEY_cmp;
EVP_PKEY_cmp_parameters;
EVP_PKEY_copy_parameters;
@@ -1626,13 +1601,11 @@ OPENSSL_1_1_0 {
EVP_PKEY_get1_DSA;
EVP_PKEY_get1_EC_KEY;
EVP_PKEY_get1_RSA;
- EVP_PKEY_get1_tls_encodedpoint;
EVP_PKEY_get_attr;
EVP_PKEY_get_attr_by_NID;
EVP_PKEY_get_attr_by_OBJ;
EVP_PKEY_get_attr_count;
EVP_PKEY_get_default_digest_nid;
- EVP_PKEY_id;
EVP_PKEY_keygen;
EVP_PKEY_keygen_init;
EVP_PKEY_meth_add0;
@@ -1678,17 +1651,14 @@ OPENSSL_1_1_0 {
EVP_PKEY_print_private;
EVP_PKEY_print_public;
EVP_PKEY_save_parameters;
- EVP_PKEY_security_bits;
EVP_PKEY_set1_DH;
EVP_PKEY_set1_DSA;
EVP_PKEY_set1_EC_KEY;
EVP_PKEY_set1_RSA;
- EVP_PKEY_set1_tls_encodedpoint;
EVP_PKEY_set_type;
EVP_PKEY_set_type_str;
EVP_PKEY_sign;
EVP_PKEY_sign_init;
- EVP_PKEY_size;
EVP_PKEY_type;
EVP_PKEY_up_ref;
EVP_PKEY_verify;
@@ -1801,15 +1771,10 @@ OPENSSL_1_1_0 {
EVP_get_cipherbyname;
EVP_get_digestbyname;
EVP_get_pw_prompt;
- EVP_idea_cbc;
- EVP_idea_cfb64;
- EVP_idea_ecb;
- EVP_idea_ofb;
EVP_md4;
EVP_md5;
EVP_md5_sha1;
EVP_md_null;
- EVP_mdc2;
EVP_rc2_40_cbc;
EVP_rc2_64_cbc;
EVP_rc2_cbc;
@@ -1819,10 +1784,6 @@ OPENSSL_1_1_0 {
EVP_rc4;
EVP_rc4_40;
EVP_rc4_hmac_md5;
- EVP_rc5_32_12_16_cbc;
- EVP_rc5_32_12_16_cfb64;
- EVP_rc5_32_12_16_ecb;
- EVP_rc5_32_12_16_ofb;
EVP_read_pw_string;
EVP_read_pw_string_min;
EVP_ripemd160;
@@ -1839,8 +1800,6 @@ OPENSSL_1_1_0 {
EVP_whirlpool;
EXTENDED_KEY_USAGE_free;
EXTENDED_KEY_USAGE_new;
- FIPS_mode;
- FIPS_mode_set;
GENERAL_NAMES_free;
GENERAL_NAMES_new;
GENERAL_NAME_cmp;
@@ -1866,14 +1825,6 @@ OPENSSL_1_1_0 {
HMAC_Init_ex;
HMAC_Update;
HMAC_size;
- IDEA_cbc_encrypt;
- IDEA_cfb64_encrypt;
- IDEA_ecb_encrypt;
- IDEA_encrypt;
- IDEA_ofb64_encrypt;
- IDEA_options;
- IDEA_set_decrypt_key;
- IDEA_set_encrypt_key;
IPAddressChoice_free;
IPAddressChoice_new;
IPAddressFamily_free;
@@ -1894,10 +1845,6 @@ OPENSSL_1_1_0 {
MD5_Init;
MD5_Transform;
MD5_Update;
- MDC2;
- MDC2_Final;
- MDC2_Init;
- MDC2_Update;
NAME_CONSTRAINTS_check;
NAME_CONSTRAINTS_check_CN;
NAME_CONSTRAINTS_free;
@@ -2004,15 +1951,6 @@ OPENSSL_1_1_0 {
OCSP_REQUEST_get_ext_count;
OCSP_REQUEST_new;
OCSP_REQUEST_print;
- OCSP_REQ_CTX_add1_header;
- OCSP_REQ_CTX_free;
- OCSP_REQ_CTX_get0_mem_bio;
- OCSP_REQ_CTX_http;
- OCSP_REQ_CTX_i2d;
- OCSP_REQ_CTX_nbio;
- OCSP_REQ_CTX_nbio_d2i;
- OCSP_REQ_CTX_new;
- OCSP_REQ_CTX_set1_req;
OCSP_RESPBYTES_free;
OCSP_RESPBYTES_new;
OCSP_RESPDATA_free;
@@ -2059,7 +1997,6 @@ OPENSSL_1_1_0 {
OCSP_id_get0_info;
OCSP_id_issuer_cmp;
OCSP_onereq_get0_id;
- OCSP_parse_url;
OCSP_request_add0_id;
OCSP_request_add1_cert;
OCSP_request_add1_nonce;
@@ -2082,9 +2019,7 @@ OPENSSL_1_1_0 {
OCSP_response_status;
OCSP_response_status_str;
OCSP_sendreq_bio;
- OCSP_sendreq_nbio;
OCSP_sendreq_new;
- OCSP_set_max_response_length;
OCSP_single_get0_status;
OCSP_url_svcloc_new;
OPENSSL_DIR_end;
@@ -2127,7 +2062,6 @@ OPENSSL_1_1_0 {
OPENSSL_isservice;
OPENSSL_issetugid;
OPENSSL_load_builtin_modules;
- OPENSSL_memcmp;
OPENSSL_sk_deep_copy;
OPENSSL_sk_delete;
OPENSSL_sk_delete_ptr;
@@ -2479,13 +2413,6 @@ OPENSSL_1_1_0 {
RC4;
RC4_options;
RC4_set_key;
- RC5_32_cbc_encrypt;
- RC5_32_cfb64_encrypt;
- RC5_32_decrypt;
- RC5_32_ecb_encrypt;
- RC5_32_encrypt;
- RC5_32_ofb64_encrypt;
- RC5_32_set_key;
RIPEMD160;
RIPEMD160_Final;
RIPEMD160_Init;
@@ -2558,14 +2485,12 @@ OPENSSL_1_1_0 {
RSA_padding_add_PKCS1_PSS_mgf1;
RSA_padding_add_PKCS1_type_1;
RSA_padding_add_PKCS1_type_2;
- RSA_padding_add_SSLv23;
RSA_padding_add_X931;
RSA_padding_add_none;
RSA_padding_check_PKCS1_OAEP;
RSA_padding_check_PKCS1_OAEP_mgf1;
RSA_padding_check_PKCS1_type_1;
RSA_padding_check_PKCS1_type_2;
- RSA_padding_check_SSLv23;
RSA_padding_check_X931;
RSA_padding_check_none;
RSA_print;
@@ -2825,7 +2750,6 @@ OPENSSL_1_1_0 {
TS_TST_INFO_set_time;
TS_TST_INFO_set_tsa;
TS_TST_INFO_set_version;
- TS_VERIFY_CTS_set_certs;
TS_VERIFY_CTX_add_flags;
TS_VERIFY_CTX_cleanup;
TS_VERIFY_CTX_free;
@@ -3003,7 +2927,6 @@ OPENSSL_1_1_0 {
X509_CRL_get_nextUpdate;
X509_CRL_get_signature_nid;
X509_CRL_get_version;
- X509_CRL_http_nbio;
X509_CRL_match;
X509_CRL_new;
X509_CRL_print;
@@ -3070,7 +2993,6 @@ OPENSSL_1_1_0 {
X509_NAME_get_index_by_OBJ;
X509_NAME_get_text_by_NID;
X509_NAME_get_text_by_OBJ;
- X509_NAME_hash;
X509_NAME_hash_old;
X509_NAME_new;
X509_NAME_oneline;
@@ -3386,7 +3308,6 @@ OPENSSL_1_1_0 {
X509_getm_notAfter;
X509_getm_notBefore;
X509_gmtime_adj;
- X509_http_nbio;
X509_issuer_and_serial_cmp;
X509_issuer_and_serial_hash;
X509_issuer_name_cmp;
@@ -4038,7 +3959,6 @@ OPENSSL_1_1_0 {
X509_VAL_it;
X509_it;
ZLONG_it;
- _shadow_DES_check_key;
};
OPENSSL_1_1_0a {
@@ -4229,34 +4149,6 @@ OPENSSL_1_1_1 {
EVP_PKEY_new_raw_public_key;
EVP_PKEY_param_check;
EVP_PKEY_public_check;
- EVP_PKEY_set_alias_type;
- EVP_aria_128_cbc;
- EVP_aria_128_ccm;
- EVP_aria_128_cfb128;
- EVP_aria_128_cfb1;
- EVP_aria_128_cfb8;
- EVP_aria_128_ctr;
- EVP_aria_128_ecb;
- EVP_aria_128_gcm;
- EVP_aria_128_ofb;
- EVP_aria_192_cbc;
- EVP_aria_192_ccm;
- EVP_aria_192_cfb128;
- EVP_aria_192_cfb1;
- EVP_aria_192_cfb8;
- EVP_aria_192_ctr;
- EVP_aria_192_ecb;
- EVP_aria_192_gcm;
- EVP_aria_192_ofb;
- EVP_aria_256_cbc;
- EVP_aria_256_ccm;
- EVP_aria_256_cfb128;
- EVP_aria_256_cfb1;
- EVP_aria_256_cfb8;
- EVP_aria_256_ctr;
- EVP_aria_256_ecb;
- EVP_aria_256_gcm;
- EVP_aria_256_ofb;
EVP_sha3_224;
EVP_sha3_256;
EVP_sha3_384;
@@ -4265,12 +4157,6 @@ OPENSSL_1_1_1 {
EVP_sha512_256;
EVP_shake128;
EVP_shake256;
- EVP_sm3;
- EVP_sm4_cbc;
- EVP_sm4_cfb128;
- EVP_sm4_ctr;
- EVP_sm4_ecb;
- EVP_sm4_ofb;
NAMING_AUTHORITY_free;
NAMING_AUTHORITY_get0_authorityId;
NAMING_AUTHORITY_get0_authorityText;
@@ -4357,25 +4243,6 @@ OPENSSL_1_1_1 {
PROFESSION_INFO_set0_professionItems;
PROFESSION_INFO_set0_professionOIDs;
PROFESSION_INFO_set0_registrationNumber;
- RAND_DRBG_bytes;
- RAND_DRBG_free;
- RAND_DRBG_generate;
- RAND_DRBG_get0_master;
- RAND_DRBG_get0_private;
- RAND_DRBG_get0_public;
- RAND_DRBG_get_ex_data;
- RAND_DRBG_instantiate;
- RAND_DRBG_new;
- RAND_DRBG_reseed;
- RAND_DRBG_secure_new;
- RAND_DRBG_set;
- RAND_DRBG_set_callbacks;
- RAND_DRBG_set_defaults;
- RAND_DRBG_set_ex_data;
- RAND_DRBG_set_reseed_defaults;
- RAND_DRBG_set_reseed_interval;
- RAND_DRBG_set_reseed_time_interval;
- RAND_DRBG_uninstantiate;
RAND_keep_random_devices_open;
RAND_priv_bytes;
RSA_generate_multi_prime_key;
diff --git a/secure/lib/libssl/Version.map b/secure/lib/libssl/Version.map
index 457493beafb5..0c02b50d793b 100644
--- a/secure/lib/libssl/Version.map
+++ b/secure/lib/libssl/Version.map
@@ -264,7 +264,6 @@ OPENSSL_1_1_0 {
SSL_get_info_callback;
SSL_get_options;
SSL_get_peer_cert_chain;
- SSL_get_peer_certificate;
SSL_get_peer_finished;
SSL_get_privatekey;
SSL_get_psk_identity;
@@ -387,9 +386,6 @@ OPENSSL_1_1_0 {
SSL_waiting_for_async;
SSL_want;
SSL_write;
- SSLv3_client_method;
- SSLv3_method;
- SSLv3_server_method;
TLS_client_method;
TLS_method;
TLS_server_method;