diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-06 08:17:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-06 08:44:53 +1000 |
| commit | 64e2b859d2ed9c2428219617c3864c64cd6ed909 (patch) | |
| tree | 5bd71240e2facda348f3dc1dc843bd0b769c3e5f /source4/heimdal/lib/gssapi/krb5 | |
| parent | b97d85c5e4db00a6cfc0a191907e88d2623c6681 (diff) | |
| download | samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.tar.gz samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.tar.bz2 samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.zip | |
s4:heimdal: import lorikeet-heimdal-200908052208 (commit 370a73a74199a5a55188340906e15fd795f67a74)
This removes some of the portability changes made to code under
heimdal/
If these are still required, then we will re-add them with code under
heimdal_build/ (so that we can simply 'drop in' future heimdal
releases).
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/lib/gssapi/krb5')
| -rwxr-xr-x | source4/heimdal/lib/gssapi/krb5/cfx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/cfx.c b/source4/heimdal/lib/gssapi/krb5/cfx.c index 35e5a9e45a..7cc7ee1e74 100755 --- a/source4/heimdal/lib/gssapi/krb5/cfx.c +++ b/source4/heimdal/lib/gssapi/krb5/cfx.c @@ -41,10 +41,10 @@ #define CFXAcceptorSubkey (1 << 2) krb5_error_code -_gsskrb5cfx_wrap_length_cfx(const gsskrb5_ctx context_handle, - krb5_context context, +_gsskrb5cfx_wrap_length_cfx(krb5_context context, krb5_crypto crypto, int conf_req_flag, + int dce_style, size_t input_length, size_t *output_length, size_t *cksumsize, @@ -71,7 +71,7 @@ _gsskrb5cfx_wrap_length_cfx(const gsskrb5_ctx context_handle, /* Header is concatenated with data before encryption */ input_length += sizeof(gss_cfx_wrap_token_desc); - if (IS_DCE_STYLE(context_handle)) { + if (dce_style) { ret = krb5_crypto_getblocksize(context, crypto, &padsize); } else { ret = krb5_crypto_getpadsize(context, crypto, &padsize); @@ -972,8 +972,9 @@ OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status, int32_t seq_number; u_char *p; - ret = _gsskrb5cfx_wrap_length_cfx(ctx, context, + ret = _gsskrb5cfx_wrap_length_cfx(context, ctx->crypto, conf_req_flag, + IS_DCE_STYLE(ctx), input_message_buffer->length, &wrapped_len, &cksumsize, &padlength); if (ret != 0) { |