From e544eaa09354773e246d7fe1b223ddac2bd06c08 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Wed, 12 May 2010 20:49:11 +0000 Subject: Reimplement krb5_get_in_tkt_with_skey in terms of krb5_get_init_creds, similar to how the password and keytab equivalents were done. Eliminate krb5_get_in_tkt. It's been very hard to use since we made krb5_kdc_rep_decrypt_proc private (in krb5 1.7 the prototype was taken out of krb5.h altogether), and it's unlikely that anything would have used it directly in the first place. Remove and/or simplify a lot of code depended on by krb_get_in_tkt, including all of preauth.c. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24012 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/k5-int.h | 17 ----------------- src/include/krb5/krb5.hin | 11 ----------- 2 files changed, 28 deletions(-) (limited to 'src/include') diff --git a/src/include/k5-int.h b/src/include/k5-int.h index fc39acdc7..184549ce0 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1082,23 +1082,6 @@ typedef struct _krb5_preauth_ops { krb5_preauth_process_proc process; } krb5_preauth_ops; -krb5_error_code -krb5_obtain_padata(krb5_context, krb5_pa_data **, - krb5_error_code (*)(krb5_context, const krb5_enctype, - krb5_data *, krb5_const_pointer, - krb5_keyblock **), - krb5_const_pointer, krb5_creds *, krb5_kdc_req *); - -krb5_error_code -krb5_process_padata(krb5_context, krb5_kdc_req *, krb5_kdc_rep *, - krb5_error_code (*)(krb5_context, const krb5_enctype, - krb5_data *, krb5_const_pointer, - krb5_keyblock **), - krb5_const_pointer, - krb5_error_code (*)(krb5_context, const krb5_keyblock *, - krb5_const_pointer, krb5_kdc_rep *), - krb5_keyblock **, krb5_creds *, krb5_int32 *); - krb5_pa_data * krb5int_find_pa_data(krb5_context, krb5_pa_data *const *, krb5_preauthtype); /* Does not return a copy; original padata sequence responsible for freeing*/ diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index 1c89f9e92..18097f236 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -1949,17 +1949,6 @@ krb5_error_code KRB5_CALLCONV krb5_get_profile(krb5_context, struct _profile_t * /* profile_t */ *); #if KRB5_DEPRECATED -KRB5_ATTR_DEPRECATED krb5_error_code KRB5_CALLCONV -krb5_get_in_tkt(krb5_context, krb5_flags, krb5_address *const *, - krb5_enctype *, krb5_preauthtype *, - krb5_error_code (*)(krb5_context, krb5_enctype, krb5_data *, - krb5_const_pointer, krb5_keyblock **), - krb5_const_pointer, - krb5_error_code (*)(krb5_context, const krb5_keyblock *, - krb5_const_pointer, krb5_kdc_rep * ), - krb5_const_pointer, krb5_creds *, krb5_ccache, - krb5_kdc_rep **); - KRB5_ATTR_DEPRECATED krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_password(krb5_context, krb5_flags, krb5_address *const *, krb5_enctype *, krb5_preauthtype *, const char *, -- cgit