remove trailing whitespace
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23815 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,34 +1,34 @@
|
||||
/*
|
||||
* Copyright (c) 2006 - 2008 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "ntlm/ntlm.h"
|
||||
@@ -36,9 +36,9 @@
|
||||
RCSID("$Id$");
|
||||
|
||||
static int
|
||||
from_file(const char *fn, const char *target_domain,
|
||||
from_file(const char *fn, const char *target_domain,
|
||||
char **username, struct ntlm_buf *key)
|
||||
{
|
||||
{
|
||||
char *str, buf[1024];
|
||||
FILE *f;
|
||||
|
||||
@@ -75,7 +75,7 @@ from_file(const char *fn, const char *target_domain,
|
||||
}
|
||||
|
||||
static int
|
||||
get_user_file(const ntlm_name target_name,
|
||||
get_user_file(const ntlm_name target_name,
|
||||
char **username, struct ntlm_buf *key)
|
||||
{
|
||||
const char *fn;
|
||||
@@ -164,11 +164,11 @@ _gss_ntlm_get_user_cred(const ntlm_name target_name,
|
||||
{
|
||||
ntlm_cred cred;
|
||||
int ret;
|
||||
|
||||
|
||||
cred = calloc(1, sizeof(*cred));
|
||||
if (cred == NULL)
|
||||
return ENOMEM;
|
||||
|
||||
|
||||
ret = get_user_file(target_name, &cred->username, &cred->key);
|
||||
if (ret)
|
||||
ret = get_user_ccache(target_name, &cred->username, &cred->key);
|
||||
@@ -176,7 +176,7 @@ _gss_ntlm_get_user_cred(const ntlm_name target_name,
|
||||
free(cred);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
cred->domain = strdup(target_name->domain);
|
||||
*rcred = cred;
|
||||
|
||||
@@ -339,7 +339,7 @@ _gss_ntlm_init_sec_context
|
||||
unsigned char nonce[8];
|
||||
|
||||
if (RAND_bytes(nonce, sizeof(nonce)) != 1) {
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
context_handle, NULL);
|
||||
*minor_status = EINVAL;
|
||||
return GSS_S_FAILURE;
|
||||
@@ -351,7 +351,7 @@ _gss_ntlm_init_sec_context
|
||||
&type3.lm,
|
||||
&type3.ntlm);
|
||||
} else {
|
||||
ret = heim_ntlm_calculate_ntlm1(ctx->client->key.data,
|
||||
ret = heim_ntlm_calculate_ntlm1(ctx->client->key.data,
|
||||
ctx->client->key.length,
|
||||
type2.challange,
|
||||
&type3.ntlm);
|
||||
@@ -363,7 +363,7 @@ _gss_ntlm_init_sec_context
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
ret = heim_ntlm_build_ntlm1_master(ctx->client->key.data,
|
||||
ret = heim_ntlm_build_ntlm1_master(ctx->client->key.data,
|
||||
ctx->client->key.length,
|
||||
&sessionkey,
|
||||
&type3.sessionkey);
|
||||
@@ -377,7 +377,7 @@ _gss_ntlm_init_sec_context
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
ret = krb5_data_copy(&ctx->sessionkey,
|
||||
ret = krb5_data_copy(&ctx->sessionkey,
|
||||
sessionkey.data, sessionkey.length);
|
||||
free(sessionkey.data);
|
||||
if (ret) {
|
||||
@@ -389,7 +389,7 @@ _gss_ntlm_init_sec_context
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
|
||||
} else {
|
||||
struct ntlm_buf sessionkey;
|
||||
@@ -397,17 +397,17 @@ _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,
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
context_handle, NULL);
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
if (ti.domainname && strcmp(ti.domainname, name->domain) != 0) {
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
context_handle, NULL);
|
||||
*minor_status = EINVAL;
|
||||
return GSS_S_FAILURE;
|
||||
@@ -422,7 +422,7 @@ _gss_ntlm_init_sec_context
|
||||
ntlmv2,
|
||||
&type3.ntlm);
|
||||
if (ret) {
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
context_handle, NULL);
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
@@ -433,15 +433,15 @@ _gss_ntlm_init_sec_context
|
||||
&type3.sessionkey);
|
||||
memset(ntlmv2, 0, sizeof(ntlmv2));
|
||||
if (ret) {
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
_gss_ntlm_delete_sec_context(minor_status,
|
||||
context_handle, NULL);
|
||||
*minor_status = ret;
|
||||
return GSS_S_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
ctx->flags |= NTLM_NEG_NTLM2_SESSION;
|
||||
|
||||
ret = krb5_data_copy(&ctx->sessionkey,
|
||||
ret = krb5_data_copy(&ctx->sessionkey,
|
||||
sessionkey.data, sessionkey.length);
|
||||
free(sessionkey.data);
|
||||
if (ret) {
|
||||
@@ -453,7 +453,7 @@ _gss_ntlm_init_sec_context
|
||||
}
|
||||
|
||||
if (ctx->flags & NTLM_NEG_NTLM2_SESSION) {
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
_gss_ntlm_set_key(&ctx->u.v2.send, 0, (ctx->flags & NTLM_NEG_KEYEX),
|
||||
ctx->sessionkey.data,
|
||||
ctx->sessionkey.length);
|
||||
@@ -461,11 +461,11 @@ _gss_ntlm_init_sec_context
|
||||
ctx->sessionkey.data,
|
||||
ctx->sessionkey.length);
|
||||
} else {
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
RC4_set_key(&ctx->u.v1.crypto_recv.key,
|
||||
ctx->status |= STATUS_SESSIONKEY;
|
||||
RC4_set_key(&ctx->u.v1.crypto_recv.key,
|
||||
ctx->sessionkey.length,
|
||||
ctx->sessionkey.data);
|
||||
RC4_set_key(&ctx->u.v1.crypto_send.key,
|
||||
RC4_set_key(&ctx->u.v1.crypto_send.key,
|
||||
ctx->sessionkey.length,
|
||||
ctx->sessionkey.data);
|
||||
}
|
||||
|
Reference in New Issue
Block a user