oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Set session key only if we are returned a session key.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20681 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-05-14 18:03:39 +00:00
parent e44dcb7458
commit 87bdbf8e2c
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/gssapi/ntlm/accept_sec_context.c
View File

@@ -186,27 +186,33 @@ _gss_ntlm_accept_sec_context
ret = krb5_data_copy(&ctx->sessionkey, ret = krb5_data_copy(&ctx->sessionkey,
session.data, session.length); session.data, session.length);
if (ret) { if (ret) {
_gss_ntlm_delete_sec_context(minor_status, context_handle, NULL); _gss_ntlm_delete_sec_context(minor_status,
context_handle, NULL);
*minor_status = ret; *minor_status = ret;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
ctx->status |= STATUS_SESSIONKEY;
if (ctx->flags & NTLM_NEG_NTLM2_SESSION) { if (session.length != 0) {
_gss_ntlm_set_key(&ctx->u.v2.send, 1, (ctx->flags & NTLM_NEG_KEYEX),
ctx->sessionkey.data, ctx->status |= STATUS_SESSIONKEY;
ctx->sessionkey.length);
_gss_ntlm_set_key(&ctx->u.v2.recv, 0, (ctx->flags & NTLM_NEG_KEYEX), if (ctx->flags & NTLM_NEG_NTLM2_SESSION) {
ctx->sessionkey.data, _gss_ntlm_set_key(&ctx->u.v2.send, 1,
ctx->sessionkey.length); (ctx->flags & NTLM_NEG_KEYEX),
} else { ctx->sessionkey.data,
RC4_set_key(&ctx->u.v1.crypto_send.key, ctx->sessionkey.length);
ctx->sessionkey.length, _gss_ntlm_set_key(&ctx->u.v2.recv, 0,
ctx->sessionkey.data); (ctx->flags & NTLM_NEG_KEYEX),
RC4_set_key(&ctx->u.v1.crypto_recv.key, ctx->sessionkey.data,
ctx->sessionkey.length, ctx->sessionkey.length);
ctx->sessionkey.data); } else {
RC4_set_key(&ctx->u.v1.crypto_send.key,
ctx->sessionkey.length,
ctx->sessionkey.data);
RC4_set_key(&ctx->u.v1.crypto_recv.key,
ctx->sessionkey.length,
ctx->sessionkey.data);
}
} }
if (mech_type) if (mech_type)