diff options
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | src/kdc/ChangeLog | 8 | ||||
| -rw-r--r-- | src/kdc/do_as_req.c | 10 | ||||
| -rw-r--r-- | src/kdc/do_tgs_req.c | 2 | ||||
| -rw-r--r-- | src/kdc/kdc_util.c | 6 |
4 files changed, 17 insertions, 9 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 9a7090680..1805af097 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,11 @@ +2002-04-05 Ken Raeburn <raeburn@mit.edu> + + * do_as_req.c (process_as_req): Call krb5_c_valid_enctype instead + of valid_enctype. + * do_tgs_req.c (process_tgs_req): Likewise. + * kdc_util.c (select_session_keytype): Likewise. + (comp_cksum): Similarly for valid_cksumtype, is_coll_proof_cksum. + 2002-02-20 Ken Raeburn <raeburn@mit.edu> * network.c: Include foreachaddr.c. diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 8ccada4c7..45ef81178 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -51,10 +51,10 @@ static krb5_error_code prepare_error_as (krb5_kdc_req *, int, krb5_data *, /*ARGSUSED*/ krb5_error_code process_as_req(request, from, portnum, response) -register krb5_kdc_req *request; -const krb5_fulladdr *from; /* who sent it ? */ -int portnum; -krb5_data **response; /* filled in with a response packet */ + krb5_kdc_req *request; + const krb5_fulladdr *from; /* who sent it ? */ + int portnum; + krb5_data **response; /* filled in with a response packet */ { krb5_db_entry client, server; @@ -338,7 +338,7 @@ krb5_data **response; /* filled in with a response packet */ client_key = (krb5_key_data *) NULL; for (i = 0; i < request->nktypes; i++) { useenctype = request->ktype[i]; - if (!valid_enctype(useenctype)) + if (!krb5_c_valid_enctype(useenctype)) continue; if (!krb5_dbe_find_enctype(kdc_context, &client, useenctype, -1, diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c index 2da823cbe..ce1047947 100644 --- a/src/kdc/do_tgs_req.c +++ b/src/kdc/do_tgs_req.c @@ -238,7 +238,7 @@ tgt_again: } etype = request->second_ticket[st_idx]->enc_part2->session->enctype; - if (!valid_enctype(etype)) { + if (!krb5_c_valid_enctype(etype)) { status = "BAD_ETYPE_IN_2ND_TKT"; errcode = KRB5KDC_ERR_ETYPE_NOSUPP; goto cleanup; diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c index c0c35dad4..779d0a80f 100644 --- a/src/kdc/kdc_util.c +++ b/src/kdc/kdc_util.c @@ -179,11 +179,11 @@ comp_cksum(kcontext, source, ticket, his_cksum) krb5_error_code retval; krb5_boolean valid; - if (!valid_cksumtype(his_cksum->checksum_type)) + if (!krb5_c_valid_cksumtype(his_cksum->checksum_type)) return KRB5KDC_ERR_SUMTYPE_NOSUPP; /* must be collision proof */ - if (!is_coll_proof_cksum(his_cksum->checksum_type)) + if (!krb5_c_is_coll_proof_cksum(his_cksum->checksum_type)) return KRB5KRB_AP_ERR_INAPP_CKSUM; /* verify checksum */ @@ -1456,7 +1456,7 @@ select_session_keytype(context, server, nktypes, ktype) int i; for (i = 0; i < nktypes; i++) { - if (!valid_enctype(ktype[i])) + if (!krb5_c_valid_enctype(ktype[i])) continue; if (!krb5_is_permitted_enctype(context, ktype[i])) |