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

use _gss_ntlm_set_key

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19530 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-28 14:38:37 +00:00
parent 2412c6be41
commit 7f49c4ad56
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,17 +198,12 @@ handle_type3(OM_uint32 *minor_status,
ctx->status |= STATUS_SESSIONKEY; ctx->status |= STATUS_SESSIONKEY;
if (ctx->flags & NTLM_NEG_NTLM2_SESSION) { if (ctx->flags & NTLM_NEG_NTLM2_SESSION) {
ctx->u.v2.send.seq = 0; _gss_ntlm_set_key(&ctx->u.v2.send, 1,
RC4_set_key(&ctx->u.v2.send.sealkey, ctx->sessionkey.data,
ctx->sessionkey.length, ctx->sessionkey.length);
ctx->sessionkey.data); _gss_ntlm_set_key(&ctx->u.v2.recv, 0,
memcpy(ctx->u.v2.send.signkey, ctx->sessionkey.data, 16); ctx->sessionkey.data,
ctx->sessionkey.length);
ctx->u.v2.recv.seq = 0;
RC4_set_key(&ctx->u.v2.recv.sealkey,
ctx->sessionkey.length,
ctx->sessionkey.data);
memcpy(ctx->u.v2.recv.signkey, ctx->sessionkey.data, 16);
} else { } else {
RC4_set_key(&ctx->u.v1.crypto_send.key, RC4_set_key(&ctx->u.v1.crypto_send.key,
ctx->sessionkey.length, ctx->sessionkey.length,

16
lib/gssapi/ntlm/init_sec_context.c
View File

@@ -329,16 +329,12 @@ _gss_ntlm_init_sec_context
if (ctx->flags & NTLM_NEG_NTLM2_SESSION) { if (ctx->flags & NTLM_NEG_NTLM2_SESSION) {
ctx->status |= STATUS_SESSIONKEY; ctx->status |= STATUS_SESSIONKEY;
ctx->u.v2.send.seq = 0; _gss_ntlm_set_key(&ctx->u.v2.send, 0,
RC4_set_key(&ctx->u.v2.send.sealkey, ctx->sessionkey.data,
ctx->sessionkey.length, ctx->sessionkey.length);
ctx->sessionkey.data); _gss_ntlm_set_key(&ctx->u.v2.recv, 1,
memcpy(ctx->u.v2.send.signkey, ctx->sessionkey.data, 16); ctx->sessionkey.data,
ctx->u.v2.recv.seq = 0; ctx->sessionkey.length);
RC4_set_key(&ctx->u.v2.recv.sealkey,
ctx->sessionkey.length,
ctx->sessionkey.data);
memcpy(ctx->u.v2.recv.signkey, ctx->sessionkey.data, 16);
} else { } else {
ctx->status |= STATUS_SESSIONKEY; ctx->status |= STATUS_SESSIONKEY;
RC4_set_key(&ctx->u.v1.crypto_recv.key, RC4_set_key(&ctx->u.v1.crypto_recv.key,