8 files changed, 73 insertions, 54 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*; *; };