summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-04-25 12:13:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:40 -0500
commite7b92b10aab662f0475679387d6e0f3438973318 (patch)
tree3f73892d6823a9ea66541e7262f229b0d0cd6806
parent4e29d24b4cc63ae243c420284ac68fb8356b8d93 (diff)
downloadsamba-e7b92b10aab662f0475679387d6e0f3438973318.tar.gz
samba-e7b92b10aab662f0475679387d6e0f3438973318.tar.bz2
samba-e7b92b10aab662f0475679387d6e0f3438973318.zip
r6468: Fix LOCAL-NTLMSSP test with new NTLMSSP structure.
Andrew Bartlett (This used to be commit 8d503fb153c25580c06dd13ca83df47f9e434c7a)
-rw-r--r--source4/torture/auth/ntlmssp.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index a29f99757c..644d502d99 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -26,7 +26,6 @@
BOOL torture_ntlmssp_self_check(void)
{
struct gensec_security *gensec_security;
- struct ntlmssp_state *ntlmssp_state;
struct gensec_ntlmssp_state *gensec_ntlmssp_state;
DATA_BLOB data;
DATA_BLOB sig, expected_sig;
@@ -47,17 +46,16 @@ BOOL torture_ntlmssp_self_check(void)
}
gensec_ntlmssp_state = gensec_security->private_data;
- ntlmssp_state = gensec_ntlmssp_state->ntlmssp_state;
- ntlmssp_state->session_key = strhex_to_data_blob("0102030405060708090a0b0c0d0e0f00");
+ gensec_ntlmssp_state->session_key = strhex_to_data_blob("0102030405060708090a0b0c0d0e0f00");
dump_data_pw("NTLMSSP session key: \n",
- ntlmssp_state->session_key.data,
- ntlmssp_state->session_key.length);
+ gensec_ntlmssp_state->session_key.data,
+ gensec_ntlmssp_state->session_key.length);
- ntlmssp_state->server_use_session_keys = True;
- ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_KEY_EXCH | NTLMSSP_NEGOTIATE_NTLM2;
+ gensec_ntlmssp_state->server_use_session_keys = True;
+ gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_KEY_EXCH | NTLMSSP_NEGOTIATE_NTLM2;
- if (!NT_STATUS_IS_OK(status = ntlmssp_sign_init(ntlmssp_state))) {
+ if (!NT_STATUS_IS_OK(status = ntlmssp_sign_init(gensec_ntlmssp_state))) {
printf("Failed to sign_init: %s\n", nt_errstr(status));
return False;
}
@@ -97,17 +95,16 @@ BOOL torture_ntlmssp_self_check(void)
}
gensec_ntlmssp_state = gensec_security->private_data;
- ntlmssp_state = gensec_ntlmssp_state->ntlmssp_state;
- ntlmssp_state->session_key = strhex_to_data_blob("0102030405e538b0");
+ gensec_ntlmssp_state->session_key = strhex_to_data_blob("0102030405e538b0");
dump_data_pw("NTLMSSP session key: \n",
- ntlmssp_state->session_key.data,
- ntlmssp_state->session_key.length);
+ gensec_ntlmssp_state->session_key.data,
+ gensec_ntlmssp_state->session_key.length);
- ntlmssp_state->server_use_session_keys = True;
- ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_KEY_EXCH;
+ gensec_ntlmssp_state->server_use_session_keys = True;
+ gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_KEY_EXCH;
- if (!NT_STATUS_IS_OK(status = ntlmssp_sign_init(ntlmssp_state))) {
+ if (!NT_STATUS_IS_OK(status = ntlmssp_sign_init(gensec_ntlmssp_state))) {
printf("Failed to sign_init: %s\n", nt_errstr(status));
return False;
}