From aa1a6511bff4b78de6f61972fe08318ec8878179 Mon Sep 17 00:00:00 2001 From: Keith Vetter Date: Wed, 22 Mar 1995 05:05:53 +0000 Subject: [PATCH] Fixed signed/unsigned assignment mismatches git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5183 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 5 +++++ src/lib/krb5/krb/mk_req_ext.c | 2 +- src/lib/krb5/krb/mk_safe.c | 4 ++-- src/lib/krb5/krb/rd_safe.c | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index cf426c660..80fef45ef 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 21 19:22:51 1995 Keith Vetter (keithv@fusion.com) + + * mk_safe.c: fixed signed/unsigned mismatch. + * rd_safe.c: removed unused local variable currentime. + * mk_req_e.c: fixed signed/unsigned mismatch. Sat Mar 18 18:58:02 1995 John Gilmore (gnu at toad.com) * bld_pr_ext.c, bld_princ.c: Replace STDARG_PROTOTYPES with diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index d30382fb8..8aac3917a 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -148,7 +148,7 @@ krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds, /* XXX Special hack for GSSAPI */ checksum.checksum_type = 0x8003; checksum.length = in_data->length; - checksum.contents = in_data->data; + checksum.contents = (krb5_octet *) in_data->data; } else if (retval = krb5_calculate_checksum(context, (*auth_context)->cksumtype, diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index 905e8a1e4..528973d1c 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -66,8 +66,8 @@ krb5_mk_safe_basic(context, userdata, keyblock, replaydata, local_addr, return KRB5KRB_AP_ERR_INAPP_CKSUM; safemsg.user_data = *userdata; - safemsg.s_address = local_addr; - safemsg.r_address = remote_addr; + safemsg.s_address = (krb5_address *) local_addr; + safemsg.r_address = (krb5_address *) remote_addr; /* We should check too make sure one exists. */ safemsg.timestamp = replaydata->timestamp; diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index f97ca201b..7c0a94ec3 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -59,7 +59,6 @@ krb5_rd_safe_basic(context, inbuf, keyblock, recv_addr, sender_addr, krb5_checksum our_cksum, *his_cksum; krb5_octet zero_octet = 0; krb5_data *scratch; - krb5_timestamp currenttime; if (!krb5_is_krb_safe(inbuf)) return KRB5KRB_AP_ERR_MSG_TYPE; -- 2.26.2