From a81646cf89f6d83fa0c3b8eb41b10c54fcb78f4d Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 19 Nov 1997 05:22:31 +0000 Subject: [PATCH] * rd_safe.c (krb_rd_safe): Fix up call to quad_cksum * mk_priv.c (krb_mk_priv): Fix up call to pcbc_encrypt. * mk_safe.c (krb_mk_safe): Fix up call to quad_cksum. * mk_req.c (krb_mk_req): Fix up call to pcbc_encrypt. * rd_req.c (krb_rd_req): Fix up call to pcbc_encrypt. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10295 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb4/ChangeLog | 14 ++++++++++++++ src/lib/krb4/mk_priv.c | 2 +- src/lib/krb4/mk_req.c | 2 +- src/lib/krb4/mk_safe.c | 3 ++- src/lib/krb4/rd_req.c | 2 +- src/lib/krb4/rd_safe.c | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 0528b154a..914f12d91 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,17 @@ +Wed Nov 19 00:01:07 1997 Tom Yu + + * rd_safe.c (krb_rd_safe): Fix up call to quad_cksum. + + * mk_priv.c (krb_mk_priv): Fix up call to pcbc_encrypt. + + * mk_safe.c (krb_mk_safe): Fix up call to quad_cksum. + +Tue Nov 18 23:49:01 1997 Tom Yu + + * mk_req.c (krb_mk_req): Fix up call to pcbc_encrypt. + + * rd_req.c (krb_rd_req): Fix up call to pcbc_encrypt. + Tue Oct 21 09:02:51 1997 Ezra Peisach * kparse.c: Include stdlib.h if present (for malloc prototyp) diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c index 068b17dec..ceb10c8bd 100644 --- a/src/lib/krb4/mk_priv.c +++ b/src/lib/krb4/mk_priv.c @@ -198,7 +198,7 @@ krb_mk_priv(in,out,length,schedule,key,sender,receiver) #ifndef NOENCRYPTION /* pcbc encrypt, pad as needed, use key as ivec */ pcbc_encrypt((C_Block *) q,(C_Block *) q, (long) (p-q), schedule, - key, ENCRYPT); + (C_Block *)&key, ENCRYPT); #endif /* NOENCRYPTION */ return (q - out + c_length); /* resulting size */ diff --git a/src/lib/krb4/mk_req.c b/src/lib/krb4/mk_req.c index 7fb01d2f8..1936cb287 100644 --- a/src/lib/krb4/mk_req.c +++ b/src/lib/krb4/mk_req.c @@ -174,7 +174,7 @@ krb_mk_req(authent,service,instance,realm,checksum) /* Encrypt the request ID using the session key */ key_sched(cr.session,key_s); pcbc_encrypt((C_Block *)req_id->dat,(C_Block *)req_id->dat, - (long) req_id->length,key_s,(C_Block *) cr.session,1); + (long) req_id->length,key_s, &cr.session,1); /* clean up */ memset((char *) key_s, 0, sizeof(key_s)); #endif /* NOENCRYPTION */ diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c index 9e24db0c4..a20a2257c 100644 --- a/src/lib/krb4/mk_safe.c +++ b/src/lib/krb4/mk_safe.c @@ -142,7 +142,8 @@ krb_mk_safe(in,out,length,key,sender,receiver) memset((char*) big_cksum, 0, sizeof(big_cksum)); #else /* Do encryption */ /* calculate the checksum of length, timestamps, and input data */ - cksum = quad_cksum(q, (u_char *)big_cksum, p-q, 2, key); + cksum = quad_cksum(q, (unsigned KRB4_32 *)big_cksum, + p-q, 2, (C_Block *)&key); #endif /* NOENCRYPTION */ DEB (("\ncksum = %u",cksum)); diff --git a/src/lib/krb4/rd_req.c b/src/lib/krb4/rd_req.c index bb03f7ef4..79564e4f3 100644 --- a/src/lib/krb4/rd_req.c +++ b/src/lib/krb4/rd_req.c @@ -268,7 +268,7 @@ krb_rd_req(authent,service,instance,from_addr,ad,fn) #endif key_sched(ad->session,seskey_sched); pcbc_encrypt((C_Block *)req_id->dat,(C_Block *)req_id->dat, - (long) req_id->length, seskey_sched,ad->session,DES_DECRYPT); + (long) req_id->length, seskey_sched,&ad->session,DES_DECRYPT); #ifdef KRB_CRYPT_DEBUG if (krb_ap_req_debug) log("Done."); #endif diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c index ad75f4d38..20407677b 100644 --- a/src/lib/krb4/rd_safe.c +++ b/src/lib/krb4/rd_safe.c @@ -182,7 +182,7 @@ krb_rd_safe protocol err sizeof(u_long) != sizeof(struct in_addr)"); #else /* Do encryption */ /* calculate the checksum of the length, timestamps, and * input data, on the sending byte order !! */ - quad_cksum(q,calc_cksum,p-q,2,key); + quad_cksum(q,calc_cksum,p-q,2,(C_Block *)&key); #endif /* NOENCRYPTION */ DEB (("\n0: calc %l big %lx\n1: calc %lx big %lx\n2: calc %lx big %lx\n3: calc %lx big %lx\n", -- 2.26.2