remove trailing whitespace
This commit is contained in:
@@ -42,13 +42,13 @@ _gss_ntlm_allocate_ctx(OM_uint32 *minor_status, ntlm_ctx *ctx)
|
||||
{
|
||||
OM_uint32 maj_stat;
|
||||
struct ntlm_server_interface *ns_interface = NULL;
|
||||
|
||||
|
||||
#ifdef DIGEST
|
||||
ns_interface = &ntlmsspi_kdc_digest;
|
||||
#endif
|
||||
if (ns_interface == NULL)
|
||||
return GSS_S_FAILURE;
|
||||
|
||||
|
||||
*ctx = calloc(1, sizeof(**ctx));
|
||||
|
||||
(*ctx)->server = ns_interface;
|
||||
@@ -91,7 +91,7 @@ _gss_ntlm_accept_sec_context
|
||||
|
||||
if (context_handle == NULL)
|
||||
return GSS_S_FAILURE;
|
||||
|
||||
|
||||
if (input_token_buffer == GSS_C_NO_BUFFER)
|
||||
return GSS_S_FAILURE;
|
||||
|
||||
@@ -116,7 +116,7 @@ _gss_ntlm_accept_sec_context
|
||||
if (major_status)
|
||||
return major_status;
|
||||
*context_handle = (gss_ctx_id_t)ctx;
|
||||
|
||||
|
||||
/* check if the mechs is allowed by remote service */
|
||||
major_status = (*ctx->server->nsi_probe)(minor_status, ctx->ictx, NULL);
|
||||
if (major_status) {
|
||||
@@ -126,7 +126,7 @@ _gss_ntlm_accept_sec_context
|
||||
|
||||
data.data = input_token_buffer->value;
|
||||
data.length = input_token_buffer->length;
|
||||
|
||||
|
||||
ret = heim_ntlm_decode_type1(&data, &type1);
|
||||
if (ret) {
|
||||
_gss_ntlm_delete_sec_context(minor_status, context_handle, NULL);
|
||||
@@ -215,20 +215,20 @@ _gss_ntlm_accept_sec_context
|
||||
return maj_stat;
|
||||
}
|
||||
*src_name = (gss_name_t)n;
|
||||
}
|
||||
}
|
||||
|
||||
heim_ntlm_free_type3(&type3);
|
||||
|
||||
ret = krb5_data_copy(&ctx->sessionkey,
|
||||
session.data, session.length);
|
||||
if (ret) {
|
||||
if (ret) {
|
||||
if (src_name)
|
||||
_gss_ntlm_release_name(&junk, src_name);
|
||||
_gss_ntlm_delete_sec_context(minor_status, context_handle, NULL);
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
if (session.length != 0) {
|
||||
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
|
@@ -63,7 +63,7 @@ OM_uint32 GSSAPI_CALLCONV _gss_ntlm_acquire_cred
|
||||
maj_stat = _gss_ntlm_allocate_ctx(min_stat, &ctx);
|
||||
if (maj_stat != GSS_S_COMPLETE)
|
||||
return maj_stat;
|
||||
|
||||
|
||||
maj_stat = (*ctx->server->nsi_probe)(min_stat, ctx->ictx,
|
||||
name->domain);
|
||||
{
|
||||
@@ -73,7 +73,7 @@ OM_uint32 GSSAPI_CALLCONV _gss_ntlm_acquire_cred
|
||||
}
|
||||
if (maj_stat)
|
||||
return maj_stat;
|
||||
}
|
||||
}
|
||||
if (cred_usage == GSS_C_BOTH || cred_usage == GSS_C_INITIATE) {
|
||||
ntlm_cred cred;
|
||||
|
||||
|
@@ -495,7 +495,7 @@ _gss_ntlm_wrap
|
||||
|
||||
RC4(&ctx->u.v1.crypto_send.key, input_message_buffer->length,
|
||||
input_message_buffer->value, output_message_buffer->value);
|
||||
|
||||
|
||||
ret = _gss_ntlm_get_mic(minor_status, context_handle,
|
||||
0, input_message_buffer,
|
||||
&trailer);
|
||||
@@ -567,10 +567,10 @@ _gss_ntlm_unwrap
|
||||
output_message_buffer->length = 0;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
RC4(&ctx->u.v1.crypto_recv.key, output_message_buffer->length,
|
||||
input_message_buffer->value, output_message_buffer->value);
|
||||
|
||||
|
||||
trailer.value = ((unsigned char *)input_message_buffer->value) +
|
||||
output_message_buffer->length;
|
||||
trailer.length = 16;
|
||||
|
@@ -50,7 +50,7 @@ _gss_ntlm_display_name
|
||||
ntlm_name n = (ntlm_name)input_name;
|
||||
char *str = NULL;
|
||||
int len;
|
||||
|
||||
|
||||
output_name_buffer->length = 0;
|
||||
output_name_buffer->value = NULL;
|
||||
|
||||
|
@@ -36,7 +36,7 @@
|
||||
static int
|
||||
from_file(const char *fn, const char *target_domain,
|
||||
char **username, struct ntlm_buf *key)
|
||||
{
|
||||
{
|
||||
char *str, buf[1024];
|
||||
FILE *f;
|
||||
|
||||
@@ -247,7 +247,7 @@ _gss_ntlm_init_sec_context
|
||||
struct ntlm_buf data;
|
||||
uint32_t flags = 0;
|
||||
int ret;
|
||||
|
||||
|
||||
ctx = calloc(1, sizeof(*ctx));
|
||||
if (ctx == NULL) {
|
||||
*minor_status = EINVAL;
|
||||
@@ -280,23 +280,23 @@ _gss_ntlm_init_sec_context
|
||||
flags |= NTLM_NEG_KEYEX;
|
||||
|
||||
memset(&type1, 0, sizeof(type1));
|
||||
|
||||
|
||||
type1.flags = flags;
|
||||
type1.domain = name->domain;
|
||||
type1.hostname = NULL;
|
||||
type1.os[0] = 0;
|
||||
type1.os[1] = 0;
|
||||
|
||||
|
||||
ret = heim_ntlm_encode_type1(&type1, &data);
|
||||
if (ret) {
|
||||
_gss_ntlm_delete_sec_context(minor_status, context_handle, NULL);
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
output_token->value = data.data;
|
||||
output_token->length = data.length;
|
||||
|
||||
|
||||
return GSS_S_CONTINUE_NEEDED;
|
||||
} else {
|
||||
krb5_error_code ret;
|
||||
@@ -397,7 +397,7 @@ _gss_ntlm_init_sec_context
|
||||
struct ntlm_targetinfo ti;
|
||||
|
||||
/* verify infotarget */
|
||||
|
||||
|
||||
ret = heim_ntlm_decode_targetinfo(&type2.targetinfo, 1, &ti);
|
||||
if(ret) {
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
@@ -438,7 +438,7 @@ _gss_ntlm_init_sec_context
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
ctx->flags |= NTLM_NEG_NTLM2_SESSION;
|
||||
|
||||
ret = krb5_data_copy(&ctx->sessionkey,
|
||||
@@ -469,7 +469,7 @@ _gss_ntlm_init_sec_context
|
||||
ctx->sessionkey.length,
|
||||
ctx->sessionkey.data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
ret = heim_ntlm_encode_type3(&type3, &data);
|
||||
|
@@ -45,7 +45,7 @@ _gss_ntlm_iter_creds_f(OM_uint32 flags,
|
||||
krb5_context context = NULL;
|
||||
krb5_storage *request, *response;
|
||||
krb5_data response_data;
|
||||
|
||||
|
||||
ret = krb5_init_context(&context);
|
||||
if (ret)
|
||||
goto done;
|
||||
@@ -96,4 +96,4 @@ _gss_ntlm_iter_creds_f(OM_uint32 flags,
|
||||
krb5_free_context(context);
|
||||
#endif /* HAVE_KCM */
|
||||
(*cred_iter)(userctx, NULL, NULL);
|
||||
}
|
||||
}
|
||||
|
@@ -322,7 +322,7 @@ kdc_type2(OM_uint32 *minor_status,
|
||||
|
||||
type2.targetinfo.data = ti.data;
|
||||
type2.targetinfo.length = ti.length;
|
||||
|
||||
|
||||
ret = heim_ntlm_encode_type2(&type2, &data);
|
||||
free(type2.targetname);
|
||||
krb5_data_free(&ti);
|
||||
@@ -330,7 +330,7 @@ kdc_type2(OM_uint32 *minor_status,
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
out->data = data.data;
|
||||
out->length = data.length;
|
||||
|
||||
|
Reference in New Issue
Block a user