From b14279dbb07b5be49474a935c8f0637b25307581 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Fri, 28 Apr 1995 05:52:11 +0000 Subject: [PATCH] * send_tgs.c (krb5_send_tgs()), gc_via_tkt.c (krb5_get_cred_via_tkt()): Removed krb5_cksumtype argument. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5595 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 5 +++++ src/lib/krb5/krb/gc_via_tkt.c | 4 ---- src/lib/krb5/krb/send_tgs.c | 19 ++++++++----------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 3887c43a9..dcabb9043 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 28 01:44:51 1995 Chris Provenzano (proven@mit.edu) + + * send_tgs.c (krb5_send_tgs()), gc_via_tkt.c (krb5_get_cred_via_tkt()): + Removed krb5_cksumtype argument. + Thu Apr 27 21:36:01 1995 Chris Provenzano (proven@mit.edu) * auth_con.c (krb5_auth_con_getaddrs() and krb5_auth_con_getflags()): diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c index 87a4de255..09f3d0975 100644 --- a/src/lib/krb5/krb/gc_via_tkt.c +++ b/src/lib/krb5/krb/gc_via_tkt.c @@ -96,9 +96,6 @@ cleanup: return retval; } -/* XXX This is to move to krb5_send_tgs, RSN -- CAP 950411 */ -extern krb5_cksumtype krb5_kdc_req_sumtype; - krb5_error_code INTERFACE krb5_get_cred_via_tkt (context, tkt, kdcoptions, address, in_cred, out_cred) krb5_context context; @@ -145,7 +142,6 @@ krb5_get_cred_via_tkt (context, tkt, kdcoptions, address, in_cred, out_cred) */ if (retval = krb5_send_tgs(context, kdcoptions, &in_cred->times, NULL, - krb5_kdc_req_sumtype, /* To be removed */ in_cred->server, address, in_cred->authdata, 0, /* no padata */ (kdcoptions & KDC_OPT_ENC_TKT_IN_SKEY) ? diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index e1bd76971..8a3120330 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -30,8 +30,7 @@ Sends a request to the TGS and waits for a response. options is used for the options in the KRB_TGS_REQ. timestruct values are used for from, till, rtime " " " - etype is used for etype " " ", and to encrypt the authorization data, if present - sumtype is used for the checksum in the AP_REQ in the KRB_TGS_REQ + etype is used for etype " " ", and to encrypt the authorization data, sname is used for sname " " " addrs, if non-NULL, is used for addresses " " " authorization_dat, if non-NULL, is used for authorization_dat " " " @@ -45,12 +44,12 @@ returns system errors */ +extern krb5_cksumtype krb5_kdc_req_sumtype; static krb5_error_code -krb5_send_tgs_basic(context, in_data, sumtype, in_cred, outbuf) +krb5_send_tgs_basic(context, in_data, in_cred, outbuf) krb5_context context; krb5_data * in_data; - const krb5_cksumtype sumtype; krb5_creds * in_cred; krb5_data * outbuf; { @@ -63,11 +62,11 @@ krb5_send_tgs_basic(context, in_data, sumtype, in_cred, outbuf) krb5_data * toutbuf; /* Generate checksum */ - if ((checksum.contents = - (krb5_octet *)malloc(krb5_checksum_size(context, sumtype))) == NULL) + if ((checksum.contents = (krb5_octet *) + malloc(krb5_checksum_size(context, krb5_kdc_req_sumtype))) == NULL) return(ENOMEM); - if (retval = krb5_calculate_checksum(context, sumtype, + if (retval = krb5_calculate_checksum(context, krb5_kdc_req_sumtype, in_data->data, in_data->length, (krb5_pointer) in_cred->keyblock.contents, in_cred->keyblock.length, &checksum)) { @@ -164,13 +163,12 @@ cleanup_scratch: } krb5_error_code -krb5_send_tgs(context, kdcoptions, timestruct, etypes, sumtype, sname, addrs, +krb5_send_tgs(context, kdcoptions, timestruct, etypes, sname, addrs, authorization_data, padata, second_ticket, in_cred, rep) krb5_context context; const krb5_flags kdcoptions; const krb5_ticket_times * timestruct; const krb5_enctype * etypes; - const krb5_cksumtype sumtype; krb5_const_principal sname; krb5_address * const * addrs; krb5_authdata * const * authorization_data; @@ -287,8 +285,7 @@ krb5_send_tgs(context, kdcoptions, timestruct, etypes, sumtype, sname, addrs, /* * Get an ap_req. */ - if (retval = krb5_send_tgs_basic(context, scratch, sumtype, - in_cred, &scratch2)) { + if (retval = krb5_send_tgs_basic(context, scratch, in_cred, &scratch2)) { krb5_free_data(context, scratch); goto send_tgs_error_2; } -- 2.26.2