diff options
Diffstat (limited to 'crypto/heimdal/kdc/kerberos4.c')
| -rw-r--r-- | crypto/heimdal/kdc/kerberos4.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/heimdal/kdc/kerberos4.c b/crypto/heimdal/kdc/kerberos4.c index 99a7eb6..c3a851b 100644 --- a/crypto/heimdal/kdc/kerberos4.c +++ b/crypto/heimdal/kdc/kerberos4.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "kdc_locl.h" -RCSID("$Id: kerberos4.c,v 1.39 2001/09/20 09:34:42 assar Exp $"); +RCSID("$Id: kerberos4.c,v 1.41 2002/04/18 16:08:24 joda Exp $"); #ifdef KRB4 @@ -325,12 +325,12 @@ do_version4(unsigned char *buf, sname, sinst, skey->key.keyvalue.data); create_ciph(&cipher, session, sname, sinst, v4_realm, - life, server->kvno, &ticket, kdc_time, + life, server->kvno % 256, &ticket, kdc_time, ckey->key.keyvalue.data); memset(&session, 0, sizeof(session)); r = create_auth_reply(name, inst, realm, req_time, 0, client->pw_end ? *client->pw_end : 0, - client->kvno, &cipher); + client->kvno % 256, &cipher); krb5_data_copy(reply, r->dat, r->length); memset(&cipher, 0, sizeof(cipher)); memset(&ticket, 0, sizeof(ticket)); @@ -373,9 +373,9 @@ do_version4(unsigned char *buf, goto out2; } - if(tgt->kvno != kvno){ + if(tgt->kvno % 256 != kvno){ kdc_log(0, "tgs-req with old kvno %d (current %d) for " - "krbtgt.%s@%s", kvno, tgt->kvno, realm, v4_realm); + "krbtgt.%s@%s", kvno, tgt->kvno % 256, realm, v4_realm); make_err_reply(reply, KDC_AUTH_EXP, "old krbtgt kvno used"); goto out2; @@ -393,7 +393,7 @@ do_version4(unsigned char *buf, RCHECK(krb5_ret_int8(sp, &ticket_len), out2); RCHECK(krb5_ret_int8(sp, &req_len), out2); - pos = sp->seek(sp, ticket_len + req_len, SEEK_CUR); + pos = krb5_storage_seek(sp, ticket_len + req_len, SEEK_CUR); memset(&auth, 0, sizeof(auth)); memcpy(&auth.dat, buf, pos); @@ -499,7 +499,7 @@ do_version4(unsigned char *buf, sname, sinst, skey->key.keyvalue.data); create_ciph(&cipher, session, sname, sinst, v4_realm, - life, server->kvno, &ticket, + life, server->kvno % 256, &ticket, kdc_time, &ad.session); memset(&session, 0, sizeof(session)); @@ -625,7 +625,7 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et, break; } } - sp->store(sp, tmp, sizeof(tmp)); + krb5_storage_write(sp, tmp, sizeof(tmp)); } if((et->key.keytype != ETYPE_DES_CBC_MD5 && @@ -633,7 +633,7 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et, et->key.keytype != ETYPE_DES_CBC_CRC) || et->key.keyvalue.length != 8) return -1; - sp->store(sp, et->key.keyvalue.data, 8); + krb5_storage_write(sp, et->key.keyvalue.data, 8); { time_t start = et->starttime ? *et->starttime : et->authtime; |
