diff options
| author | Tom Yu <tlyu@mit.edu> | 1998-07-25 01:15:34 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1998-07-25 01:15:34 +0000 |
| commit | 131f95248de731750c9b23e72151899c32d25334 (patch) | |
| tree | bff05fac852b7462d1315f7885cd342d8f5d3976 /src/lib/gssapi | |
| parent | fb3644dd06acdce61190ad359bf27330dff32370 (diff) | |
| download | krb5-131f95248de731750c9b23e72151899c32d25334.tar.gz krb5-131f95248de731750c9b23e72151899c32d25334.tar.xz krb5-131f95248de731750c9b23e72151899c32d25334.zip | |
* wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix to round down
by 8 even if the req_output_size-ohlen is a multiple of 8, since
the wrap token is always padded regardless of whether it's a
mutiple of 8 bytes.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10737 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/wrap_size_limit.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index bc5c57875..a94aeb72d 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 24 21:13:53 1998 Tom Yu <tlyu@mit.edu> + + * wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix to round down + by 8 even if the req_output_size-ohlen is a multiple of 8, since + the wrap token is always padded regardless of whether it's a + mutiple of 8 bytes. + 1998-06-08 Theodore Ts'o <tytso@rsts-11.mit.edu> * k5unseal.c (kg_unseal): Clean up lint warnings. diff --git a/src/lib/gssapi/krb5/wrap_size_limit.c b/src/lib/gssapi/krb5/wrap_size_limit.c index e883efde1..f2366d16e 100644 --- a/src/lib/gssapi/krb5/wrap_size_limit.c +++ b/src/lib/gssapi/krb5/wrap_size_limit.c @@ -73,7 +73,7 @@ krb5_gss_wrap_size_limit(minor_status, context_handle, conf_req_flag, * Cannot have trailer length that will cause us to pad over * our length */ - *max_input_size = (req_output_size - ohlen) & (~7); + *max_input_size = (req_output_size - ohlen - 1) & (~7); else *max_input_size = 0; *minor_status = 0; |