The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4680e7fcc70a998765bb9ce602b080d8efb114bc
commit 4680e7fcc70a998765bb9ce602b080d8efb114bc Author: Cy Schubert <c...@freebsd.org> AuthorDate: 2025-07-24 14:59:47 +0000 Commit: Cy Schubert <c...@freebsd.org> CommitDate: 2025-07-24 16:31:39 +0000 krb5: Replace version maps with generated version maps Suggested by: jhb Fixes: ae07a5805b19 --- krb5/lib/crypto/version.map | 3 +- krb5/lib/gssapi/version.map | 95 ++++++++++++++-------------- krb5/lib/kadm5clnt/version.map | 3 +- krb5/lib/kadm5srv/version.map | 3 +- krb5/lib/kdb/version.map | 3 +- krb5/lib/krad/version.map | 3 +- krb5/lib/krb5/version.map | 14 ++++- krb5/lib/rpc/version.map | 3 +- krb5/plugins/audit/version.map | 3 +- krb5/plugins/k5tls/version.map | 3 +- krb5/plugins/kdb/db2/version.map | 108 +------------------------------- krb5/plugins/preauth/otp/version.map | 3 +- krb5/plugins/preauth/pkinit/version.map | 3 +- krb5/plugins/preauth/spake/version.map | 3 +- krb5/plugins/preauth/test/version.map | 3 +- krb5/util/et/version.map | 3 +- krb5/util/profile/version.map | 49 +++++++++++++-- krb5/util/support/version.map | 3 +- krb5/util/verto/version.map | 3 +- 19 files changed, 138 insertions(+), 173 deletions(-) diff --git a/krb5/lib/crypto/version.map b/krb5/lib/crypto/version.map index bd4c2c1cd23f..57448f6d85fa 100644 --- a/krb5/lib/crypto/version.map +++ b/krb5/lib/crypto/version.map @@ -1,4 +1,4 @@ -KRB5_CRYPTO_1.0 { +k5crypto_3_MIT { global: krb5_c_make_random_key; krb5_c_encrypt_length; @@ -106,3 +106,4 @@ KRB5_CRYPTO_1.0 { k5_enctype_to_ssf; krb5int_c_deprecated_enctype; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/gssapi/version.map b/krb5/lib/gssapi/version.map index afdfe9a0a83a..bd0d28df70a7 100644 --- a/krb5/lib/gssapi/version.map +++ b/krb5/lib/gssapi/version.map @@ -1,37 +1,9 @@ -KRB5_GSSAPI_1.0 { +gssapi_krb5_2_MIT { global: GSS_C_ATTR_LOCAL_LOGIN_USER; + GSS_C_INQ_SSPI_SESSION_KEY; GSS_C_INQ_NEGOEX_KEY; GSS_C_INQ_NEGOEX_VERIFY_KEY; - GSS_C_INQ_SSPI_SESSION_KEY; - GSS_C_MA_AUTH_INIT; - GSS_C_MA_AUTH_INIT_ANON; - GSS_C_MA_AUTH_INIT_INIT; - GSS_C_MA_AUTH_TARG; - GSS_C_MA_AUTH_TARG_ANON; - GSS_C_MA_AUTH_TARG_INIT; - GSS_C_MA_CBINDINGS; - GSS_C_MA_COMPRESS; - GSS_C_MA_CONF_PROT; - GSS_C_MA_CTX_TRANS; - GSS_C_MA_DELEG_CRED; - GSS_C_MA_DEPRECATED; - GSS_C_MA_INTEG_PROT; - GSS_C_MA_ITOK_FRAMED; - GSS_C_MA_MECH_COMPOSITE; - GSS_C_MA_MECH_CONCRETE; - GSS_C_MA_MECH_GLUE; - GSS_C_MA_MECH_NEGO; - GSS_C_MA_MECH_PSEUDO; - GSS_C_MA_MIC; - GSS_C_MA_NEGOEX_AND_SPNEGO; - GSS_C_MA_NOT_DFLT_MECH; - GSS_C_MA_NOT_MECH; - GSS_C_MA_OOS_DET; - GSS_C_MA_PFS; - GSS_C_MA_PROT_READY; - GSS_C_MA_REPLAY_DET; - GSS_C_MA_WRAP; GSS_C_NT_ANONYMOUS; GSS_C_NT_COMPOSITE_EXPORT; GSS_C_NT_EXPORT_NAME; @@ -40,20 +12,46 @@ KRB5_GSSAPI_1.0 { GSS_C_NT_MACHINE_UID_NAME; GSS_C_NT_STRING_UID_NAME; GSS_C_NT_USER_NAME; - GSS_C_SEC_CONTEXT_SASL_SSF; - GSS_KRB5_CRED_NO_CI_FLAGS_X; - GSS_KRB5_GET_CRED_IMPERSONATOR; - GSS_KRB5_NT_ENTERPRISE_NAME; GSS_KRB5_NT_PRINCIPAL_NAME; + GSS_KRB5_NT_ENTERPRISE_NAME; GSS_KRB5_NT_X509_CERT; + GSS_KRB5_CRED_NO_CI_FLAGS_X; + GSS_KRB5_GET_CRED_IMPERSONATOR; + GSS_C_MA_MECH_CONCRETE; + GSS_C_MA_MECH_PSEUDO; + GSS_C_MA_MECH_COMPOSITE; + GSS_C_MA_MECH_NEGO; + GSS_C_MA_MECH_GLUE; + GSS_C_MA_NOT_MECH; + GSS_C_MA_DEPRECATED; + GSS_C_MA_NOT_DFLT_MECH; + GSS_C_MA_ITOK_FRAMED; + GSS_C_MA_AUTH_INIT; + GSS_C_MA_AUTH_TARG; + GSS_C_MA_AUTH_INIT_INIT; + GSS_C_MA_AUTH_TARG_INIT; + GSS_C_MA_AUTH_INIT_ANON; + GSS_C_MA_AUTH_TARG_ANON; + GSS_C_MA_DELEG_CRED; + GSS_C_MA_INTEG_PROT; + GSS_C_MA_CONF_PROT; + GSS_C_MA_MIC; + GSS_C_MA_WRAP; + GSS_C_MA_PROT_READY; + GSS_C_MA_REPLAY_DET; + GSS_C_MA_OOS_DET; + GSS_C_MA_CBINDINGS; + GSS_C_MA_PFS; + GSS_C_MA_COMPRESS; + GSS_C_MA_CTX_TRANS; + GSS_C_MA_NEGOEX_AND_SPNEGO; + GSS_C_SEC_CONTEXT_SASL_SSF; gss_accept_sec_context; gss_acquire_cred; - gss_acquire_cred_from; - gss_acquire_cred_impersonate_name; gss_acquire_cred_with_password; + gss_acquire_cred_impersonate_name; gss_add_buffer_set_member; gss_add_cred; - gss_add_cred_from; gss_add_cred_impersonate_name; gss_add_cred_with_password; gss_add_oid_set_member; @@ -85,8 +83,8 @@ KRB5_GSSAPI_1.0 { gss_import_name; gss_import_sec_context; gss_indicate_mechs; - gss_indicate_mechs_by_attrs; gss_init_sec_context; + gss_indicate_mechs_by_attrs; gss_inquire_attrs_for_mech; gss_inquire_context; gss_inquire_cred; @@ -94,7 +92,6 @@ KRB5_GSSAPI_1.0 { gss_inquire_cred_by_oid; gss_inquire_mech_for_saslname; gss_inquire_mechs_for_name; - gss_inquire_name; gss_inquire_names_for_mech; gss_inquire_saslname_for_mech; gss_inquire_sec_context_by_oid; @@ -108,6 +105,8 @@ KRB5_GSSAPI_1.0 { gss_krb5_set_cred_rcache; gss_krb5int_make_seal_token_v3; gss_krb5int_unseal_token_v3; + gsskrb5_extract_authtime_from_sec_context; + gsskrb5_extract_authz_data_from_sec_context; gss_localname; gss_map_name_to_any; gss_mech_iakerb; @@ -128,24 +127,22 @@ KRB5_GSSAPI_1.0 { gss_oid_equal; gss_oid_to_str; gss_pname_to_uid; - gss_process_context_token; gss_pseudo_random; + gss_process_context_token; gss_release_any_name_mapping; - gss_release_buffer; gss_release_buffer_set; + gss_release_buffer; gss_release_cred; gss_release_iov_buffer; gss_release_name; gss_release_oid; gss_release_oid_set; gss_seal; - gss_set_cred_option; gss_set_name_attribute; gss_set_neg_mechs; gss_set_sec_context_option; gss_sign; gss_store_cred; - gss_store_cred_into; gss_str_to_oid; gss_test_oid_set_member; gss_unseal; @@ -161,12 +158,16 @@ KRB5_GSSAPI_1.0 { gss_wrap_iov; gss_wrap_iov_length; gss_wrap_size_limit; - gssint_g_seqstate_init; - gsskrb5_extract_authtime_from_sec_context; - gsskrb5_extract_authz_data_from_sec_context; - gssspi_mech_invoke; + gss_set_cred_option; gssspi_set_cred_option; + gssspi_mech_invoke; krb5_gss_dbg_client_expcreds; krb5_gss_register_acceptor_identity; krb5_gss_use_kdc_context; + gss_inquire_name; + gss_acquire_cred_from; + gss_add_cred_from; + gss_store_cred_into; + gssint_g_seqstate_init; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kadm5clnt/version.map b/krb5/lib/kadm5clnt/version.map index 9743c7cf6140..1b624130144d 100644 --- a/krb5/lib/kadm5clnt/version.map +++ b/krb5/lib/kadm5clnt/version.map @@ -1,4 +1,4 @@ -KRB5_KADM5_CLNT_1.0 { +kadm5clnt_mit_12_MIT { global: _kadm5_check_handle; _kadm5_chpass_principal_util; @@ -116,3 +116,4 @@ KRB5_KADM5_CLNT_1.0 { xdr_ui_4; kadm5_init_iprop; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kadm5srv/version.map b/krb5/lib/kadm5srv/version.map index a0e9da6daef2..d18753acad3f 100644 --- a/krb5/lib/kadm5srv/version.map +++ b/krb5/lib/kadm5srv/version.map @@ -1,4 +1,4 @@ -KRB5_KADM5_SRV_1.0 { +kadm5srv_mit_12_MIT { global: _kadm5_check_handle; _kadm5_chpass_principal_util; @@ -135,3 +135,4 @@ KRB5_KADM5_SRV_1.0 { xdr_ui_4; kadm5_init_iprop; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kdb/version.map b/krb5/lib/kdb/version.map index 9522af1e9edd..63096fe7190a 100644 --- a/krb5/lib/kdb/version.map +++ b/krb5/lib/kdb/version.map @@ -1,4 +1,4 @@ -KRB5_KDB5_1.0 { +kdb5_10_MIT { global: krb5_db_setup_lib_handle; krb5_db_open; @@ -109,3 +109,4 @@ KRB5_KDB5_1.0 { xdr_kdb_incr_update_t; krb5_dbe_sort_key_data; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/krad/version.map b/krb5/lib/krad/version.map index 7e058d9bd494..a18fa4665e50 100644 --- a/krb5/lib/krad/version.map +++ b/krb5/lib/krad/version.map @@ -1,4 +1,4 @@ -KRB5_KRAD_1.0 { +krad_0_MIT { global: krad_code_name2num; krad_code_num2name; @@ -24,3 +24,4 @@ KRB5_KRAD_1.0 { krad_client_free; krad_client_send; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map index 3f37ce0dce31..daf066d47cfd 100644 --- a/krb5/lib/krb5/version.map +++ b/krb5/lib/krb5/version.map @@ -1,4 +1,4 @@ -KRB5_KRB5_1.0 { +krb5_3_MIT { global: _krb5_conf_boolean; decode_krb5_ad_kdcissued; @@ -105,6 +105,17 @@ KRB5_KRB5_1.0 { encode_krb5_ticket; encode_krb5_typed_data; encode_utf8_strings; + et_asn1_error_table; + et_k524_error_table; + et_kdb5_error_table; + et_krb5_error_table; + et_kv5m_error_table; + initialize_asn1_error_table; + initialize_k524_error_table; + initialize_kdb5_error_table; + initialize_krb5_error_table; + initialize_k5e1_error_table; + initialize_kv5m_error_table; k5_add_empty_pa_data; k5_add_pa_data_element; k5_add_pa_data_from_data; @@ -615,3 +626,4 @@ KRB5_KRB5_1.0 { krb5int_random_string; krb5int_trace; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/rpc/version.map b/krb5/lib/rpc/version.map index 4a5052b71536..95ef4715572c 100644 --- a/krb5/lib/rpc/version.map +++ b/krb5/lib/rpc/version.map @@ -1,4 +1,4 @@ -KRB5_RPC_1.0 { +gssrpc_4_MIT { global: gssrpc_auth_debug_gss; gssrpc_auth_debug_gssapi; @@ -145,3 +145,4 @@ KRB5_RPC_1.0 { gssrpc_xprt_register; gssrpc_xprt_unregister; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/plugins/audit/version.map b/krb5/plugins/audit/version.map index b6d3368df002..599442dcd8ab 100644 --- a/krb5/plugins/audit/version.map +++ b/krb5/plugins/audit/version.map @@ -1,4 +1,4 @@ -KRB5_AUDIT_1.0 { +audit_121_MIT { global: kau_j_kdc_stop; kau_j_kdc_start; @@ -8,3 +8,4 @@ KRB5_AUDIT_1.0 { kau_j_tgs_s4u2proxy; kau_j_tgs_u2u; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/plugins/k5tls/version.map b/krb5/plugins/k5tls/version.map index 802628aaaf63..d8602cb1559a 100644 --- a/krb5/plugins/k5tls/version.map +++ b/krb5/plugins/k5tls/version.map @@ -1,4 +1,5 @@ -KRB5_K5TLS_1.0 { +HIDDEN { local: __*; _rest*; _save*; *; }; +k5tls_0_MIT { global: tls_k5tls_initvt; }; diff --git a/krb5/plugins/kdb/db2/version.map b/krb5/plugins/kdb/db2/version.map index aa524e506fb8..6c7362e3e06b 100644 --- a/krb5/plugins/kdb/db2/version.map +++ b/krb5/plugins/kdb/db2/version.map @@ -1,109 +1,5 @@ -KRB5_DB2_1.0 { +HIDDEN { local: __*; _rest*; _save*; *; }; +db2_0_MIT { global: - __default_hash; - __kdb2_add_bigpage; - __kdb2_add_ovflpage; - __kdb2_addel; - __kdb2_big_delete; - __kdb2_big_insert; - __kdb2_big_keydata; - __kdb2_big_return; - __kdb2_bt_close; - __kdb2_bt_cmp; - __kdb2_bt_defcmp; - __kdb2_bt_defpfx; - __kdb2_bt_deleaf; - __kdb2_bt_delete; - __kdb2_bt_dmpage; - __kdb2_bt_dnpage; - __kdb2_bt_dpage; - __kdb2_bt_dump; - __kdb2_bt_fd; - __kdb2_bt_free; - __kdb2_bt_get; - __kdb2_bt_new; - __kdb2_bt_open; - __kdb2_bt_pgin; - __kdb2_bt_pgout; - __kdb2_bt_put; - __kdb2_bt_relink; - __kdb2_bt_ret; - __kdb2_bt_search; - __kdb2_bt_seq; - __kdb2_bt_setcur; - __kdb2_bt_split; - __kdb2_bt_stat; - __kdb2_bt_sync; - __kdb2_call_hash; - __kdb2_cursor_creat; - __kdb2_dbpanic; - __kdb2_delete_page; - __kdb2_delpair; - __kdb2_expand_table; - __kdb2_find_bigpair; - __kdb2_free_ovflpage; - __kdb2_get_bigkey; - __kdb2_get_item; - __kdb2_get_item_done; - __kdb2_get_item_first; - __kdb2_get_item_next; - __kdb2_get_item_reset; - __kdb2_get_page; - __kdb2_hash_open; - __kdb2_ibitmap; - __kdb2_log2; - __kdb2_new_page; - __kdb2_ovfl_delete; - __kdb2_ovfl_get; - __kdb2_ovfl_put; - __kdb2_pgin_routine; - __kdb2_pgout_routine; - __kdb2_put_page; - __kdb2_rec_close; - __kdb2_rec_delete; - __kdb2_rec_dleaf; - __kdb2_rec_fd; - __kdb2_rec_fmap; - __kdb2_rec_fpipe; - __kdb2_rec_get; - __kdb2_rec_iput; - __kdb2_rec_open; - __kdb2_rec_put; - __kdb2_rec_ret; - __kdb2_rec_search; - __kdb2_rec_seq; - __kdb2_rec_sync; - __kdb2_rec_vmap; - __kdb2_rec_vpipe; - __kdb2_split_page; - kdb2_dbm_clearerr; - kdb2_dbm_close; - kdb2_dbm_delete; - kdb2_dbm_dirfno; - kdb2_dbm_error; - kdb2_dbm_fetch; - kdb2_dbm_firstkey; - kdb2_dbm_nextkey; - kdb2_dbm_open; - kdb2_dbm_store; - kdb2_dbminit; - kdb2_dbopen; - kdb2_delete; - kdb2_fetch; - kdb2_firstkey; - kdb2_hcreate; - kdb2_hdestroy; - kdb2_hsearch; - kdb2_mpool_close; - kdb2_mpool_delete; - kdb2_mpool_filter; - kdb2_mpool_get; - kdb2_mpool_new; - kdb2_mpool_open; - kdb2_mpool_put; - kdb2_mpool_stat; - kdb2_mpool_sync; - kdb2_nextkey; - kdb2_store; kdb_function_table; }; diff --git a/krb5/plugins/preauth/otp/version.map b/krb5/plugins/preauth/otp/version.map index 9d2ee5ea7213..f2d914551789 100644 --- a/krb5/plugins/preauth/otp/version.map +++ b/krb5/plugins/preauth/otp/version.map @@ -1,4 +1,5 @@ -KRB5_PREAUTH_OTP { +HIDDEN { local: __*; _rest*; _save*; *; }; +otp_0_MIT { global: kdcpreauth_otp_initvt; }; diff --git a/krb5/plugins/preauth/pkinit/version.map b/krb5/plugins/preauth/pkinit/version.map index 39a9f81f83ef..c4498e8f473a 100644 --- a/krb5/plugins/preauth/pkinit/version.map +++ b/krb5/plugins/preauth/pkinit/version.map @@ -1,4 +1,5 @@ -KRB5_PREAUTH_PKINIT_1.0 { +HIDDEN { local: __*; _rest*; _save*; *; }; +pkinit_0_MIT { global: clpreauth_pkinit_initvt; kdcpreauth_pkinit_initvt; diff --git a/krb5/plugins/preauth/spake/version.map b/krb5/plugins/preauth/spake/version.map index 7763f289c80d..d29c0e05083d 100644 --- a/krb5/plugins/preauth/spake/version.map +++ b/krb5/plugins/preauth/spake/version.map @@ -1,4 +1,5 @@ -KRB5_PLUGINS_SPAKE_1.0 { +HIDDEN { local: __*; _rest*; _save*; *; }; +spake_0_MIT { global: clpreauth_spake_initvt; kdcpreauth_spake_initvt; diff --git a/krb5/plugins/preauth/test/version.map b/krb5/plugins/preauth/test/version.map index e27e14869833..d6d445ad5bf8 100644 --- a/krb5/plugins/preauth/test/version.map +++ b/krb5/plugins/preauth/test/version.map @@ -1,4 +1,5 @@ -KRB5_PREAUTH_TEST_1.0 { +HIDDEN { local: __*; _rest*; _save*; *; }; +test_0_MIT { global: clpreauth_test_initvt; kdcpreauth_test_initvt; diff --git a/krb5/util/et/version.map b/krb5/util/et/version.map index be846b139ebc..96f9fe53838c 100644 --- a/krb5/util/et/version.map +++ b/krb5/util/et/version.map @@ -1,4 +1,4 @@ -KRB5_ET_1.0 { +com_err_3_MIT { global: add_error_table; com_err; @@ -10,3 +10,4 @@ KRB5_ET_1.0 { reset_com_err_hook; set_com_err_hook; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/util/profile/version.map b/krb5/util/profile/version.map index d7fd0059983d..31960193977b 100644 --- a/krb5/util/profile/version.map +++ b/krb5/util/profile/version.map @@ -1,33 +1,74 @@ -KRB5_PROFILE_1.0 { +profile_1_MIT { global: et_prof_error_table; initialize_prof_error_table; profile_abandon; + profile_add_node; profile_add_relation; profile_clear_relation; + profile_close_file; + profile_copy; + profile_create_node; + profile_dereference_data; + profile_dereference_data_locked; + profile_file_is_writable; + profile_find_node; + profile_find_node_relation; + profile_find_node_subsection; profile_flush; + profile_flush_file_data; + profile_flush_file_data_to_buffer; + profile_flush_file_data_to_file; + profile_flush_to_buffer; + profile_flush_to_file; + profile_free_buffer; + profile_free_file; profile_free_list; + profile_free_node; profile_get_boolean; profile_get_integer; + profile_get_node_name; + profile_get_node_parent; + profile_get_node_value; profile_get_relation_names; profile_get_string; profile_get_subsection_names; + profile_get_value; profile_get_values; profile_init; profile_init_flags; profile_init_path; profile_init_vtable; + profile_is_modified; + profile_is_node_final; + profile_is_writable; profile_iterator; profile_iterator_create; profile_iterator_free; + profile_lock_global; + profile_make_node_final; + profile_make_prf_data; + profile_node_iterator; + profile_node_iterator_create; + profile_node_iterator_free; + profile_open_file; + profile_parse_file; + profile_process_directory; profile_release; profile_release_string; + profile_remove_node; + profile_rename_node; profile_rename_section; profile_ser_externalize; profile_ser_internalize; profile_ser_size; + profile_set_relation_value; + profile_unlock_global; + profile_update_file_data; + profile_update_file_data_locked; profile_update_relation; - profile_flush_to_file; - profile_flush_to_buffer; - profile_free_buffer; + profile_verify_node; + profile_write_tree_file; + profile_write_tree_to_buffer; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/util/support/version.map b/krb5/util/support/version.map index f4de213d33d9..cc48ec6a4c8e 100644 --- a/krb5/util/support/version.map +++ b/krb5/util/support/version.map @@ -1,4 +1,4 @@ -KRB5_SUPPORT_1.0 { +krb5support_0_MIT { global: k5_base64_decode; k5_base64_encode; @@ -100,3 +100,4 @@ KRB5_SUPPORT_1.0 { krb5int_utf8_mintab; krb5int_zap; }; +HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/util/verto/version.map b/krb5/util/verto/version.map index 5fc734e25d3a..ea3b7dcc13b2 100644 --- a/krb5/util/verto/version.map +++ b/krb5/util/verto/version.map @@ -1,4 +1,4 @@ -KRB5_VERTO_1.0 { +verto_0_MIT { global: verto_add_child; verto_add_idle; @@ -34,3 +34,4 @@ KRB5_VERTO_1.0 { verto_set_private; verto_set_proc_status; }; +HIDDEN { local: __*; _rest*; _save*; *; };