diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-03-26 03:51:44 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-03-26 03:51:44 +0000 |
| commit | 50adda2de32499bdff6aa6ec0705e82888ee39ba (patch) | |
| tree | 995048c2385b92c4b61b2a23c464f8365ac24c64 /src/lib/gssapi/krb5/init_sec_context.c | |
| parent | 3306315dc3f42a0794d7887232a6e49893a567e6 (diff) | |
| download | krb5-50adda2de32499bdff6aa6ec0705e82888ee39ba.tar.gz krb5-50adda2de32499bdff6aa6ec0705e82888ee39ba.tar.xz krb5-50adda2de32499bdff6aa6ec0705e82888ee39ba.zip | |
gssapi_krb5.c: Rearrange OID's so that the V1V2 mechanism set returns
all three mechanism ID's recognized by this implementation, with the
RFC1964 OID first (and thus preferred).
import_sec_context.c (krb5_gss_convert_static_mech_oid): Make the old
convert_static_oid() function globally accessible with a namespace
compliant name, since init_sec_context() needs to be able to use this
function.
indicate_mechs.c (krb5_gss_indicate_mechs): Return the v1v2 mechanism
set OID, since we should return all the mechanisms that we support.
init_sec_context.c (krb5_gss_init_sec_context): Make ctx->mech_used
use a static OID, since it is returned by gss_inquire_context which
must return a static OID.
wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix bug where we would
overestimate the size of the allowable input message by one byte,
because we weren't passing the right estimate of the wrapped data to
g_token_size().
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11315 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/krb5/init_sec_context.c')
| -rw-r--r-- | src/lib/gssapi/krb5/init_sec_context.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index f13763b6d..fb11cf5a2 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -655,6 +655,10 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle, code = *minor_status; goto fail; } + /* + * Now try to make it static if at all possible.... + */ + ctx->mech_used = krb5_gss_convert_static_mech_oid(ctx->mech_used); if (ctx->gsskrb5_version == 2000) { /* gsskrb5 v2 */ |