From 7f49c4ad56b9d8dc651cf20201544d17855cd8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 28 Dec 2006 14:38:37 +0000 Subject: [PATCH] use _gss_ntlm_set_key git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19530 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/ntlm/accept_sec_context.c | 17 ++++++----------- lib/gssapi/ntlm/init_sec_context.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/lib/gssapi/ntlm/accept_sec_context.c b/lib/gssapi/ntlm/accept_sec_context.c index 9ef3ea1f7..51c5f8102 100644 --- a/lib/gssapi/ntlm/accept_sec_context.c +++ b/lib/gssapi/ntlm/accept_sec_context.c @@ -198,17 +198,12 @@ handle_type3(OM_uint32 *minor_status, ctx->status |= STATUS_SESSIONKEY; if (ctx->flags & NTLM_NEG_NTLM2_SESSION) { - ctx->u.v2.send.seq = 0; - RC4_set_key(&ctx->u.v2.send.sealkey, - ctx->sessionkey.length, - ctx->sessionkey.data); - memcpy(ctx->u.v2.send.signkey, ctx->sessionkey.data, 16); - - 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); + _gss_ntlm_set_key(&ctx->u.v2.send, 1, + ctx->sessionkey.data, + ctx->sessionkey.length); + _gss_ntlm_set_key(&ctx->u.v2.recv, 0, + ctx->sessionkey.data, + ctx->sessionkey.length); } else { RC4_set_key(&ctx->u.v1.crypto_send.key, ctx->sessionkey.length, diff --git a/lib/gssapi/ntlm/init_sec_context.c b/lib/gssapi/ntlm/init_sec_context.c index 6098f7660..31bef5ab0 100644 --- a/lib/gssapi/ntlm/init_sec_context.c +++ b/lib/gssapi/ntlm/init_sec_context.c @@ -329,16 +329,12 @@ _gss_ntlm_init_sec_context if (ctx->flags & NTLM_NEG_NTLM2_SESSION) { ctx->status |= STATUS_SESSIONKEY; - ctx->u.v2.send.seq = 0; - RC4_set_key(&ctx->u.v2.send.sealkey, - ctx->sessionkey.length, - ctx->sessionkey.data); - memcpy(ctx->u.v2.send.signkey, ctx->sessionkey.data, 16); - 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); + _gss_ntlm_set_key(&ctx->u.v2.send, 0, + ctx->sessionkey.data, + ctx->sessionkey.length); + _gss_ntlm_set_key(&ctx->u.v2.recv, 1, + ctx->sessionkey.data, + ctx->sessionkey.length); } else { ctx->status |= STATUS_SESSIONKEY; RC4_set_key(&ctx->u.v1.crypto_recv.key,