summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-02-21 04:46:49 +0000
committerAndrew Tridgell <tridge@samba.org>2004-02-21 04:46:49 +0000
commite967ff114e767113f0f98d98db628ffa204314eb (patch)
tree5f7e51e9483d4dc7da88c91a1e5ea52226cc56b9 /source4
parent420c7b4c5dd4213f0b97e1aa987274b611726455 (diff)
downloadsamba-e967ff114e767113f0f98d98db628ffa204314eb.tar.gz
samba-e967ff114e767113f0f98d98db628ffa204314eb.tar.bz2
samba-e967ff114e767113f0f98d98db628ffa204314eb.zip
split up the schannel rpc client code into separate key establishment
and bind calls, but with a combined call that does both. This makes is easier to write a schannel test program that tried different keys. (This used to be commit 9d89928086a7095bbc2218760b12263298af4217)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/rpc/dcerpc_schannel.c83
1 files changed, 64 insertions, 19 deletions
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 39438f4381..2a4c0a6bb1 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -64,23 +64,21 @@ static void schan_security_end(struct dcerpc_security *dcerpc_security)
/*
- do a schannel style bind on a dcerpc pipe. The username is usually
- of the form HOSTNAME$ and the password is the domain trust password
+ get a schannel key using a netlogon challenge on a secondary pipe
*/
-NTSTATUS dcerpc_bind_auth_schannel(struct dcerpc_pipe *p,
- const char *uuid, unsigned version,
- const char *domain,
- const char *username,
- const char *password)
+NTSTATUS dcerpc_schannel_key(struct dcerpc_pipe *p,
+ const char *domain,
+ const char *username,
+ const char *password,
+ int chan_type,
+ uint8 new_session_key[8])
{
NTSTATUS status;
struct dcerpc_pipe *p2;
struct netr_ServerReqChallenge r;
struct netr_ServerAuthenticate2 a;
uint8 mach_pwd[16];
- uint8 session_key[16];
struct netr_CredentialState creds;
- struct schannel_state *schannel_state;
const char *workgroup, *workstation;
uint32 negotiate_flags = 0;
@@ -117,11 +115,7 @@ NTSTATUS dcerpc_bind_auth_schannel(struct dcerpc_pipe *p,
a.in.server_name = r.in.server_name;
a.in.username = talloc_asprintf(p->mem_ctx, "%s$", workstation);
- if (lp_server_role() == ROLE_DOMAIN_BDC) {
- a.in.secure_channel_type = SEC_CHAN_BDC;
- } else {
- a.in.secure_channel_type = SEC_CHAN_WKSTA;
- }
+ a.in.secure_channel_type = chan_type;
a.in.computer_name = workstation;
a.in.negotiate_flags = &negotiate_flags;
a.out.negotiate_flags = &negotiate_flags;
@@ -141,8 +135,36 @@ NTSTATUS dcerpc_bind_auth_schannel(struct dcerpc_pipe *p,
*/
dcerpc_pipe_close(p2);
+ memcpy(new_session_key, creds.session_key, 8);
+
+ return NT_STATUS_OK;
+}
+
+
+/*
+ do a schannel style bind on a dcerpc pipe with the given schannel
+ key. The username is usually of the form HOSTNAME$ and the password
+ is the domain trust password
+*/
+NTSTATUS dcerpc_bind_auth_schannel_key(struct dcerpc_pipe *p,
+ const char *uuid, unsigned version,
+ const char *domain,
+ const char *username,
+ const uint8 session_key[8])
+{
+ NTSTATUS status;
+ uint8 full_session_key[16];
+ struct schannel_state *schannel_state;
+ const char *workgroup, *workstation;
+
+ memcpy(full_session_key, session_key, 8);
+ memset(full_session_key+8, 0, 8);
+
+ workstation = username;
+ workgroup = domain;
+
/*
- step 4 - perform a bind with security type schannel
+ perform a bind with security type schannel
*/
p->auth_info = talloc(p->mem_ctx, sizeof(*p->auth_info));
if (!p->auth_info) {
@@ -198,10 +220,7 @@ NTSTATUS dcerpc_bind_auth_schannel(struct dcerpc_pipe *p,
goto done;
}
- memcpy(session_key, creds.session_key, 8);
- memset(session_key+8, 0, 8);
-
- status = schannel_start(&schannel_state, session_key, True);
+ status = schannel_start(&schannel_state, full_session_key, True);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
@@ -219,3 +238,29 @@ done:
return status;
}
+
+/*
+ do a schannel style bind on a dcerpc pipe. The username is usually
+ of the form HOSTNAME$ and the password is the domain trust password
+*/
+NTSTATUS dcerpc_bind_auth_schannel(struct dcerpc_pipe *p,
+ const char *uuid, unsigned version,
+ const char *domain,
+ const char *username,
+ const char *password)
+{
+ NTSTATUS status;
+ uint8 session_key[8];
+
+ status = dcerpc_schannel_key(p, domain, username, password,
+ lp_server_role() == ROLE_DOMAIN_BDC? SEC_CHAN_BDC:SEC_CHAN_WKSTA,
+ session_key);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ status = dcerpc_bind_auth_schannel_key(p, uuid, version, domain, username, session_key);
+
+ return status;
+}
+