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

Add support for generating NTLM2 session security answer.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19463 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-20 00:19:46 +00:00
parent df5c3ff11d
commit 96145a7a51
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kdc/digest.c
View File

@@ -660,10 +660,19 @@ _kdc_do_digest(krb5_context context,
} }
r.u.ntlmInitReply.flags |= r.u.ntlmInitReply.flags |=
(ireq.u.ntlmInit.flags & (NTLM_NEG_SIGN|NTLM_NEG_SEAL)) |
NTLM_NEG_TARGET_DOMAIN | NTLM_NEG_TARGET_DOMAIN |
NTLM_ENC_128; NTLM_ENC_128;
#define ALL \
NTLM_NEG_SIGN| \
NTLM_NEG_SEAL| \
NTLM_NEG_ALWAYS_SIGN| \
NTLM_NEG_NTLM2_SESSION
r.u.ntlmInitReply.flags |= (ireq.u.ntlmInit.flags & (ALL));
#undef ALL
targetname = strdup(krb5_principal_get_realm(context, targetname = strdup(krb5_principal_get_realm(context,
client->entry.principal)); client->entry.principal));
@@ -804,6 +813,23 @@ _kdc_do_digest(krb5_context context,
goto out; goto out;
} }
if (flags & NTLM_NEG_NTLM2_SESSION) {
char sessionhash[MD5_DIGEST_LENGTH];
MD5_CTX md5ctx;
if (ireq.u.ntlmRequest.lm.length != 24) {
krb5_set_error_string(context, "LM hash have wrong length "
"for NTLM session key");
goto out;
}
MD5_Init(&md5ctx);
MD5_Update(&md5ctx, challange, sizeof(challange));
MD5_Update(&md5ctx, ireq.u.ntlmRequest.lm.data, 8);
MD5_Final(sessionhash, &md5ctx);
memcpy(challange, sessionhash, sizeof(challange));
}
ret = heim_ntlm_calculate_ntlm1(key->key.keyvalue.data, ret = heim_ntlm_calculate_ntlm1(key->key.keyvalue.data,
key->key.keyvalue.length, key->key.keyvalue.length,
challange, &answer); challange, &answer);
@@ -830,8 +856,8 @@ _kdc_do_digest(krb5_context context,
if (ireq.u.ntlmRequest.sessionkey->length != sizeof(masterkey)){ if (ireq.u.ntlmRequest.sessionkey->length != sizeof(masterkey)){
krb5_set_error_string(context, krb5_set_error_string(context,
"NTLM master key wrong length: %d", "NTLM master key wrong length: %lu",
ireq.u.ntlmRequest.sessionkey->length); (unsigned long)ireq.u.ntlmRequest.sessionkey->length);
goto out; goto out;
} }