* krb5.hin: Move a whole bunch of stuff under KRB5_DEPRECATED or

	KRB5_PRIVATE as a first pass for cleaning up the API.

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

2 files changed, 86 insertions, 9 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 31b99b289d..e23ea4c580 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-01  Tom Yu  <tlyu@mit.edu>
+
+	* krb5.hin: Move a whole bunch of stuff under KRB5_DEPRECATED or
+	KRB5_PRIVATE as a first pass for cleaning up the API.
+
 2002-03-28  Sam Hartman  <hartmans@mit.edu>
 
 	* krb5.hin: krb5_init_keyblock new function.
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 743fdfc616..f792f94501 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -513,7 +513,7 @@ krb5_error_code KRB5_CALLCONV
 #define KRB5_KEYUSAGE_GSS_TOK_WRAP_INTEG	23
 #define KRB5_KEYUSAGE_GSS_TOK_WRAP_PRIV		24
 
-
+#if KRB5_PRIVATE
 krb5_boolean KRB5_CALLCONV valid_enctype
 	(krb5_enctype ktype);
 krb5_boolean KRB5_CALLCONV valid_cksumtype
@@ -522,6 +522,7 @@ krb5_boolean KRB5_CALLCONV is_coll_proof_cksum
 	(krb5_cksumtype ctype);
 krb5_boolean KRB5_CALLCONV is_keyed_cksum
 	(krb5_cksumtype ctype);
+#endif
 
 #ifdef KRB5_OLD_CRYPTO
 /*
@@ -595,6 +596,7 @@ krb5_error_code KRB5_CALLCONV krb5_verify_checksum
 		const krb5_pointer in, const size_t in_length,
 		const krb5_pointer seed, const size_t seed_length);
 
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_random_confounder
 	(size_t, krb5_pointer);
 
@@ -607,6 +609,7 @@ krb5_error_code krb5_decrypt_data
 	(krb5_context context, krb5_keyblock *key, 
 		krb5_pointer ivec, krb5_enc_data *data, 
 		krb5_data *enc_data);
+#endif
 
 #endif /* KRB5_OLD_CRYPTO */
 
@@ -1204,6 +1207,7 @@ typedef struct _krb5_donot_replay {
     krb5_timestamp ctime;
 } krb5_donot_replay;
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_rc_default 
 	(krb5_context,
 		krb5_rcache *);
@@ -1244,7 +1248,7 @@ char *KRB5_CALLCONV krb5_rc_get_name
 	(krb5_context, krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_resolve
 	(krb5_context, krb5_rcache, char *);
-
+#endif /* KRB5_PRIVATE */
 /*
  * end "rcache.h"
  */
@@ -1311,6 +1315,7 @@ krb5_error_code KRB5_CALLCONV krb5_init_secure_context
 void KRB5_CALLCONV krb5_free_context
 	(krb5_context);
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_set_default_in_tkt_ktypes
 	(krb5_context,
 		const krb5_enctype *);
@@ -1321,10 +1326,13 @@ krb5_error_code krb5_get_default_in_tkt_ktypes
 krb5_error_code krb5_set_default_tgs_ktypes
 	(krb5_context,
 		const krb5_enctype *);
+#endif
+
 krb5_error_code KRB5_CALLCONV 
 krb5_set_default_tgs_enctypes
 	(krb5_context,
 		const krb5_enctype *);
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_get_tgs_ktypes
 	(krb5_context,
 		krb5_const_principal,
@@ -1337,8 +1345,10 @@ void KRB5_CALLCONV krb5_free_ktypes
 
 krb5_boolean krb5_is_permitted_enctype
 	(krb5_context, krb5_enctype);
+#endif
 
 /* libkrb.spec */
+#if KRB5_PRIVATE
 krb5_error_code krb5_kdc_rep_decrypt_proc
 	(krb5_context,
 		const krb5_keyblock *,
@@ -1369,6 +1379,8 @@ krb5_error_code krb5_get_cred_from_kdc_renew
 		krb5_creds *,
 		krb5_creds **,
 		krb5_creds *** );
+#endif
+
 void KRB5_CALLCONV krb5_free_tgt_creds
 	(krb5_context,
 	 krb5_creds **); /* XXX too hard to do with const */
@@ -1394,6 +1406,7 @@ krb5_error_code KRB5_CALLCONV krb5_get_credentials_renew
 		krb5_ccache,
 		krb5_creds *,
 		krb5_creds **);
+#if KRB5_PRIVATE
 krb5_error_code krb5_get_cred_via_tkt
 	(krb5_context,
 		   krb5_creds *,
@@ -1401,6 +1414,7 @@ krb5_error_code krb5_get_cred_via_tkt
 		   krb5_address * const *,
 		   krb5_creds *,
 		   krb5_creds **);
+#endif
 krb5_error_code KRB5_CALLCONV krb5_mk_req
 	(krb5_context,
 		krb5_auth_context *,
@@ -1512,10 +1526,12 @@ krb5_error_code KRB5_CALLCONV krb5_copy_principal
 	(krb5_context,
 		krb5_const_principal,
 		krb5_principal *);
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_copy_addr
 	(krb5_context,
 		const krb5_address *,
 		krb5_address **);
+#endif
 krb5_error_code KRB5_CALLCONV krb5_copy_addresses
 	(krb5_context,
 		krb5_address * const *,
@@ -1536,6 +1552,7 @@ krb5_error_code KRB5_CALLCONV krb5_copy_checksum
 	(krb5_context,
 		const krb5_checksum *,
 		krb5_checksum **);
+#if KRB5_PRIVATE
 void krb5_init_ets
 	(krb5_context);
 void krb5_free_ets
@@ -1546,6 +1563,7 @@ krb5_error_code krb5_generate_subkey
 krb5_error_code krb5_generate_seq_number
 	(krb5_context,
 		const krb5_keyblock *, krb5_int32 *);
+#endif
 krb5_error_code KRB5_CALLCONV krb5_get_server_rcache
 	(krb5_context,
 		const krb5_data *, krb5_rcache *);
@@ -1570,6 +1588,7 @@ krb5_error_code KRB5_CALLCONV krb5_524_conv_principal
 	(krb5_context context, const krb5_principal princ, 
 		char *name, char *inst, char *realm);
 
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_mk_chpw_req
 	(krb5_context context, krb5_auth_context auth_context,
  			krb5_data *ap_req, char *passwd, krb5_data *packet);
@@ -1580,11 +1599,15 @@ krb5_error_code KRB5_CALLCONV krb5_rd_chpw_rep
 krb5_error_code KRB5_CALLCONV krb5_chpw_result_code_string
 	(krb5_context context, int result_code,
 			char **result_codestr);
+#endif
 
 /* libkt.spec */
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_kt_register
 	(krb5_context,
 		struct _krb5_kt_ops * );
+#endif
+
 krb5_error_code KRB5_CALLCONV krb5_kt_resolve
 	(krb5_context,
 		const char *,
@@ -1609,13 +1632,14 @@ krb5_error_code KRB5_CALLCONV krb5_kt_add_entry
 	(krb5_context,
 		krb5_keytab,
 		krb5_keytab_entry * );
+#if KRB5_PRIVATE
 krb5_error_code krb5_principal2salt
 	(krb5_context,
 		krb5_const_principal, krb5_data *);
 krb5_error_code krb5_principal2salt_norealm
 	(krb5_context,
 		krb5_const_principal, krb5_data *);
-
+#endif
 /* librc.spec--see rcache.h */
 
 /* libcc.spec */
@@ -1630,8 +1654,10 @@ krb5_error_code KRB5_CALLCONV krb5_cc_set_default_name
 krb5_error_code KRB5_CALLCONV krb5_cc_default
 	(krb5_context,
 		krb5_ccache *);
+#if KRB5_PRIVATE
 unsigned int KRB5_CALLCONV krb5_get_notification_message
 	(void);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_cc_copy_creds
 	(krb5_context context,
@@ -1640,32 +1666,43 @@ krb5_error_code KRB5_CALLCONV krb5_cc_copy_creds
 
 
 /* chk_trans.c */
+#if KRB5_PRIVATE
 krb5_error_code krb5_check_transited_list
 	(krb5_context, const krb5_data *trans,
 	 const krb5_data *realm1, const krb5_data *realm2);
+#endif
 
 /* free_rtree.c */
+#if KRB5_PRIVATE
 void krb5_free_realm_tree
 	(krb5_context,
 		krb5_principal *);
+#endif
 
 /* krb5_free.c */
 void KRB5_CALLCONV krb5_free_principal
 	(krb5_context, krb5_principal );
 void KRB5_CALLCONV krb5_free_authenticator
 	(krb5_context, krb5_authenticator * );
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_authenticator_contents
 	(krb5_context, krb5_authenticator * );
+#endif
 void KRB5_CALLCONV krb5_free_addresses
 	(krb5_context, krb5_address ** );
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_address
 	(krb5_context, krb5_address * );
+#endif
 void KRB5_CALLCONV krb5_free_authdata
 	(krb5_context, krb5_authdata ** );
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_enc_tkt_part
 	(krb5_context, krb5_enc_tkt_part * );
+#endif
 void KRB5_CALLCONV krb5_free_ticket
 	(krb5_context, krb5_ticket * );
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_tickets
 	(krb5_context, krb5_ticket ** );
 void KRB5_CALLCONV krb5_free_kdc_req
@@ -1676,20 +1713,25 @@ void KRB5_CALLCONV krb5_free_last_req
 	(krb5_context, krb5_last_req_entry ** );
 void KRB5_CALLCONV krb5_free_enc_kdc_rep_part
 	(krb5_context, krb5_enc_kdc_rep_part * );
+#endif
 void KRB5_CALLCONV krb5_free_error
 	(krb5_context, krb5_error * );
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_ap_req
 	(krb5_context, krb5_ap_req * );
 void KRB5_CALLCONV krb5_free_ap_rep
 	(krb5_context, krb5_ap_rep * );
 void KRB5_CALLCONV krb5_free_cred
 	(krb5_context, krb5_cred *);
+#endif
 void KRB5_CALLCONV krb5_free_creds
 	(krb5_context, krb5_creds *);
 void KRB5_CALLCONV krb5_free_cred_contents
 	(krb5_context, krb5_creds *);
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_cred_enc_part
 	(krb5_context, krb5_cred_enc_part *);
+#endif
 void KRB5_CALLCONV krb5_free_checksum
 	(krb5_context, krb5_checksum *);
 void KRB5_CALLCONV krb5_free_checksum_contents
@@ -1698,16 +1740,20 @@ void KRB5_CALLCONV krb5_free_keyblock
 	(krb5_context, krb5_keyblock *);
 void KRB5_CALLCONV krb5_free_keyblock_contents
 	(krb5_context, krb5_keyblock *);
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_pa_data
 	(krb5_context, krb5_pa_data **);
+#endif
 void KRB5_CALLCONV krb5_free_ap_rep_enc_part
 	(krb5_context, krb5_ap_rep_enc_part *);
+#if KRB5_PRIVATE
 void KRB5_CALLCONV krb5_free_tkt_authent
 	(krb5_context, krb5_tkt_authent *);
 void KRB5_CALLCONV krb5_free_pwd_data
 	(krb5_context, krb5_pwd_data *);
 void KRB5_CALLCONV krb5_free_pwd_sequences
 	(krb5_context, passwd_phrase_element **);
+#endif
 void KRB5_CALLCONV krb5_free_data
 	(krb5_context, krb5_data *);
 void KRB5_CALLCONV krb5_free_data_contents
@@ -1750,6 +1796,7 @@ krb5_change_password
 			int *result_code, krb5_data *result_code_string,
 			krb5_data *result_string);
 
+#if KRB5_PRIVATE
 #ifndef macintosh
 krb5_error_code krb5_set_config_files
 	(krb5_context, const char **);
@@ -1761,11 +1808,13 @@ void KRB5_CALLCONV krb5_free_config_files
 	(char **filenames);
 
 #endif
+#endif
 
 krb5_error_code KRB5_CALLCONV
 krb5_get_profile
 	(krb5_context, profile_t *);
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_send_tgs
 	(krb5_context,
 		const krb5_flags,
@@ -1778,7 +1827,9 @@ krb5_error_code krb5_send_tgs
 		const krb5_data *,
 		krb5_creds *,
 		krb5_response * );
+#endif
 
+#if KRB5_DEPRECATED
 krb5_error_code KRB5_CALLCONV krb5_get_in_tkt
 	(krb5_context,
 		const krb5_flags,
@@ -1832,13 +1883,15 @@ krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_keytab
 		krb5_ccache,
 		krb5_creds *,
 		krb5_kdc_rep ** );
+#endif /* KRB5_DEPRECATED */
 
-
+#if KRB5_PRIVATE
 krb5_error_code krb5_decode_kdc_rep
 	(krb5_context,
 		krb5_data *,
 		const krb5_keyblock *,
 		krb5_kdc_rep ** );
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_rd_req
 	(krb5_context,
@@ -1849,6 +1902,7 @@ krb5_error_code KRB5_CALLCONV krb5_rd_req
 		krb5_flags *,
 		krb5_ticket **);
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_rd_req_decoded
 	(krb5_context,
 		krb5_auth_context *,
@@ -1866,6 +1920,7 @@ krb5_error_code krb5_rd_req_decoded_anyflag
 		krb5_keytab,
 		krb5_flags *,
 		krb5_ticket **);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_kt_read_service_key
 	(krb5_context,
@@ -1886,10 +1941,12 @@ krb5_error_code KRB5_CALLCONV krb5_mk_priv
 		const krb5_data *,
 		krb5_data *,
 		krb5_replay_data *);
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_cc_register
 	(krb5_context,
 		krb5_cc_ops *,
 		krb5_boolean );
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_sendauth 
 	(krb5_context,
@@ -1925,12 +1982,14 @@ krb5_error_code KRB5_CALLCONV krb5_recvauth_version
 		krb5_ticket **,
 		krb5_data *);
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_walk_realm_tree
 	(krb5_context,
 		const krb5_data *,
 		const krb5_data *,
 		krb5_principal **,
 		int);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_mk_ncred
 	(krb5_context,
@@ -2014,6 +2073,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalsubkey
 		krb5_auth_context,
 		krb5_keyblock **);
 
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_auth_con_set_req_cksumtype
 	(krb5_context,
 		krb5_auth_context,
@@ -2023,11 +2083,7 @@ krb5_error_code krb5_auth_con_set_safe_cksumtype
 	(krb5_context,
 		krb5_auth_context,
 		krb5_cksumtype);
-
-krb5_error_code krb5_auth_con_getcksumtype
-	(krb5_context,
-		krb5_auth_context,
-		krb5_cksumtype *);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalseqnumber
 	(krb5_context,
@@ -2039,10 +2095,13 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getremoteseqnumber
 		krb5_auth_context,
 		krb5_int32 *);
 
+#if KRB5_DEPRECATED
 krb5_error_code krb5_auth_con_initivector
 	(krb5_context,
 		krb5_auth_context);
+#endif
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_auth_con_setivector
 	(krb5_context,
 		krb5_auth_context,
@@ -2052,6 +2111,7 @@ krb5_error_code krb5_auth_con_getivector
 	(krb5_context,
 		krb5_auth_context,
 		krb5_pointer *);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_auth_con_setrcache
 	(krb5_context,
@@ -2063,6 +2123,7 @@ krb5_error_code krb5_auth_con_getrcache
 		krb5_auth_context,
 		krb5_rcache *);
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_auth_con_setpermetypes
 	(krb5_context,
 	    krb5_auth_context,
@@ -2072,6 +2133,7 @@ krb5_error_code krb5_auth_con_getpermetypes
 	(krb5_context,
 	    krb5_auth_context,
 	    krb5_enctype **);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_auth_con_getauthenticator
 	(krb5_context,
@@ -2093,10 +2155,12 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getremotesubkey
  * begin stuff from libos.h
  */
 
+#if KRB5_PRIVATE
 krb5_error_code krb5_read_message (krb5_context, krb5_pointer, krb5_data *);
 krb5_error_code krb5_write_message (krb5_context, krb5_pointer, krb5_data *);
 int krb5_net_read (krb5_context, int , char *, int);
 int krb5_net_write (krb5_context, int , const char *, int);
+#endif
 
 krb5_error_code KRB5_CALLCONV krb5_read_password
 	(krb5_context,
@@ -2109,6 +2173,7 @@ krb5_error_code krb5_aname_to_localname
 		krb5_const_principal,
 		const int,
 		char * );
+#if KRB5_PRIVATE
 krb5_error_code KRB5_CALLCONV krb5_get_host_realm
 	(krb5_context,
 		const char *,
@@ -2120,6 +2185,7 @@ krb5_error_code KRB5_CALLCONV krb5_get_realm_domain
 	(krb5_context,
 		const char *,
 		char ** );
+#endif
 krb5_boolean KRB5_CALLCONV krb5_kuserok
 	(krb5_context,
 		krb5_principal, const char *);
@@ -2127,6 +2193,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_genaddrs
 	(krb5_context,
 		krb5_auth_context,
 		int, int);
+#if KRB5_PRIVATE
 krb5_error_code krb5_gen_portaddr
 	(krb5_context,
 		const krb5_address *,
@@ -2149,10 +2216,13 @@ krb5_error_code krb5_set_debugging_time
 	(krb5_context, krb5_int32, krb5_int32);
 krb5_error_code krb5_use_natural_time
 	(krb5_context);
+#endif
 krb5_error_code krb5_get_time_offsets
 	(krb5_context, krb5_int32 *, krb5_int32 *);
+#if KRB5_PRIVATE
 krb5_error_code krb5_set_time_offsets
 	(krb5_context, krb5_int32, krb5_int32);
+#endif
 
 /* str_conv.c */
 krb5_error_code KRB5_CALLCONV krb5_string_to_enctype
@@ -2366,6 +2436,7 @@ krb5_appdefault_boolean
 		int default_value,
 		int *ret_value);
 
+#if KRB5_PRIVATE
 /*
  * The realm iterator functions
  */
@@ -2381,6 +2452,7 @@ void KRB5_CALLCONV krb5_realm_iterator_free
 
 void KRB5_CALLCONV krb5_free_realm_string
 	(krb5_context context, char *str);
+#endif
 
 /*
  * Prompter enhancements