From c686fc70d808fc24626ae5c90c31853dda99f17e Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Sun, 9 Feb 2003 15:20:24 +0000 Subject: [PATCH] Have g_token_size return unsigned int for signed/unsigned cleanup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15171 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/generic/ChangeLog | 5 +++++ src/lib/gssapi/generic/gssapiP_generic.h | 2 +- src/lib/gssapi/generic/util_token.c | 4 ++-- src/lib/gssapi/krb5/ChangeLog | 4 ++++ src/lib/gssapi/krb5/init_sec_context.c | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 878fd566e..96053e0b0 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +2003-02-09 Ezra Peisach + + * gssapiP_generic.h, util_token.c (g_token_size): Return unsigned + int instead of int. + 2003-01-17 Ken Raeburn * Makefile.in ($(EHDRDIR)$(S)gssapi.h): Depend on create-ehdrdir, diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h index e31627e95..529fe4ddb 100644 --- a/src/lib/gssapi/generic/gssapiP_generic.h +++ b/src/lib/gssapi/generic/gssapiP_generic.h @@ -153,7 +153,7 @@ int g_make_string_buffer (const char *str, gss_buffer_t buffer); int g_copy_OID_set (const gss_OID_set_desc * const in, gss_OID_set *out); -int g_token_size (gss_OID mech, unsigned int body_size); +unsigned int g_token_size (gss_OID mech, unsigned int body_size); void g_make_token_header (gss_OID mech, unsigned int body_size, unsigned char **buf, int tok_type); diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c index 088e6139e..30ae0698c 100644 --- a/src/lib/gssapi/generic/util_token.c +++ b/src/lib/gssapi/generic/util_token.c @@ -58,7 +58,7 @@ first two inner bytes, which indicate the token type. The token */ -static int der_length_size(length) +static unsigned int der_length_size(length) int length; { if (length < (1<<7)) @@ -131,7 +131,7 @@ static int der_read_length(buf, bufsize) /* returns the length of a token, given the mech oid and the body size */ -int g_token_size(mech, body_size) +unsigned int g_token_size(mech, body_size) gss_OID mech; unsigned int body_size; { diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 9be23de8b..21f5609b6 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +2003-02-09 Ezra Peisach + + * init_sec_context.c (make_ap_req_v1): Unsigned/signed cleanup. + 2003-01-10 Ken Raeburn * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag. diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 1fab732d2..2af8baca6 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -241,7 +241,7 @@ make_ap_req_v1(context, ctx, cred, k_cred, chan_bindings, mech_type, token) krb5_data *checksum_data = NULL; unsigned char *ptr; unsigned char *t; - int tlen; + unsigned int tlen; ap_req.data = 0; -- 2.26.2