diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-04-25 09:23:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:39 -0500 |
| commit | f5a8054f266a241d43a4c5d3ca908f8edfcc01f4 (patch) | |
| tree | 289b450ff2983726cd3f7fef54e6b9abb837d793 /source4/auth/ntlmssp/ntlmssp_server.c | |
| parent | 0501a440bedde5e867e461d266aafe666be53e54 (diff) | |
| download | samba-f5a8054f266a241d43a4c5d3ca908f8edfcc01f4.tar.gz samba-f5a8054f266a241d43a4c5d3ca908f8edfcc01f4.tar.bz2 samba-f5a8054f266a241d43a4c5d3ca908f8edfcc01f4.zip | |
r6463: Move NTLM2 and NTLM (v1) specific variables into a union for DCE/RPC.
Andrew Bartlett
(This used to be commit 227f2578da140067734f55b559760871ee4d0d12)
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_server.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 374fafc0e5..74d3c722d7 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -386,11 +386,11 @@ static NTSTATUS ntlmssp_server_preauth(struct ntlmssp_state *ntlmssp_state, ntlmssp_state->doing_ntlm2 = True; - memcpy(ntlmssp_state->session_nonce, ntlmssp_state->internal_chal.data, 8); - memcpy(&ntlmssp_state->session_nonce[8], ntlmssp_state->lm_resp.data, 8); + memcpy(ntlmssp_state->ntlm2.session_nonce, ntlmssp_state->internal_chal.data, 8); + memcpy(&ntlmssp_state->ntlm2.session_nonce[8], ntlmssp_state->lm_resp.data, 8); MD5Init(&md5_session_nonce_ctx); - MD5Update(&md5_session_nonce_ctx, ntlmssp_state->session_nonce, 16); + MD5Update(&md5_session_nonce_ctx, ntlmssp_state->ntlm2.session_nonce, 16); MD5Final(session_nonce_hash, &md5_session_nonce_ctx); ntlmssp_state->chal = data_blob_talloc(ntlmssp_state, @@ -440,8 +440,8 @@ static NTSTATUS ntlmssp_server_postauth(struct ntlmssp_state *ntlmssp_state, if (ntlmssp_state->doing_ntlm2) { if (user_session_key && user_session_key->data && user_session_key->length == 16) { session_key = data_blob_talloc(ntlmssp_state, NULL, 16); - hmac_md5(user_session_key->data, ntlmssp_state->session_nonce, - sizeof(ntlmssp_state->session_nonce), session_key.data); + hmac_md5(user_session_key->data, ntlmssp_state->ntlm2.session_nonce, + sizeof(ntlmssp_state->ntlm2.session_nonce), session_key.data); DEBUG(10,("ntlmssp_server_auth: Created NTLM2 session key.\n")); dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length); |