6 files changed, 73 insertions, 42 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 6b42418be8..ecf4d539d8 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -87,10 +87,9 @@ typedef struct auth_serversupplied_info
 	
 	NT_USER_TOKEN *ptok;
 	
-	uint8 session_key[16];
+	DATA_BLOB nt_session_key;
+	DATA_BLOB lm_session_key;
 	
-	uint8 first_8_lm_hash[8];
-
 	uint32 sam_fill_level;  /* How far is this structure filled? */
 	
 	SAM_ACCOUNT *sam_account;
@@ -107,6 +106,8 @@ struct auth_context {
 	/* Who set this up in the first place? */ 
 	const char *challenge_set_by; 
 
+	BOOL challenge_may_be_modified;
+
 	struct auth_methods *challenge_set_method; 
 	/* What order are the various methods in?   Try to stop it changing under us */ 
 	struct auth_methods *auth_method_list;	
diff --git a/source3/include/client.h b/source3/include/client.h
index 598e6c0bda..968b73f0b4 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -113,7 +113,7 @@ struct cli_state {
 
 	/* the session key for this CLI, outside 
 	   any per-pipe authenticaion */
-	unsigned char user_session_key[16];
+	DATA_BLOB user_session_key;
 
 	/*
 	 * Only used in NT domain calls.
@@ -133,7 +133,7 @@ struct cli_state {
                                               schannel. */
 	struct netsec_auth_struct auth_info;
 
-	NTLMSSP_CLIENT_STATE *ntlmssp_pipe_state;
+	NTLMSSP_STATE *ntlmssp_pipe_state;
 
 	unsigned char sess_key[16];        /* Current session key. */
 	DOM_CRED clnt_cred;                /* Client credential. */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ebb09b6c6c..638648dc44 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1298,7 +1298,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
 void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
-BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16], BOOL remote);
+BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote);
 #endif /* HAVE_KRB5 */
 
 /* TRUE and FALSE are part of the C99 standard and gcc, but
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 3fe8f41d8d..b1a4107980 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -229,7 +229,7 @@ typedef struct pipes_struct
 	fstring pipe_user_name;
 	struct current_user pipe_user;
 
-	uint8 session_key[16];
+	DATA_BLOB session_key;
 
 	/*
 	 * Set to true when an RPC bind has been done on this pipe.
diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index f1b1bc25e4..681d4071db 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -30,6 +30,7 @@ enum NTLMSSP_ROLE
 /* NTLMSSP message types */
 enum NTLM_MESSAGE_TYPE
 {
+	NTLMSSP_INITIAL = 0 /* samba internal state */,
 	NTLMSSP_NEGOTIATE = 1,
 	NTLMSSP_CHALLENGE = 2,
 	NTLMSSP_AUTH      = 3,
@@ -70,29 +71,10 @@ enum NTLM_MESSAGE_TYPE
 typedef struct ntlmssp_state 
 {
 	TALLOC_CTX *mem_ctx;
+	unsigned int ref_count;
 	enum NTLMSSP_ROLE role;
-	BOOL unicode;
-	char *user;
-	char *domain;
-	char *workstation;
- 	DATA_BLOB lm_resp;
-	DATA_BLOB nt_resp;
-	DATA_BLOB chal;
-	void *auth_context;
-	const uint8 *(*get_challenge)(struct ntlmssp_state *ntlmssp_state);
-	NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state);
-
-	const char *(*get_global_myname)(void);
-	const char *(*get_domain)(void);
-
-	int server_role;
+	enum server_types server_role;
 	uint32 expected_state;
-} NTLMSSP_STATE;
-
-typedef struct ntlmssp_client_state 
-{
-	TALLOC_CTX *mem_ctx;
-	unsigned int ref_count;
 
 	BOOL unicode;
 	BOOL use_ntlmv2;
@@ -102,30 +84,78 @@ typedef struct ntlmssp_client_state
 	char *password;
 	char *server_domain;
 
-	const char *(*get_global_myname)(void);
-	const char *(*get_domain)(void);
+	DATA_BLOB internal_chal; /* Random challenge as supplied to the client for NTLM authentication */
 
-	DATA_BLOB chal;
+	DATA_BLOB chal; /* Random challenge as input into the actual NTLM (or NTLM2) authentication */
  	DATA_BLOB lm_resp;
 	DATA_BLOB nt_resp;
 	DATA_BLOB session_key;
 	
-	uint32 neg_flags;
+	uint32 neg_flags; /* the current state of negotiation with the NTLMSSP partner */
 	
+	void *auth_context;
+
+	/**
+	 * Callback to get the 'challenge' used for NTLM authentication.  
+	 *
+	 * @param ntlmssp_state This structure
+	 * @return 8 bytes of challnege data, determined by the server to be the challenge for NTLM authentication
+	 *
+	 */
+	const uint8 *(*get_challenge)(const struct ntlmssp_state *ntlmssp_state);
+
+	/**
+	 * Callback to find if the challenge used by NTLM authentication may be modified 
+	 *
+	 * The NTLM2 authentication scheme modifies the effective challenge, but this is not compatiable with the
+	 * current 'security=server' implementation..  
+	 *
+	 * @param ntlmssp_state This structure
+	 * @return Can the challenge be set to arbitary values?
+	 *
+	 */
+	BOOL (*may_set_challenge)(const struct ntlmssp_state *ntlmssp_state);
+
+	/**
+	 * Callback to set the 'challenge' used for NTLM authentication.  
+	 *
+	 * The callback may use the void *auth_context to store state information, but the same value is always available
+	 * from the DATA_BLOB chal on this structure.
+	 *
+	 * @param ntlmssp_state This structure
+	 * @param challange 8 bytes of data, agreed by the client and server to be the effective challenge for NTLM2 authentication
+	 *
+	 */
+	NTSTATUS (*set_challenge)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge);
+
+	/**
+	 * Callback to check the user's password.  
+	 *
+	 * The callback must reads the feilds of this structure for the information it needs on the user 
+	 * @param ntlmssp_state This structure
+	 * @param nt_session_key If an NT session key is returned by the authentication process, return it here
+	 * @param lm_session_key If an LM session key is returned by the authentication process, return it here
+	 *
+	 */
+	NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key);
+
+	const char *(*get_global_myname)(void);
+	const char *(*get_domain)(void);
+
 	/* SMB Signing */
 	
 	uint32 ntlmssp_seq_num;
 
 	/* ntlmv2 */
-	char cli_sign_const[16];
-	char cli_seal_const[16];
-	char srv_sign_const[16];
-	char srv_seal_const[16];
+	char send_sign_const[16];
+	char send_seal_const[16];
+	char recv_sign_const[16];
+	char recv_seal_const[16];
 
-	unsigned char cli_sign_hash[258];
-	unsigned char cli_seal_hash[258];
-	unsigned char srv_sign_hash[258];
-	unsigned char srv_seal_hash[258];
+	unsigned char send_sign_hash[258];
+	unsigned char send_seal_hash[258];
+	unsigned char recv_sign_hash[258];
+	unsigned char recv_seal_hash[258];
 
 	/* ntlmv1 */
 	unsigned char ntlmssp_hash[258];
@@ -135,5 +165,5 @@ typedef struct ntlmssp_client_state
 	   Store it here, until we need it */
 	DATA_BLOB stored_response; 
 	
-} NTLMSSP_CLIENT_STATE;
+} NTLMSSP_STATE;
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index e41b5834f7..4bd40216d7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1546,7 +1546,7 @@ typedef struct user_struct
 
 	NT_USER_TOKEN *nt_user_token;
 
-	uint8 session_key[16];
+	DATA_BLOB session_key;
 
 	char *session_keystr; /* used by utmp and pam session code.  
 				 TDB key string */