svn commit: samba r13467 - in branches/SAMBA_4_0/source/auth/ntlmssp: .

abartlet at samba.org abartlet at samba.org
Sun Feb 12 12:06:10 GMT 2006


Author: abartlet
Date: 2006-02-12 12:06:08 +0000 (Sun, 12 Feb 2006)
New Revision: 13467

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13467

Log:
Add new parametric options (for testing) controlling LM_KEY and 56-bit
encryption behaviour.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c	2006-02-12 12:04:41 UTC (rev 13466)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c	2006-02-12 12:06:08 UTC (rev 13467)
@@ -144,9 +144,6 @@
 		auth_gen_string = "CdBBAAABd";
 	}
 
-	DEBUG(3, ("NTLMSSP: Set final flags:\n"));
-	debug_ntlmssp_flags(gensec_ntlmssp_state->neg_flags);
-
 	if (!msrpc_parse(mem_ctx,
 			 &in, chal_parse_string,
 			 "NTLMSSP",
@@ -215,7 +212,6 @@
 			SMBsesskeygen_lm_sess_key(lm_session_key.data, zeros,
 						  new_session_key.data);
 		}
-		new_session_key.length = 16;
 		session_key = new_session_key;
 		dump_data_pw("LM session key\n", session_key.data, session_key.length);
 	}
@@ -239,6 +235,9 @@
 		session_key = data_blob_talloc(mem_ctx, client_session_key, sizeof(client_session_key));
 	}
 
+	DEBUG(3, ("NTLMSSP: Set final flags:\n"));
+	debug_ntlmssp_flags(gensec_ntlmssp_state->neg_flags);
+
 	/* this generates the actual auth packet */
 	if (!msrpc_gen(mem_ctx, 
 		       out, auth_gen_string, 
@@ -304,7 +303,8 @@
 	gensec_ntlmssp_state->use_nt_response = lp_parm_bool(-1, "ntlmssp_client", "send_nt_reponse", True);
 
 	gensec_ntlmssp_state->allow_lm_key = (lp_client_lanman_auth() 
-					  && lp_parm_bool(-1, "ntlmssp_client", "allow_lm_key", False));
+					      && (lp_parm_bool(-1, "ntlmssp_client", "allow_lm_key", False)
+						  || lp_parm_bool(-1, "ntlmssp_client", "lm_key", False)));
 
 	gensec_ntlmssp_state->use_ntlmv2 = lp_client_ntlmv2_auth();
 
@@ -318,6 +318,14 @@
 		gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;		
 	}
 
+	if (lp_parm_bool(-1, "ntlmssp_client", "56bit", False)) {
+		gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56;		
+	}
+
+	if (lp_parm_bool(-1, "ntlmssp_client", "lm_key", False)) {
+		gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
+	}
+
 	if (lp_parm_bool(-1, "ntlmssp_client", "keyexchange", True)) {
 		gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH;		
 	}



More information about the samba-cvs mailing list