diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-03-25 15:50:06 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-03-25 15:50:06 +0000 |
| commit | f92fff61e75c599bd2c9656cd01f24945ac2cf84 (patch) | |
| tree | 012191cd93d8b67e2e0f648f6c1a4a3a1e89395e | |
| parent | 28ac64d3ee77fdab219974ddea3b046639f421b1 (diff) | |
| download | krb5-f92fff61e75c599bd2c9656cd01f24945ac2cf84.tar.gz krb5-f92fff61e75c599bd2c9656cd01f24945ac2cf84.tar.xz krb5-f92fff61e75c599bd2c9656cd01f24945ac2cf84.zip | |
Fix a precedence error in g_make_token_header() which caused it to
write the wrong length when no token type is passed.
(From r24739 in users/lhoward/moonshot-mechglue-fixes.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24745 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/generic/util_token.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c index 3acbd8e6a6..0c4c90c16e 100644 --- a/src/lib/gssapi/generic/util_token.c +++ b/src/lib/gssapi/generic/util_token.c @@ -133,7 +133,7 @@ unsigned int g_token_size(const gss_OID_desc * mech, unsigned int body_size) { /* set body_size to sequence contents size */ - body_size += 4 + (int) mech->length; /* NEED overflow check */ + body_size += 4 + (unsigned int)mech->length; /* NEED overflow check */ return(1 + der_length_size(body_size) + body_size); } @@ -148,7 +148,7 @@ g_make_token_header( int tok_type) { *(*buf)++ = 0x60; - der_write_length(buf, (tok_type == -1) ?2:4 + mech->length + body_size); + der_write_length(buf, ((tok_type == -1) ? 2 : 4) + mech->length + body_size); *(*buf)++ = 0x06; *(*buf)++ = (unsigned char) mech->length; TWRITE_STR(*buf, mech->elements, mech->length); |