diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-03-15 17:45:01 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-03-15 17:45:01 +0000 |
| commit | 730ebd39f1e4cdc77c7f9719274e7e1a4346c9f8 (patch) | |
| tree | c4efc953c40618a56d75e1a258bea4865bcdcbbe /src/lib/gssapi/krb5/k5unseal.c | |
| parent | 85fa9e1e2073d2c0ec2a82205bcfd13080e854f0 (diff) | |
| download | krb5-730ebd39f1e4cdc77c7f9719274e7e1a4346c9f8.tar.gz krb5-730ebd39f1e4cdc77c7f9719274e7e1a4346c9f8.tar.xz krb5-730ebd39f1e4cdc77c7f9719274e7e1a4346c9f8.zip | |
* k5seal.c (kg_seal): Extract the krb5 context from the security context
instead of requiring it be passed in as an argument.
* k5unseal.c (kg_unseal): Likewise.
* gssapiP_krb5.h (kg_seal, kg_unseal): Declarations updated.
* delete_sec_context.c, process_context_token.c, seal.c, sign.c, unseal.c,
verify.c: Callers changed.
* inq_context.c (krb5_gss_inquire_context): Use krb5 context contained in
security context instead of calling kg_get_context.
* wrap_size_limit.c (krb5_gss_wrap_size_limit): Likewise.
* import_sec_context.c (krb5_gss_ser_init): New function.
(krb5_gss_import_sec_context): Create a krb5 context locally to use for the
import.
* export_sec_context.c (krb5_gss_export_sec_context): Use the krb5 context in
the security context.
* gssapiP_krb5.h (krb5_gss_ser_init): Declare.
* gssapi_krb5.c (kg_get_context): Don't call krb5 serialization initialization
code here.
* accept_sec_context.c (krb5_gss_accept_sec_context): Free the new krb5 context
in an error case not caught before.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16171 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi/krb5/k5unseal.c')
| -rw-r--r-- | src/lib/gssapi/krb5/k5unseal.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c index 6851352eee..714610102b 100644 --- a/src/lib/gssapi/krb5/k5unseal.c +++ b/src/lib/gssapi/krb5/k5unseal.c @@ -475,9 +475,8 @@ kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, message_buffer, conf_state is only valid if SEAL. */ OM_uint32 -kg_unseal(context, minor_status, context_handle, input_token_buffer, +kg_unseal(minor_status, context_handle, input_token_buffer, message_buffer, conf_state, qop_state, toktype) - krb5_context context; OM_uint32 *minor_status; gss_ctx_id_t context_handle; gss_buffer_t input_token_buffer; @@ -538,11 +537,11 @@ kg_unseal(context, minor_status, context_handle, input_token_buffer, } if (ctx->proto == 0) - return kg_unseal_v1(context, minor_status, ctx, ptr, bodysize, + return kg_unseal_v1(ctx->k5_context, minor_status, ctx, ptr, bodysize, message_buffer, conf_state, qop_state, toktype); else - return gss_krb5int_unseal_token_v3(context, minor_status, ctx, + return gss_krb5int_unseal_token_v3(ctx->k5_context, minor_status, ctx, ptr, bodysize, message_buffer, conf_state, qop_state, toktype); } |