diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-10-25 18:30:14 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-10-25 18:30:14 +0000 |
| commit | cf14be326bc26256dd88222100744e18ef139040 (patch) | |
| tree | c1615675171eb1d515bff9d52c85d49f2150c822 /src/lib | |
| parent | 7fc21c4a4a6ef8a88567f166eda1fe73784686c7 (diff) | |
| download | krb5-cf14be326bc26256dd88222100744e18ef139040.tar.gz krb5-cf14be326bc26256dd88222100744e18ef139040.tar.xz krb5-cf14be326bc26256dd88222100744e18ef139040.zip | |
Make krb5_find_authdata public
Rename krb5int_find_authdata to krb5_find_authdata and make it public.
ticket: 6992
target_version: 1.10
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25414 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/authdata.c | 23 | ||||
| -rw-r--r-- | src/lib/krb5/krb/authdata_dec.c | 10 | ||||
| -rw-r--r-- | src/lib/krb5/krb/t_authdata.c | 9 | ||||
| -rw-r--r-- | src/lib/krb5/libkrb5.exports | 2 | ||||
| -rw-r--r-- | src/lib/krb5_32.def | 1 |
5 files changed, 19 insertions, 26 deletions
diff --git a/src/lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c index 414e8bcac..546fb82dc 100644 --- a/src/lib/krb5/krb/authdata.c +++ b/src/lib/krb5/krb/authdata.c @@ -514,11 +514,8 @@ k5_get_kdc_issued_authdata(krb5_context kcontext, ticket_authdata = ap_req->ticket->enc_part2->authorization_data; - code = krb5int_find_authdata(kcontext, - ticket_authdata, - NULL, - KRB5_AUTHDATA_KDC_ISSUED, - &authdata); + code = krb5_find_authdata(kcontext, ticket_authdata, NULL, + KRB5_AUTHDATA_KDC_ISSUED, &authdata); if (code != 0 || authdata == NULL) return code; @@ -573,11 +570,8 @@ krb5int_authdata_verify(krb5_context kcontext, if (kdc_issued_authdata != NULL && (module->flags & AD_USAGE_KDC_ISSUED)) { - code = krb5int_find_authdata(kcontext, - kdc_issued_authdata, - NULL, - module->ad_type, - &authdata); + code = krb5_find_authdata(kcontext, kdc_issued_authdata, NULL, + module->ad_type, &authdata); if (code != 0) break; @@ -599,11 +593,10 @@ krb5int_authdata_verify(krb5_context kcontext, if (module->flags & AD_USAGE_AP_REQ) authen_usage = TRUE; - code = krb5int_find_authdata(kcontext, - ticket_usage ? ticket_authdata : NULL, - authen_usage ? authen_authdata : NULL, - module->ad_type, - &authdata); + code = krb5_find_authdata(kcontext, + ticket_usage ? ticket_authdata : NULL, + authen_usage ? authen_authdata : NULL, + module->ad_type, &authdata); if (code != 0) break; } diff --git a/src/lib/krb5/krb/authdata_dec.c b/src/lib/krb5/krb/authdata_dec.c index 9809b3376..8e95b2a91 100644 --- a/src/lib/krb5/krb/authdata_dec.c +++ b/src/lib/krb5/krb/authdata_dec.c @@ -154,11 +154,11 @@ find_authdata_1(krb5_context context, krb5_authdata *const *in_authdat, return retval; } -krb5_error_code -krb5int_find_authdata(krb5_context context, - krb5_authdata *const *ticket_authdata, - krb5_authdata *const *ap_req_authdata, - krb5_authdatatype ad_type, krb5_authdata ***results) +krb5_error_code KRB5_CALLCONV +krb5_find_authdata(krb5_context context, + krb5_authdata *const *ticket_authdata, + krb5_authdata *const *ap_req_authdata, + krb5_authdatatype ad_type, krb5_authdata ***results) { krb5_error_code retval = 0; struct find_authdata_context fctx; diff --git a/src/lib/krb5/krb/t_authdata.c b/src/lib/krb5/krb/t_authdata.c index 6e4fb21c8..dd834b9b0 100644 --- a/src/lib/krb5/krb/t_authdata.c +++ b/src/lib/krb5/krb/t_authdata.c @@ -47,9 +47,8 @@ krb5_authdata ad3= { 3, (unsigned char *) "ab" }; -/* we want three results in the return from krb5int_find_authdata so - it has to grow its list. -*/ +/* We want three results in the return from krb5_find_authdata so it has to + * grow its list. */ krb5_authdata ad4 = { KV5M_AUTHDATA, 22, @@ -94,8 +93,8 @@ main() container[0] = &ad3; container[1] = NULL; assert(krb5_encode_authdata_container( context, KRB5_AUTHDATA_IF_RELEVANT, container, &container_out) == 0); - assert(krb5int_find_authdata(context, - adseq1, container_out, 22, &results) == 0); + assert(krb5_find_authdata(context, adseq1, container_out, 22, + &results) == 0); compare_authdata(&ad1, results[0]); compare_authdata( results[1], &ad4); compare_authdata( results[2], &ad3); diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports index c9d1debf2..0afcab121 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -257,6 +257,7 @@ krb5_encrypt_tkt_part krb5_externalize_data krb5_externalize_opaque krb5_fcc_ops +krb5_find_authdata krb5_find_serializer krb5_free_ad_kdcissued krb5_free_ad_signedpath @@ -607,7 +608,6 @@ krb5int_cleanup_library krb5int_clean_hostname krb5int_cm_call_select krb5int_copy_data_contents_add0 -krb5int_find_authdata krb5int_find_pa_data krb5int_foreach_localaddr krb5int_free_data_list diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def index 208b92b8f..d7ac5c464 100644 --- a/src/lib/krb5_32.def +++ b/src/lib/krb5_32.def @@ -419,3 +419,4 @@ EXPORTS krb5_free_string @393 krb5_cc_select @394 krb5_pac_sign @395 + krb5_find_authdata @396 |
