This should be all that remains of the 1-2-2-branch merge; some
authorTom Yu <tlyu@mit.edu>
Mon, 13 Jan 2003 04:51:26 +0000 (04:51 +0000)
committerTom Yu <tlyu@mit.edu>
Mon, 13 Jan 2003 04:51:26 +0000 (04:51 +0000)
additional sanity-checking of merge needed though.

* krb5_32.def: Merge from 1-2-2-branch.

ticket: 1177
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15117 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/ChangeLog
src/lib/krb5_32.def

index ebebb7334476798704ac6fb04db3ba55c9c0a2fa..e0fb66ac31d7b710861402928cfda2f658f23226 100644 (file)
@@ -1,3 +1,7 @@
+2003-01-12  Tom Yu  <tlyu@mit.edu>
+
+       * krb5_32.def: Merge from 1-2-2-branch.
+
 2003-01-06  Sam Hartman  <hartmans@mit.edu>
 
        * krb5_32.def: Export krb5_auth_con_*_checksum_func
index 79f4cc74ae25ab67cc03ad099dfacbadaebdf0a3..0d1910960f68a1bb54eb717b0360702f10806b5e 100644 (file)
@@ -9,15 +9,86 @@
 
 ; Key:
 ;
-; gssapi    - used by GSS API (not part of krb5 API)
-; !CALLCONV - entrypoint that should have used KRB5_CALLCONV, but did not due
-;             developer error
+; PRIVATE   - Private entrypoint.  It should not be called by anything other
+;             than gssapi32.dll or krb4_32.dll.
+; GSSAPI    - Private entrypoint used by gssapi32.dll.
+; KRB4      - Private entrypoint used by krb4_32.dll.
+; KRB5_CALLCONV_WRONG - entrypoint that should have used KRB5_CALLCONV, but
+;                       did not due to developer error
 
 EXPORTS
-; Kerberos 5
+
+       krb5_425_conv_principal
+       krb5_524_conv_principal
+       krb5_address_compare
+       krb5_address_order
+       krb5_address_search                     ; KRB5_CALLCONV_WRONG
+       krb5_aname_to_localname
+       krb5_appdefault_boolean
+       krb5_appdefault_string
+       krb5_auth_con_free
+       krb5_auth_con_genaddrs
+       krb5_auth_con_getaddrs
+       krb5_auth_con_getauthenticator
+       krb5_auth_con_get_checksum_func
+       krb5_auth_con_getflags
+       krb5_auth_con_getkey
+       krb5_auth_con_getlocalseqnumber
+       krb5_auth_con_getlocalsubkey
+       krb5_auth_con_getrcache                 ; KRB5_CALLCONV_WRONG
+       krb5_auth_con_getremoteseqnumber
+       krb5_auth_con_getremotesubkey
+       krb5_auth_con_init
+       krb5_auth_con_initivector               ; DEPRECATED
+       krb5_auth_con_setaddrs                  ; KRB5_CALLCONV_WRONG
+       krb5_auth_con_set_checksum_func
+       krb5_auth_con_setflags
+       krb5_auth_con_setports
+       krb5_auth_con_setrcache
+       krb5_auth_con_setuseruserkey
        krb5_build_principal
        krb5_build_principal_ext
-       krb5_copy_addr
+       krb5_build_principal_va
+       krb5_c_block_size
+       krb5_c_checksum_length
+       krb5_c_decrypt
+       krb5_c_encrypt
+       krb5_c_encrypt_length
+       krb5_c_enctype_compare
+       krb5_c_is_coll_proof_cksum
+       krb5_c_is_keyed_cksum
+       krb5_c_keyed_checksum_types
+       krb5_c_make_checksum
+       krb5_c_make_random_key
+       krb5_c_random_make_octets
+       krb5_c_random_seed
+       krb5_c_string_to_key
+       krb5_c_valid_cksumtype
+       krb5_c_valid_enctype
+       krb5_c_verify_checksum
+       krb5_calculate_checksum
+       krb5_cc_close
+       krb5_cc_copy_creds
+       krb5_cc_default
+       krb5_cc_default_name
+       krb5_cc_destroy
+       krb5_cc_end_seq_get
+       krb5_cc_gen_new
+       krb5_cc_get_name
+       krb5_cc_get_principal
+       krb5_cc_get_type
+       krb5_cc_initialize
+       krb5_cc_next_cred
+       krb5_cc_remove_cred
+       krb5_cc_resolve
+       krb5_cc_retrieve_cred
+       krb5_cc_set_default_name
+       krb5_cc_set_flags
+       krb5_cc_start_seq_get
+       krb5_cc_store_cred
+       krb5_change_password
+       krb5_checksum_size
+       krb5_cksumtype_to_string
        krb5_copy_addresses
        krb5_copy_authdata
        krb5_copy_authenticator
@@ -28,76 +99,86 @@ EXPORTS
        krb5_copy_keyblock_contents
        krb5_copy_principal
        krb5_copy_ticket
-       krb5_decrypt_tkt_part
-       krb5_free_address
+       krb5_decode_ticket
+       krb5_decrypt
+       krb5_deltat_to_string
+       krb5_eblock_enctype
+       krb5_encrypt
+       krb5_encrypt_size
+       krb5_enctype_to_string
+       krb5_finish_key
+       krb5_finish_random_key
        krb5_free_addresses
-       krb5_free_ap_rep
        krb5_free_ap_rep_enc_part
-       krb5_free_ap_req
        krb5_free_authdata
        krb5_free_authenticator
-       krb5_free_authenticator_contents
        krb5_free_checksum
+       krb5_free_checksum_contents
+       krb5_free_cksumtypes
        krb5_free_config_files
        krb5_free_context
-       krb5_free_cred
        krb5_free_cred_contents
-       krb5_free_cred_enc_part
        krb5_free_creds
        krb5_free_data
        krb5_free_data_contents
-       krb5_free_enc_kdc_rep_part
-       krb5_free_enc_tkt_part
+       krb5_free_default_realm
        krb5_free_error
        krb5_free_host_realm
-       krb5_free_kdc_rep
-       krb5_free_kdc_req
        krb5_free_keyblock
        krb5_free_keyblock_contents
-       krb5_free_last_req
-       krb5_free_pa_data
+       krb5_free_keytab_entry_contents
        krb5_free_principal
-       krb5_free_priv
-       krb5_free_priv_enc_part
-       krb5_free_pwd_data
-       krb5_free_pwd_sequences
-       krb5_free_safe
        krb5_free_tgt_creds
        krb5_free_ticket
-       krb5_free_tickets
-       krb5_free_tkt_authent
-       krb5_free_checksum_contents
-       krb5_free_cksumtypes
+       krb5_free_unparsed_name
        krb5_fwd_tgt_creds
        krb5_get_credentials
        krb5_get_credentials_renew
        krb5_get_credentials_validate
        krb5_get_default_config_files
        krb5_get_default_realm
-       krb5_set_default_tgs_enctypes
        krb5_get_host_realm
-       krb5_get_realm_domain
-       krb5_get_in_tkt
-       krb5_get_in_tkt_with_keytab
-       krb5_get_in_tkt_with_password
-       krb5_get_in_tkt_with_skey
+       krb5_get_in_tkt                         ; DEPRECATED
+       krb5_get_in_tkt_with_keytab             ; DEPRECATED
+       krb5_get_in_tkt_with_password           ; DEPRECATED
+       krb5_get_in_tkt_with_skey               ; DEPRECATED
+       krb5_get_init_creds_keytab
        krb5_get_init_creds_opt_init
-       krb5_get_init_creds_opt_set_tkt_life
-       krb5_get_init_creds_opt_set_renew_life
-       krb5_get_init_creds_opt_set_forwardable
-       krb5_get_init_creds_opt_set_proxiable
-       krb5_get_init_creds_opt_set_etype_list
        krb5_get_init_creds_opt_set_address_list
+       krb5_get_init_creds_opt_set_etype_list
+       krb5_get_init_creds_opt_set_forwardable
        krb5_get_init_creds_opt_set_preauth_list
+       krb5_get_init_creds_opt_set_proxiable
+       krb5_get_init_creds_opt_set_renew_life
        krb5_get_init_creds_opt_set_salt
+       krb5_get_init_creds_opt_set_tkt_life
        krb5_get_init_creds_password
-       krb5_get_init_creds_keytab
-       krb5_get_init_creds_opt_init
-       krb5_get_validated_creds
+       krb5_get_prompt_types
        krb5_get_renewed_creds
-       krb5_get_notification_message
+       krb5_get_server_rcache
+       krb5_get_time_offsets
+       krb5_get_validated_creds
        krb5_init_context
+       krb5_init_keyblock
+       krb5_init_random_key
+       krb5_init_secure_context
+       krb5_kt_add_entry
+       krb5_kt_close
+       krb5_kt_default
+       krb5_kt_default_name
+       krb5_kt_end_seq_get
+       krb5_kt_get_entry
+       krb5_kt_get_name
+       krb5_kt_get_type
+       krb5_kt_next_entry
+       krb5_kt_read_service_key
+       krb5_kt_remove_entry
+       krb5_kt_resolve
+       krb5_kt_start_seq_get
+       krb5_kuserok
+       krb5_mk_1cred
        krb5_mk_error
+       krb5_mk_ncred
        krb5_mk_priv
        krb5_mk_rep
        krb5_mk_req
@@ -106,8 +187,9 @@ EXPORTS
        krb5_os_localaddr
        krb5_parse_name
        krb5_principal_compare
+       krb5_process_key
        krb5_prompter_posix
-       krb5_get_prompt_types
+       krb5_random_key
        krb5_rd_cred
        krb5_rd_error
        krb5_rd_priv
@@ -115,164 +197,67 @@ EXPORTS
        krb5_rd_req
        krb5_rd_safe
        krb5_read_password
+       krb5_realm_compare
        krb5_recvauth
+       krb5_recvauth_version
+       krb5_salttype_to_string
        krb5_sendauth
+       krb5_set_default_realm
+       krb5_set_default_tgs_enctypes
+       krb5_set_principal_realm
        krb5_sname_to_principal
-       krb5_timeofday
-       krb5_unparse_name
-       krb5_unparse_name_ext
-       krb5_free_unparsed_name
-       krb5_us_timeofday
-       krb5_get_server_rcache
-;
-       krb5_use_enctype
-       krb5_checksum_size
-       krb5_encrypt_size
-       krb5_calculate_checksum
-       krb5_verify_checksum
-       krb5_eblock_enctype
-;
-       krb5_decrypt
-       krb5_encrypt
-       krb5_string_to_key
-       krb5_process_key
-       krb5_finish_key
-       krb5_init_random_key
-       krb5_finish_random_key
-       krb5_random_key
-;
-       krb5_c_decrypt
-       krb5_c_encrypt
-       krb5_c_encrypt_length
-       krb5_c_checksum_length
-       krb5_c_block_size
-       krb5_c_make_checksum
-       krb5_c_verify_checksum
-       krb5_c_random_make_octets
-       krb5_c_keyed_checksum_types
-;
-       krb5_425_conv_principal
-       krb5_524_conv_principal
-;
-       krb5_cksumtype_to_string
-       krb5_deltat_to_string
-       krb5_enctype_to_string
-       krb5_salttype_to_string
        krb5_string_to_cksumtype
        krb5_string_to_deltat
        krb5_string_to_enctype
+       krb5_string_to_key
        krb5_string_to_salttype
        krb5_string_to_timestamp
+       krb5_timeofday
        krb5_timestamp_to_sfstring
        krb5_timestamp_to_string
-;
-       krb5_auth_con_free
-       krb5_auth_con_genaddrs
-       krb5_auth_con_getflags
-       krb5_auth_con_getkey
-       krb5_auth_con_getlocalsubkey
-       krb5_auth_con_getremotesubkey
-       krb5_auth_con_init
-       krb5_auth_con_setaddrs          ; !CALLCONV
-       krb5_auth_con_setflags
-       krb5_auth_con_getlocalseqnumber
-       krb5_auth_con_getremoteseqnumber
-       krb5_auth_con_setuseruserkey
-       krb5_auth_con_getauthenticator
-       krb5_auth_con_set_req_cksumtype
-       krb5_auth_con_setrcache
-krb5_auth_con_set_checksum_func
-krb5_auth_con_get_checksum_func
-;
-       krb5_cc_default
-       krb5_cc_default_name
-       krb5_cc_register
-       krb5_cc_resolve
-       krb5_cc_set_default_name
-;
-       krb5_kt_default
-       krb5_kt_register
-       krb5_kt_resolve
-       krb5_kt_add_entry
-       krb5_kt_free_entry
-       krb5_kt_read_service_key
-       krb5_kt_remove_entry
+       krb5_unparse_name
+       krb5_unparse_name_ext
+       krb5_us_timeofday
+       krb5_use_enctype
+       krb5_verify_checksum
+       krb5_verify_init_creds
+       krb5_verify_init_creds_opt_init
+       krb5_verify_init_creds_opt_set_ap_req_nofail
 
-;Kadm routines
-;      krb5_adm_connect
-;      krb5_adm_disconnect
-;      krb5_free_adm_data
-;      krb5_read_adm_reply
-;      krb5_send_adm_cmd
+       krb5int_accessor        ; INTERNAL (to end all internals)
+
+; To Add (exported on Mac OS X):
+;      krb5_get_profile
 
-       krb5_change_password
-;
-       krb5_write_message
-       krb5_read_message
-       krb5_net_write
-       krb5_net_read
-       krb5_encrypt
-       krb5_decrypt
-       krb5_encrypt_size
-;
-; Added for Kermit 95
-       krb5_address_search     ; !CALLCONV
-       krb5_auth_con_getrcache ; !CALLCONV
-       krb5_c_enctype_compare
-;
-       krb5_kuserok
-;
-; Added for 1.2:
-       krb5_decode_ticket
-        krb5_appdefault_string
-        krb5_appdefault_boolean
-;
 ; Temporary exports (DO NOT USE)
-       des_ecb_encrypt
-       des_new_random_key
-       des_key_sched
-       des_pcbc_encrypt
-       des_quad_cksum
-       des_string_to_key
-       des_init_random_number_generator
-       krb5_random_confounder
-       krb5_size_opaque        ; gssapi
-       krb5_internalize_opaque ; gssapi
-       krb5_externalize_opaque ; gssapi
-       krb5_ser_pack_int32     ; gssapi
-       krb5_ser_unpack_int32   ; gssapi
-       krb5_ser_pack_bytes     ; gssapi
-       krb5_ser_unpack_bytes   ; gssapi
-       krb5_ser_auth_context_init      ; gssapi
-       krb5_ser_context_init   ; gssapi
-       krb5_ser_ccache_init    ; gssapi
-       krb5_ser_keytab_init    ; gssapi
-       krb5_ser_rcache_init    ; gssapi
-       decode_krb5_ap_req      ; gssapi
-       krb5_mcc_ops            ; gssapi
-       krb5_get_tgs_ktypes     ; gssapi
-       krb5_free_ktypes        ; gssapi
-       krb5int_cc_default      ; gssapi
-       krb5int_accessor        ; INTERNAL (to end all internals)
-       krb5_cc_get_name
-       krb5_cc_gen_new
-       krb5_cc_initialize
-       krb5_cc_destroy
-       krb5_cc_close
-       krb5_cc_store_cred
-       krb5_cc_retrieve_cred
-       krb5_cc_get_principal
-       krb5_cc_start_seq_get
-       krb5_cc_next_cred
-       krb5_cc_end_seq_get
-       krb5_cc_remove_cred
-       krb5_cc_set_flags
-       krb5_cc_get_type
-       krb5_rc_close           ; gssapi
-       krb5_kt_close
-       krb5_kt_get_entry
-       krb5_kt_get_name
-       krb5_kt_get_type
-       krb5_kt_start_seq_get
-       krb5_kt_next_entry
-       krb5_kt_end_seq_get
+
+; DO NOT USE -- Currently required for krb4_32.dll
+       des_ecb_encrypt                         ; PRIVATE KRB4
+       des_new_random_key                      ; PRIVATE KRB4
+       des_key_sched                           ; PRIVATE KRB4
+       des_pcbc_encrypt                        ; PRIVATE KRB4
+       des_quad_cksum                          ; PRIVATE KRB4
+       des_string_to_key                       ; PRIVATE KRB4
+       des_init_random_number_generator        ; PRIVATE KRB4
+
+; DO NOT USE -- Currently required to implement gssapi32.dll
+       decode_krb5_ap_req                      ; PRIVATE GSSAPI k5-int.h KRB5_CALLCONV_WRONG
+       krb5_externalize_opaque                 ; PRIVATE GSSAPI k5-int.h
+       krb5_internalize_opaque                 ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_auth_context_init              ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_ccache_init                    ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_context_init                   ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_keytab_init                    ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_pack_bytes                     ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_pack_int32                     ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_rcache_init                    ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_unpack_bytes                   ; PRIVATE GSSAPI k5-int.h
+       krb5_ser_unpack_int32                   ; PRIVATE GSSAPI k5-int.h
+       krb5_size_opaque                        ; PRIVATE GSSAPI k5-int.h
+       krb5int_cc_default                      ; PRIVATE GSSAPI k5-int.h
+
+       krb5_free_ap_req                        ; PRIVATE GSSAPI krb5.hin
+       krb5_free_ktypes                        ; PRIVATE GSSAPI krb5.hin
+       krb5_get_tgs_ktypes                     ; PRIVATE GSSAPI krb5.hin
+       krb5_auth_con_set_req_cksumtype         ; PRIVATE GSSAPI krb5.hin
+       krb5_kt_free_entry                      ; PRIVATE GSSAPI krb5.hin