r995: - renamed many of our crypto routines to use the industry standard

  names rather than our crazy naming scheme. So DES is now called
  des_crypt() rather than smbhash()

- added the code from the solution of the ADS crypto challenge that
  allows Samba to correctly handle a 128 bit session key in all of the
  netr_ServerAuthenticateX() varients. A huge thanks to Luke Howard
  from PADL for solving this one!

- restructured the server side rpc authentication to allow for other
  than NTLMSSP sign and seal. This commit just adds the structure, the
  next commit will add schannel server side support.

- added 128 bit session key support to our client side code, and
  testing against w2k3 with smbtorture. Works well.
(This used to be commit 729b2f41c924a0b435d44a14209e6dacc2304cee)

1 files changed, 5 insertions, 5 deletions

diff --git a/source4/libcli/auth/schannel.c b/source4/libcli/auth/schannel.c
index 666eb811ae..294873feff 100644
--- a/source4/libcli/auth/schannel.c
+++ b/source4/libcli/auth/schannel.c
@@ -35,7 +35,7 @@ static void netsec_deal_with_seq_num(struct schannel_state *state,
 
 	hmac_md5(state->session_key, zeros, sizeof(zeros), digest1);
 	hmac_md5(digest1, packet_digest, 8, sequence_key);
-	SamOEMhash(seq_num, sequence_key, 8);
+	arcfour_crypt(seq_num, sequence_key, 8);
 
 	state->seq_num++;
 }
@@ -113,8 +113,8 @@ NTSTATUS schannel_unseal_packet(struct schannel_state *state,
 	SIVAL(seq_num, 4, state->initiator?0:0x80);
 
 	netsec_get_sealing_key(state->session_key, seq_num, sealing_key);
-	SamOEMhash(confounder, sealing_key, 8);
-	SamOEMhash(data, sealing_key, length);
+	arcfour_crypt(confounder, sealing_key, 8);
+	arcfour_crypt(data, sealing_key, length);
 
 	schannel_digest(state->session_key, 
 			netsec_sig, confounder, 
@@ -204,8 +204,8 @@ NTSTATUS schannel_seal_packet(struct schannel_state *state,
 			data, length, digest_final);
 
 	netsec_get_sealing_key(state->session_key, seq_num, sealing_key);
-	SamOEMhash(confounder, sealing_key, 8);
-	SamOEMhash(data, sealing_key, length);
+	arcfour_crypt(confounder, sealing_key, 8);
+	arcfour_crypt(data, sealing_key, length);
 
 	netsec_deal_with_seq_num(state, digest_final, seq_num);