summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-06-18 11:59:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:44 -0500
commit3e152fcd5b49f727062ed054401e294b6d5d8cb8 (patch)
tree09114e96bda1d87ac387403fc1126d2eebc60875
parent5c3afaf85621660475baa821537b9dc512d78a4d (diff)
downloadsamba-3e152fcd5b49f727062ed054401e294b6d5d8cb8.tar.gz
samba-3e152fcd5b49f727062ed054401e294b6d5d8cb8.tar.bz2
samba-3e152fcd5b49f727062ed054401e294b6d5d8cb8.zip
r1187: * Remove testing hack (actually check signatures on NTLM2).
* Remove unreached counter increment * Print the correct NTLMSSP key. (This used to be commit b96700695479c19c7b2c190616420762409fdf0d)
-rw-r--r--source4/libcli/auth/ntlmssp_sign.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/libcli/auth/ntlmssp_sign.c b/source4/libcli/auth/ntlmssp_sign.c
index dacfdb194f..d680da9495 100644
--- a/source4/libcli/auth/ntlmssp_sign.c
+++ b/source4/libcli/auth/ntlmssp_sign.c
@@ -233,7 +233,7 @@ NTSTATUS ntlmssp_check_packet(struct ntlmssp_state *ntlmssp_state,
dump_data(5, sig->data, sig->length);
DEBUG(0, ("NTLMSSP NTLM2 packet check failed due to invalid signature!\n"));
- return NT_STATUS_OK;
+ return NT_STATUS_ACCESS_DENIED;
}
} else {
if (local_sig.length != sig->length ||
@@ -346,9 +346,6 @@ NTSTATUS ntlmssp_unseal_packet(struct ntlmssp_state *ntlmssp_state,
dump_data_pw("ntlmssp clear data\n", data, length);
return ntlmssp_check_packet(ntlmssp_state, sig_mem_ctx, data, length, sig);
-
- /* increment counter on recv */
- ntlmssp_state->ntlmssp_seq_num++;
}
/**
@@ -439,7 +436,7 @@ NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
calc_ntlmv2_key(ntlmssp_state->recv_seal_key,
weak_session_key, recv_seal_const);
dump_data_pw("NTLMSSP recv seal key:\n",
- ntlmssp_state->recv_sign_key,
+ ntlmssp_state->recv_seal_key,
sizeof(ntlmssp_state->recv_seal_key));
calc_hash(ntlmssp_state->recv_seal_hash,
ntlmssp_state->recv_seal_key,