[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Sat Jul 3 13:23:11 MDT 2010
The branch, master has been updated
via 6dc1c70... s4:torture/rpc/samlogon.c - strip trailing whitespaces
from e2e09f5... s4:torture/rpc/samlogon.c - provide a function which sets and afterwards resets the minimum password age
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6dc1c708760b887a5b195f860cd0a02cfcfffadd
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sat Jul 3 21:09:06 2010 +0200
s4:torture/rpc/samlogon.c - strip trailing whitespaces
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/samlogon.c | 398 ++++++++++++++++++++--------------------
1 files changed, 199 insertions(+), 199 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 20ffe6c..cbe1f44 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
test suite for netlogon SamLogon operations
@@ -6,17 +6,17 @@
Copyright (C) Andrew Tridgell 2003
Copyright (C) Andrew Bartlett <abartlet at samba.org> 2003-2004
Copyright (C) Tim Potter 2003
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -67,18 +67,18 @@ struct samlogon_state {
DATA_BLOB chall;
};
-/*
+/*
Authenticate a user with a challenge/response, checking session key
and valid authentication types
*/
-static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
+static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
enum ntlm_break break_which,
uint32_t parameter_control,
- DATA_BLOB *chall,
- DATA_BLOB *lm_response,
- DATA_BLOB *nt_response,
- uint8_t lm_key[8],
- uint8_t user_session_key[16],
+ DATA_BLOB *chall,
+ DATA_BLOB *lm_response,
+ DATA_BLOB *nt_response,
+ uint8_t lm_key[8],
+ uint8_t user_session_key[16],
char **error_string)
{
NTSTATUS status;
@@ -88,20 +88,20 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
struct netr_NetworkInfo ninfo;
struct netr_SamBaseInfo *base = NULL;
uint16_t validation_level = 0;
-
+
samlogon_state->r.in.logon->network = &ninfo;
samlogon_state->r_ex.in.logon->network = &ninfo;
samlogon_state->r_flags.in.logon->network = &ninfo;
-
+
ninfo.identity_info.domain_name.string = samlogon_state->account_domain;
ninfo.identity_info.parameter_control = parameter_control;
ninfo.identity_info.logon_id_low = 0;
ninfo.identity_info.logon_id_high = 0;
ninfo.identity_info.account_name.string = samlogon_state->account_name;
ninfo.identity_info.workstation.string = TEST_MACHINE_NAME;
-
+
memcpy(ninfo.challenge, chall->data, 8);
-
+
switch (break_which) {
case BREAK_NONE:
break;
@@ -130,7 +130,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
data_blob_free(nt_response);
break;
}
-
+
if (nt_response) {
ninfo.nt.data = nt_response->data;
ninfo.nt.length = nt_response->length;
@@ -138,7 +138,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
ninfo.nt.data = NULL;
ninfo.nt.length = 0;
}
-
+
if (lm_response) {
ninfo.lm.data = lm_response->data;
ninfo.lm.length = lm_response->length;
@@ -146,9 +146,9 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
ninfo.lm.data = NULL;
ninfo.lm.length = 0;
}
-
+
switch (samlogon_state->function_level) {
- case NDR_NETR_LOGONSAMLOGON:
+ case NDR_NETR_LOGONSAMLOGON:
ZERO_STRUCT(samlogon_state->auth2);
netlogon_creds_client_authenticator(samlogon_state->creds, &samlogon_state->auth);
@@ -161,7 +161,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
}
return status;
}
- if (!r->out.return_authenticator ||
+ if (!r->out.return_authenticator ||
!netlogon_creds_client_check(samlogon_state->creds, &r->out.return_authenticator->cred)) {
d_printf("Credential chaining failed\n");
}
@@ -188,7 +188,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
break;
}
break;
- case NDR_NETR_LOGONSAMLOGONEX:
+ case NDR_NETR_LOGONSAMLOGONEX:
status = dcerpc_netr_LogonSamLogonEx_r(samlogon_state->p->binding_handle,
samlogon_state->mem_ctx, r_ex);
if (!NT_STATUS_IS_OK(status)) {
@@ -220,7 +220,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
break;
}
break;
- case NDR_NETR_LOGONSAMLOGONWITHFLAGS:
+ case NDR_NETR_LOGONSAMLOGONWITHFLAGS:
ZERO_STRUCT(samlogon_state->auth2);
netlogon_creds_client_authenticator(samlogon_state->creds, &samlogon_state->auth);
@@ -233,7 +233,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
}
return status;
}
- if (!r_flags->out.return_authenticator ||
+ if (!r_flags->out.return_authenticator ||
!netlogon_creds_client_check(samlogon_state->creds, &r_flags->out.return_authenticator->cred)) {
d_printf("Credential chaining failed\n");
}
@@ -243,7 +243,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
}
return r_flags->out.result;
}
-
+
validation_level = r_flags->in.validation_level;
netlogon_creds_decrypt_samlogon(samlogon_state->creds, validation_level, r_flags->out.validation);
@@ -264,7 +264,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
/* can't happen */
return NT_STATUS_INVALID_PARAMETER;
}
-
+
if (!base) {
d_printf("No user info returned from 'successful' SamLogon*() call!\n");
return NT_STATUS_INVALID_PARAMETER;
@@ -276,16 +276,16 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
if (lm_key) {
memcpy(lm_key, base->LMSessKey.key, 8);
}
-
+
return status;
-}
+}
-/*
+/*
* Test the normal 'LM and NTLM' combination
*/
-static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm_break break_which, char **error_string)
+static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm_break break_which, char **error_string)
{
bool pass = true;
bool lm_good;
@@ -298,7 +298,7 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
uint8_t user_session_key[16];
uint8_t lm_hash[16];
uint8_t nt_hash[16];
-
+
ZERO_STRUCT(lm_key);
ZERO_STRUCT(user_session_key);
@@ -306,9 +306,9 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
if (!lm_good) {
ZERO_STRUCT(lm_hash);
} else {
- E_deshash(samlogon_state->password, lm_hash);
+ E_deshash(samlogon_state->password, lm_hash);
}
-
+
SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data, nt_response.data);
E_md4hash(samlogon_state->password, nt_hash);
@@ -320,10 +320,10 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
&samlogon_state->chall,
&lm_response,
&nt_response,
- lm_key,
+ lm_key,
user_session_key,
error_string);
-
+
data_blob_free(&lm_response);
if (NT_STATUS_EQUAL(NT_STATUS_WRONG_PASSWORD, nt_status)) {
@@ -353,7 +353,7 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
return false;
}
- if (memcmp(lm_hash, lm_key,
+ if (memcmp(lm_hash, lm_key,
sizeof(lm_key)) != 0) {
d_printf("LM Key does not match expectations!\n");
d_printf("lm_key:\n");
@@ -369,7 +369,7 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
uint8_t lm_key_expected[16];
memcpy(lm_key_expected, lm_hash, 8);
memset(lm_key_expected+8, '\0', 8);
- if (memcmp(lm_key_expected, user_session_key,
+ if (memcmp(lm_key_expected, user_session_key,
16) != 0) {
*error_string = strdup("NT Session Key does not match expectations (should be first-8 LM hash)!\n");
d_printf("user_session_key:\n");
@@ -381,7 +381,7 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
break;
}
default:
- if (memcmp(session_key.data, user_session_key,
+ if (memcmp(session_key.data, user_session_key,
sizeof(user_session_key)) != 0) {
*error_string = strdup("NT Session Key does not match expectations!\n");
d_printf("user_session_key:\n");
@@ -394,30 +394,30 @@ static bool test_lm_ntlm_broken(struct samlogon_state *samlogon_state, enum ntlm
return pass;
}
-/*
+/*
* Test LM authentication, no NT response supplied
*/
-static bool test_lm(struct samlogon_state *samlogon_state, char **error_string)
+static bool test_lm(struct samlogon_state *samlogon_state, char **error_string)
{
return test_lm_ntlm_broken(samlogon_state, NO_NT, error_string);
}
-/*
+/*
* Test the NTLM response only, no LM.
*/
-static bool test_ntlm(struct samlogon_state *samlogon_state, char **error_string)
+static bool test_ntlm(struct samlogon_state *samlogon_state, char **error_string)
{
return test_lm_ntlm_broken(samlogon_state, NO_LM, error_string);
}
-/*
+/*
* Test the NTLM response only, but in the LM field.
*/
-static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_string)
+static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_string)
{
bool lm_good;
bool pass = true;
@@ -429,17 +429,17 @@ static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
uint8_t lm_hash[16];
uint8_t user_session_key[16];
uint8_t nt_hash[16];
-
+
ZERO_STRUCT(lm_key);
ZERO_STRUCT(user_session_key);
- SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data,
+ SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data,
nt_response.data);
E_md4hash(samlogon_state->password, nt_hash);
- SMBsesskeygen_ntv1(nt_hash,
+ SMBsesskeygen_ntv1(nt_hash,
session_key.data);
- lm_good = E_deshash(samlogon_state->password, lm_hash);
+ lm_good = E_deshash(samlogon_state->password, lm_hash);
if (!lm_good) {
ZERO_STRUCT(lm_hash);
}
@@ -449,10 +449,10 @@ static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
&samlogon_state->chall,
&nt_response,
NULL,
- lm_key,
+ lm_key,
user_session_key,
error_string);
-
+
if (NT_STATUS_EQUAL(NT_STATUS_WRONG_PASSWORD, nt_status)) {
/* for 'old' passwords, we allow the server to be OK or wrong password */
if (samlogon_state->old_password) {
@@ -470,7 +470,7 @@ static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
}
if (lm_good) {
- if (memcmp(lm_hash, lm_key,
+ if (memcmp(lm_hash, lm_key,
sizeof(lm_key)) != 0) {
d_printf("LM Key does not match expectations!\n");
d_printf("lm_key:\n");
@@ -481,7 +481,7 @@ static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
}
#if 0
} else {
- if (memcmp(session_key.data, lm_key,
+ if (memcmp(session_key.data, lm_key,
sizeof(lm_key)) != 0) {
d_printf("LM Key does not match expectations (first 8 session key)!\n");
d_printf("lm_key:\n");
@@ -496,7 +496,7 @@ static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
uint8_t lm_key_expected[16];
memcpy(lm_key_expected, lm_hash, 8);
memset(lm_key_expected+8, '\0', 8);
- if (memcmp(lm_key_expected, user_session_key,
+ if (memcmp(lm_key_expected, user_session_key,
16) != 0) {
d_printf("NT Session Key does not match expectations (should be first-8 LM hash)!\n");
d_printf("user_session_key:\n");
@@ -509,11 +509,11 @@ static bool test_ntlm_in_lm(struct samlogon_state *samlogon_state, char **error_
return pass;
}
-/*
+/*
* Test the NTLM response only, but in the both the NT and LM fields.
*/
-static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **error_string)
+static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **error_string)
{
bool pass = true;
bool lm_good;
@@ -525,17 +525,17 @@ static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **erro
uint8_t lm_hash[16];
uint8_t user_session_key[16];
uint8_t nt_hash[16];
-
+
ZERO_STRUCT(lm_key);
ZERO_STRUCT(user_session_key);
- SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data,
+ SMBNTencrypt(samlogon_state->password, samlogon_state->chall.data,
nt_response.data);
E_md4hash(samlogon_state->password, nt_hash);
- SMBsesskeygen_ntv1(nt_hash,
+ SMBsesskeygen_ntv1(nt_hash,
session_key.data);
- lm_good = E_deshash(samlogon_state->password, lm_hash);
+ lm_good = E_deshash(samlogon_state->password, lm_hash);
if (!lm_good) {
ZERO_STRUCT(lm_hash);
}
@@ -544,12 +544,12 @@ static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **erro
BREAK_NONE,
samlogon_state->parameter_control,
&samlogon_state->chall,
- NULL,
+ NULL,
&nt_response,
- lm_key,
+ lm_key,
user_session_key,
error_string);
-
+
if (NT_STATUS_EQUAL(NT_STATUS_WRONG_PASSWORD, nt_status)) {
/* for 'old' passwords, we allow the server to be OK or wrong password */
if (samlogon_state->old_password) {
@@ -570,7 +570,7 @@ static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **erro
return false;
}
- if (memcmp(lm_hash, lm_key,
+ if (memcmp(lm_hash, lm_key,
sizeof(lm_key)) != 0) {
d_printf("LM Key does not match expectations!\n");
d_printf("lm_key:\n");
@@ -579,7 +579,7 @@ static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **erro
dump_data(1, lm_hash, 8);
pass = false;
}
- if (memcmp(session_key.data, user_session_key,
+ if (memcmp(session_key.data, user_session_key,
sizeof(user_session_key)) != 0) {
d_printf("NT Session Key does not match expectations!\n");
d_printf("user_session_key:\n");
@@ -593,7 +593,7 @@ static bool test_ntlm_in_both(struct samlogon_state *samlogon_state, char **erro
return pass;
}
-/*
+/*
* Test the NTLMv2 and LMv2 responses
*/
@@ -602,10 +602,10 @@ enum ntlmv2_domain {
NO_DOMAIN
};
-static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
- enum ntlm_break break_which,
- enum ntlmv2_domain ntlmv2_domain,
- char **error_string)
+static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
+ enum ntlm_break break_which,
+ enum ntlmv2_domain ntlmv2_domain,
+ char **error_string)
{
bool pass = true;
NTSTATUS nt_status;
@@ -620,25 +620,25 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
ZERO_STRUCT(lm_session_key);
ZERO_STRUCT(user_session_key);
-
+
switch (ntlmv2_domain) {
case UPPER_DOMAIN:
- if (!SMBNTLMv2encrypt(samlogon_state->mem_ctx,
- samlogon_state->account_name, samlogon_state->account_domain,
+ if (!SMBNTLMv2encrypt(samlogon_state->mem_ctx,
+ samlogon_state->account_name, samlogon_state->account_domain,
samlogon_state->password, &samlogon_state->chall,
&names_blob,
- &lmv2_response, &ntlmv2_response,
+ &lmv2_response, &ntlmv2_response,
&lmv2_session_key, &ntlmv2_session_key)) {
data_blob_free(&names_blob);
return false;
}
break;
case NO_DOMAIN:
- if (!SMBNTLMv2encrypt(samlogon_state->mem_ctx,
+ if (!SMBNTLMv2encrypt(samlogon_state->mem_ctx,
samlogon_state->account_name, "",
samlogon_state->password, &samlogon_state->chall,
&names_blob,
- &lmv2_response, &ntlmv2_response,
+ &lmv2_response, &ntlmv2_response,
&lmv2_session_key, &ntlmv2_session_key)) {
data_blob_free(&names_blob);
return false;
@@ -653,10 +653,10 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
&samlogon_state->chall,
&lmv2_response,
&ntlmv2_response,
- lm_session_key,
+ lm_session_key,
user_session_key,
error_string);
-
+
data_blob_free(&lmv2_response);
data_blob_free(&ntlmv2_response);
@@ -691,7 +691,7 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
dump_data(1, lmv2_session_key.data, ntlmv2_session_key.length);
pass = false;
}
- if (memcmp(lmv2_session_key.data, lm_session_key,
+ if (memcmp(lmv2_session_key.data, lm_session_key,
sizeof(lm_session_key)) != 0) {
d_printf("LM (LMv2) Session Key does not match expectations!\n");
d_printf("lm_session_key:\n");
@@ -702,7 +702,7 @@ static bool test_lmv2_ntlmv2_broken(struct samlogon_state *samlogon_state,
}
break;
default:
- if (memcmp(ntlmv2_session_key.data, user_session_key,
--
Samba Shared Repository
More information about the samba-cvs
mailing list