auth: Move the rest of the source4 gensec_ntlmssp code to the top level

The ntlmssp_server code will be in common shortly, and aside from a
symbol name or two, moving the client code causes no harm and makes
less mess.  We will also get the client code in common very soon.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>

5 files changed, 0 insertions, 1021 deletions

diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c
deleted file mode 100644
index 47903d161b..0000000000
--- a/source4/auth/ntlmssp/ntlmssp.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   handle NLTMSSP, client server side parsing
-
-   Copyright (C) Andrew Tridgell      2001
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2001-2005
-   Copyright (C) Stefan Metzmacher 2005
-
-   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/>.
-*/
-
-struct auth_session_info;
-
-#include "includes.h"
-#include "auth/ntlmssp/ntlmssp.h"
-#include "source4/auth/ntlmssp/proto.h"
-#include "../libcli/auth/libcli_auth.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
-#include "auth/gensec/gensec.h"
-#include "auth/gensec/gensec_proto.h"
-#include "auth/gensec/gensec_toplevel_proto.h"
-
-/**
- * Callbacks for NTLMSSP - for both client and server operating modes
- * 
- */
-
-static const struct ntlmssp_callbacks {
-	enum ntlmssp_role role;
-	enum ntlmssp_message_type command;
-	NTSTATUS (*sync_fn)(struct gensec_security *gensec_security,
-			    TALLOC_CTX *out_mem_ctx,
-			    DATA_BLOB in, DATA_BLOB *out);
-} ntlmssp_callbacks[] = {
-	{
-		.role		= NTLMSSP_CLIENT,
-		.command	= NTLMSSP_INITIAL,
-		.sync_fn	= ntlmssp_client_initial,
-	},{
-		.role		= NTLMSSP_SERVER,
-		.command	= NTLMSSP_NEGOTIATE,
-		.sync_fn	= gensec_ntlmssp_server_negotiate,
-	},{
-		.role		= NTLMSSP_CLIENT,
-		.command	= NTLMSSP_CHALLENGE,
-		.sync_fn	= ntlmssp_client_challenge,
-	},{
-		.role		= NTLMSSP_SERVER,
-		.command	= NTLMSSP_AUTH,
-		.sync_fn	= gensec_ntlmssp_server_auth,
-	}
-};
-
-
-static NTSTATUS gensec_ntlmssp_update_find(struct ntlmssp_state *ntlmssp_state,
-					   const DATA_BLOB input, uint32_t *idx)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(ntlmssp_state->callback_private,
-				      struct gensec_ntlmssp_context);
-	struct gensec_security *gensec_security = gensec_ntlmssp->gensec_security;
-	uint32_t ntlmssp_command;
-	uint32_t i;
-
-	if (ntlmssp_state->expected_state == NTLMSSP_DONE) {
-		/* We are strict here because other modules, which we
-		 * don't fully control (such as GSSAPI) are also
-		 * strict, but are tested less often */
-
-		DEBUG(1, ("Called NTLMSSP after state machine was 'done'\n"));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	if (!input.length) {
-		switch (ntlmssp_state->role) {
-		case NTLMSSP_CLIENT:
-			ntlmssp_command = NTLMSSP_INITIAL;
-			break;
-		case NTLMSSP_SERVER:
-			if (gensec_security->want_features & GENSEC_FEATURE_DATAGRAM_MODE) {
-				/* 'datagram' mode - no neg packet */
-				ntlmssp_command = NTLMSSP_NEGOTIATE;
-			} else {
-				/* This is normal in SPNEGO mech negotiation fallback */
-				DEBUG(2, ("Failed to parse NTLMSSP packet: zero length\n"));
-				return NT_STATUS_INVALID_PARAMETER;
-			}
-			break;
-		}
-	} else {
-		if (!msrpc_parse(ntlmssp_state,
-				 &input, "Cd",
-				 "NTLMSSP",
-				 &ntlmssp_command)) {
-			DEBUG(1, ("Failed to parse NTLMSSP packet, could not extract NTLMSSP command\n"));
-			dump_data(2, input.data, input.length);
-			return NT_STATUS_INVALID_PARAMETER;
-		}
-	}
-
-	if (ntlmssp_command != ntlmssp_state->expected_state) {
-		DEBUG(2, ("got NTLMSSP command %u, expected %u\n", ntlmssp_command, ntlmssp_state->expected_state));
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	for (i=0; i < ARRAY_SIZE(ntlmssp_callbacks); i++) {
-		if (ntlmssp_callbacks[i].role == ntlmssp_state->role &&
-		    ntlmssp_callbacks[i].command == ntlmssp_command) {
-			*idx = i;
-			return NT_STATUS_OK;
-		}
-	}
-
-	DEBUG(1, ("failed to find NTLMSSP callback for NTLMSSP mode %u, command %u\n", 
-		  ntlmssp_state->role, ntlmssp_command));
-		
-	return NT_STATUS_INVALID_PARAMETER;
-}
-
-/**
- * Next state function for the wrapped NTLMSSP state machine
- * 
- * @param gensec_security GENSEC state, initialised to NTLMSSP
- * @param out_mem_ctx The TALLOC_CTX for *out to be allocated on
- * @param in The request, as a DATA_BLOB
- * @param out The reply, as an talloc()ed DATA_BLOB, on *out_mem_ctx
- * @return Error, MORE_PROCESSING_REQUIRED if a reply is sent, 
- *                or NT_STATUS_OK if the user is authenticated. 
- */
-
-static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security, 
-				      TALLOC_CTX *out_mem_ctx, 
-				      struct tevent_context *ev,
-				      const DATA_BLOB input, DATA_BLOB *out)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-	NTSTATUS status;
-	uint32_t i;
-
-	*out = data_blob(NULL, 0);
-
-	if (!out_mem_ctx) {
-		/* if the caller doesn't want to manage/own the memory, 
-		   we can put it on our context */
-		out_mem_ctx = ntlmssp_state;
-	}
-
-	status = gensec_ntlmssp_update_find(ntlmssp_state, input, &i);
-	NT_STATUS_NOT_OK_RETURN(status);
-
-	status = ntlmssp_callbacks[i].sync_fn(gensec_security, out_mem_ctx, input, out);
-	NT_STATUS_NOT_OK_RETURN(status);
-	
-	return NT_STATUS_OK;
-}
-
-static const char *gensec_ntlmssp_oids[] = { 
-	GENSEC_OID_NTLMSSP, 
-	NULL
-};
-
-static const struct gensec_security_ops gensec_ntlmssp_security_ops = {
-	.name		= "ntlmssp",
-	.sasl_name	= GENSEC_SASL_NAME_NTLMSSP, /* "NTLM" */
-	.auth_type	= DCERPC_AUTH_TYPE_NTLMSSP,
-	.oid            = gensec_ntlmssp_oids,
-	.client_start   = gensec_ntlmssp_client_start,
-	.server_start   = gensec_ntlmssp_server_start,
-	.magic 	        = gensec_ntlmssp_magic,
-	.update 	= gensec_ntlmssp_update,
-	.sig_size	= gensec_ntlmssp_sig_size,
-	.sign_packet	= gensec_ntlmssp_sign_packet,
-	.check_packet	= gensec_ntlmssp_check_packet,
-	.seal_packet	= gensec_ntlmssp_seal_packet,
-	.unseal_packet	= gensec_ntlmssp_unseal_packet,
-	.wrap           = gensec_ntlmssp_wrap,
-	.unwrap         = gensec_ntlmssp_unwrap,
-	.session_key	= gensec_ntlmssp_session_key,
-	.session_info   = gensec_ntlmssp_session_info,
-	.have_feature   = gensec_ntlmssp_have_feature,
-	.enabled        = true,
-	.priority       = GENSEC_NTLMSSP
-};
-
-
-_PUBLIC_ NTSTATUS gensec_ntlmssp_init(void)
-{
-	NTSTATUS ret;
-
-	ret = gensec_register(&gensec_ntlmssp_security_ops);
-	if (!NT_STATUS_IS_OK(ret)) {
-		DEBUG(0,("Failed to register '%s' gensec backend!\n",
-			gensec_ntlmssp_security_ops.name));
-		return ret;
-	}
-
-	return ret;
-}
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
deleted file mode 100644
index 6e372dc8f8..0000000000
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   handle NLTMSSP, client server side parsing
-
-   Copyright (C) Andrew Tridgell      2001
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2001-2005
-   Copyright (C) Stefan Metzmacher 2005
-
-   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/>.
-*/
-
-struct auth_session_info;
-
-#include "includes.h"
-#include "auth/ntlmssp/ntlmssp.h"
-#include "source4/auth/ntlmssp/proto.h"
-#include "../lib/crypto/crypto.h"
-#include "../libcli/auth/libcli_auth.h"
-#include "auth/credentials/credentials.h"
-#include "auth/gensec/gensec.h"
-#include "param/param.h"
-#include "auth/ntlmssp/ntlmssp_private.h"
-#include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../auth/ntlmssp/ntlmssp_ndr.h"
-
-/*********************************************************************
- Client side NTLMSSP
-*********************************************************************/
-
-/**
- * Next state function for the Initial packet
- * 
- * @param ntlmssp_state NTLMSSP State
- * @param out_mem_ctx The DATA_BLOB *out will be allocated on this context
- * @param in A NULL data blob (input ignored)
- * @param out The initial negotiate request to the server, as an talloc()ed DATA_BLOB, on out_mem_ctx
- * @return Errors or NT_STATUS_OK. 
- */
-
-NTSTATUS ntlmssp_client_initial(struct gensec_security *gensec_security, 
-				TALLOC_CTX *out_mem_ctx, 
-				DATA_BLOB in, DATA_BLOB *out) 
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-	const char *domain = ntlmssp_state->client.netbios_domain;
-	const char *workstation = ntlmssp_state->client.netbios_name;
-	NTSTATUS status;
-
-	/* These don't really matter in the initial packet, so don't panic if they are not set */
-	if (!domain) {
-		domain = "";
-	}
-
-	if (!workstation) {
-		workstation = "";
-	}
-
-	if (ntlmssp_state->unicode) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
-	} else {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
-	}
-
-	if (ntlmssp_state->use_ntlmv2) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
-	}
-
-	/* generate the ntlmssp negotiate packet */
-	status = msrpc_gen(out_mem_ctx,
-		  out, "CddAA",
-		  "NTLMSSP",
-		  NTLMSSP_NEGOTIATE,
-		  ntlmssp_state->neg_flags,
-		  domain,
-		  workstation);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("ntlmssp_client_initial: failed to generate "
-			  "ntlmssp negotiate packet\n"));
-		return status;
-	}
-
-	if (DEBUGLEVEL >= 10) {
-		struct NEGOTIATE_MESSAGE *negotiate = talloc(
-			talloc_tos(), struct NEGOTIATE_MESSAGE);
-		if (negotiate != NULL) {
-			status = ntlmssp_pull_NEGOTIATE_MESSAGE(
-				out, negotiate, negotiate);
-			if (NT_STATUS_IS_OK(status)) {
-				NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE,
-						negotiate);
-			}
-			TALLOC_FREE(negotiate);
-		}
-	}
-
-	ntlmssp_state->expected_state = NTLMSSP_CHALLENGE;
-
-	return NT_STATUS_MORE_PROCESSING_REQUIRED;
-}
-
-/**
- * Next state function for the Challenge Packet.  Generate an auth packet.
- * 
- * @param gensec_security GENSEC state
- * @param out_mem_ctx Memory context for *out
- * @param in The server challnege, as a DATA_BLOB.  reply.data must be NULL
- * @param out The next request (auth packet) to the server, as an allocated DATA_BLOB, on the out_mem_ctx context
- * @return Errors or NT_STATUS_OK. 
- */
-
-NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security, 
-				  TALLOC_CTX *out_mem_ctx,
-				  const DATA_BLOB in, DATA_BLOB *out) 
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-	uint32_t chal_flags, ntlmssp_command, unkn1, unkn2;
-	DATA_BLOB server_domain_blob;
-	DATA_BLOB challenge_blob;
-	DATA_BLOB target_info = data_blob(NULL, 0);
-	char *server_domain;
-	const char *chal_parse_string;
-	const char *auth_gen_string;
-	DATA_BLOB lm_response = data_blob(NULL, 0);
-	DATA_BLOB nt_response = data_blob(NULL, 0);
-	DATA_BLOB session_key = data_blob(NULL, 0);
-	DATA_BLOB lm_session_key = data_blob(NULL, 0);
-	DATA_BLOB encrypted_session_key = data_blob(NULL, 0);
-	NTSTATUS nt_status;
-	int flags = 0;
-	const char *user, *domain;
-
-	TALLOC_CTX *mem_ctx = talloc_new(out_mem_ctx);
-	if (!mem_ctx) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	if (!msrpc_parse(mem_ctx,
-			 &in, "CdBd",
-			 "NTLMSSP",
-			 &ntlmssp_command, 
-			 &server_domain_blob,
-			 &chal_flags)) {
-		DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#1)\n"));
-		dump_data(2, in.data, in.length);
-		talloc_free(mem_ctx);
-
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-	
-	data_blob_free(&server_domain_blob);
-
-	DEBUG(3, ("Got challenge flags:\n"));
-	debug_ntlmssp_flags(chal_flags);
-
-	ntlmssp_handle_neg_flags(ntlmssp_state, chal_flags, ntlmssp_state->allow_lm_key);
-
-	if (ntlmssp_state->unicode) {
-		if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
-			chal_parse_string = "CdUdbddB";
-		} else {
-			chal_parse_string = "CdUdbdd";
-		}
-		auth_gen_string = "CdBBUUUBd";
-	} else {
-		if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
-			chal_parse_string = "CdAdbddB";
-		} else {
-			chal_parse_string = "CdAdbdd";
-		}
-
-		auth_gen_string = "CdBBAAABd";
-	}
-
-	if (!msrpc_parse(mem_ctx,
-			 &in, chal_parse_string,
-			 "NTLMSSP",
-			 &ntlmssp_command, 
-			 &server_domain,
-			 &chal_flags,
-			 &challenge_blob, 8,
-			 &unkn1, &unkn2,
-			 &target_info)) {
-		DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#2)\n"));
-		dump_data(2, in.data, in.length);
-		talloc_free(mem_ctx);
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	if (chal_flags & NTLMSSP_TARGET_TYPE_SERVER) {
-		ntlmssp_state->server.is_standalone = true;
-	} else {
-		ntlmssp_state->server.is_standalone = false;
-	}
-	/* TODO: parse struct_blob and fill in the rest */
-	ntlmssp_state->server.netbios_name = "";
-	ntlmssp_state->server.netbios_domain = server_domain;
-	ntlmssp_state->server.dns_name = "";
-	ntlmssp_state->server.dns_domain = "";
-
-	if (challenge_blob.length != 8) {
-		talloc_free(mem_ctx);
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	cli_credentials_get_ntlm_username_domain(gensec_security->credentials, mem_ctx, 
-						 &user, &domain);
-
-	if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
-		flags |= CLI_CRED_NTLM2;
-	}
-	if (ntlmssp_state->use_ntlmv2) {
-		flags |= CLI_CRED_NTLMv2_AUTH;
-	}
-	if (ntlmssp_state->use_nt_response) {
-		flags |= CLI_CRED_NTLM_AUTH;
-	}
-	if (lpcfg_client_lanman_auth(gensec_security->settings->lp_ctx)) {
-		flags |= CLI_CRED_LANMAN_AUTH;
-	}
-
-	nt_status = cli_credentials_get_ntlm_response(gensec_security->credentials, mem_ctx, 
-						      &flags, challenge_blob, target_info,
-						      &lm_response, &nt_response, 
-						      &lm_session_key, &session_key);
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		return nt_status;
-	}
-	
-	if (!(flags & CLI_CRED_LANMAN_AUTH)) {
-		/* LM Key is still possible, just silly, so we do not
-		 * allow it. Fortunetly all LM crypto is off by
-		 * default and we require command line options to end
-		 * up here */
-		ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-	}
-
-	if (!(flags & CLI_CRED_NTLM2)) {
-		/* NTLM2 is incompatible... */
-		ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
-	}
-	
-	if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY)
-	    && lpcfg_client_lanman_auth(gensec_security->settings->lp_ctx) && lm_session_key.length == 16) {
-		DATA_BLOB new_session_key = data_blob_talloc(mem_ctx, NULL, 16);
-		if (lm_response.length == 24) {
-			SMBsesskeygen_lm_sess_key(lm_session_key.data, lm_response.data, 
-						  new_session_key.data);
-		} else {
-			static const uint8_t zeros[24];
-			SMBsesskeygen_lm_sess_key(lm_session_key.data, zeros,
-						  new_session_key.data);
-		}
-		session_key = new_session_key;
-		dump_data_pw("LM session key\n", session_key.data, session_key.length);
-	}
-
-
-	/* Key exchange encryptes a new client-generated session key with
-	   the password-derived key */
-	if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
-		/* Make up a new session key */
-		uint8_t client_session_key[16];
-		generate_secret_buffer(client_session_key, sizeof(client_session_key));
-
-		/* Encrypt the new session key with the old one */
-		encrypted_session_key = data_blob_talloc(ntlmssp_state,
-							 client_session_key, sizeof(client_session_key));
-		dump_data_pw("KEY_EXCH session key:\n", encrypted_session_key.data, encrypted_session_key.length);
-		arcfour_crypt(encrypted_session_key.data, session_key.data, encrypted_session_key.length);
-		dump_data_pw("KEY_EXCH session key (enc):\n", encrypted_session_key.data, encrypted_session_key.length);
-
-		/* Mark the new session key as the 'real' session key */
-		session_key = data_blob_talloc(mem_ctx, client_session_key, sizeof(client_session_key));
-	}
-
-	DEBUG(3, ("NTLMSSP: Set final flags:\n"));
-	debug_ntlmssp_flags(ntlmssp_state->neg_flags);
-
-	/* this generates the actual auth packet */
-	nt_status = msrpc_gen(mem_ctx, 
-		       out, auth_gen_string, 
-		       "NTLMSSP", 
-		       NTLMSSP_AUTH, 
-		       lm_response.data, lm_response.length,
-		       nt_response.data, nt_response.length,
-		       domain, 
-		       user, 
-		       cli_credentials_get_workstation(gensec_security->credentials),
-		       encrypted_session_key.data, encrypted_session_key.length,
-		       ntlmssp_state->neg_flags);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		talloc_free(mem_ctx);
-		return nt_status;
-	}
-
-	ntlmssp_state->session_key = session_key;
-	talloc_steal(ntlmssp_state, session_key.data);
-
-	talloc_steal(out_mem_ctx, out->data);
-
-	ntlmssp_state->chal = challenge_blob;
-	ntlmssp_state->lm_resp = lm_response;
-	talloc_steal(ntlmssp_state->lm_resp.data, lm_response.data);
-	ntlmssp_state->nt_resp = nt_response;
-	talloc_steal(ntlmssp_state->nt_resp.data, nt_response.data);
-
-	ntlmssp_state->expected_state = NTLMSSP_DONE;
-
-	if (gensec_security->want_features & (GENSEC_FEATURE_SIGN|GENSEC_FEATURE_SEAL)) {
-		nt_status = ntlmssp_sign_init(ntlmssp_state);
-		if (!NT_STATUS_IS_OK(nt_status)) {
-			DEBUG(1, ("Could not setup NTLMSSP signing/sealing system (error was: %s)\n", 
-				  nt_errstr(nt_status)));
-			talloc_free(mem_ctx);
-			return nt_status;
-		}
-	}
-
-	talloc_free(mem_ctx);
-	return NT_STATUS_OK;
-}
-
-NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp;
-	struct ntlmssp_state *ntlmssp_state;
-	NTSTATUS nt_status;
-
-	nt_status = gensec_ntlmssp_start(gensec_security);
-	NT_STATUS_NOT_OK_RETURN(nt_status);
-
-	gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-
-	ntlmssp_state = talloc_zero(gensec_ntlmssp,
-				    struct ntlmssp_state);
-	if (!ntlmssp_state) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	ntlmssp_state->callback_private = gensec_ntlmssp;
-
-	gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
-
-	ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-
-	ntlmssp_state->role = NTLMSSP_CLIENT;
-
-	ntlmssp_state->client.netbios_domain = lpcfg_workgroup(gensec_security->settings->lp_ctx);
-	ntlmssp_state->client.netbios_name = cli_credentials_get_workstation(gensec_security->credentials);
-
-	ntlmssp_state->unicode = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "unicode", true);
-
-	ntlmssp_state->use_nt_response = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "send_nt_reponse", true);
-
-	ntlmssp_state->allow_lm_key = (lpcfg_client_lanman_auth(gensec_security->settings->lp_ctx)
-					      && (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "allow_lm_key", false)
-						  || gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "lm_key", false)));
-
-	ntlmssp_state->use_ntlmv2 = lpcfg_client_ntlmv2_auth(gensec_security->settings->lp_ctx);
-
-	ntlmssp_state->expected_state = NTLMSSP_INITIAL;
-
-	ntlmssp_state->neg_flags =
-		NTLMSSP_NEGOTIATE_NTLM |
-		NTLMSSP_REQUEST_TARGET;
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "128bit", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "56bit", false)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "lm_key", false)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "keyexchange", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "alwayssign", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "ntlm2", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
-	} else {
-		/* apparently we can't do ntlmv2 if we don't do ntlm2 */
-		ntlmssp_state->use_ntlmv2 = false;
-	}
-
-	if (gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) {
-		/*
-		 * We need to set this to allow a later SetPassword
-		 * via the SAMR pipe to succeed. Strange.... We could
-		 * also add  NTLMSSP_NEGOTIATE_SEAL here. JRA.
-		 * 
-		 * Without this, Windows will not create the master key
-		 * that it thinks is only used for NTLMSSP signing and 
-		 * sealing.  (It is actually pulled out and used directly) 
-		 */
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-	}
-	if (gensec_security->want_features & GENSEC_FEATURE_SIGN) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-	}
-	if (gensec_security->want_features & GENSEC_FEATURE_SEAL) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
-	}
-
-	return NT_STATUS_OK;
-}
-
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
deleted file mode 100644
index 693613f5ec..0000000000
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   handle NLTMSSP, client server side parsing
-
-   Copyright (C) Andrew Tridgell      2001
-   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2001-2005
-   Copyright (C) Stefan Metzmacher 2005
-
-   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/>.
-*/
-
-#include "includes.h"
-#include "system/network.h"
-#include "lib/tsocket/tsocket.h"
-#include "auth/ntlmssp/ntlmssp.h"
-#include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "auth/ntlmssp/ntlmssp_ndr.h"
-#include "auth/ntlmssp/ntlmssp_private.h"
-#include "../libcli/auth/libcli_auth.h"
-#include "../lib/crypto/crypto.h"
-#include "auth/gensec/gensec.h"
-#include "auth/gensec/gensec_proto.h"
-#include "auth/auth.h"
-#include "param/param.h"
-#include "source4/auth/ntlmssp/proto.h"
-
-/**
- * Next state function for the Negotiate packet (GENSEC wrapper)
- *
- * @param gensec_security GENSEC state
- * @param out_mem_ctx Memory context for *out
- * @param in The request, as a DATA_BLOB.  reply.data must be NULL
- * @param out The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or MORE_PROCESSING_REQUIRED if (normal) a reply is required.
- */
-
-NTSTATUS gensec_ntlmssp_server_negotiate(struct gensec_security *gensec_security,
-					 TALLOC_CTX *out_mem_ctx,
-					 const DATA_BLOB request, DATA_BLOB *reply)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-	return ntlmssp_server_negotiate(ntlmssp_state, out_mem_ctx, request, reply);
-}
-
-/**
- * Next state function for the Authenticate packet (GENSEC wrapper)
- *
- * @param gensec_security GENSEC state
- * @param out_mem_ctx Memory context for *out
- * @param in The request, as a DATA_BLOB.  reply.data must be NULL
- * @param out The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK if authentication sucessful
- */
-
-NTSTATUS gensec_ntlmssp_server_auth(struct gensec_security *gensec_security,
-				    TALLOC_CTX *out_mem_ctx,
-				    const DATA_BLOB in, DATA_BLOB *out)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-	return ntlmssp_server_auth(ntlmssp_state, out_mem_ctx, in, out);
-}
-
-/**
- * Return the challenge as determined by the authentication subsystem 
- * @return an 8 byte random challenge
- */
-
-static NTSTATUS auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state,
-					   uint8_t chal[8])
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(ntlmssp_state->callback_private,
-				      struct gensec_ntlmssp_context);
-	struct auth4_context *auth_context = gensec_ntlmssp->gensec_security->auth_context;
-	NTSTATUS status = NT_STATUS_NOT_IMPLEMENTED;
-
-	if (auth_context->get_challenge) {
-		status = auth_context->get_challenge(auth_context, chal);
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(1, ("auth_ntlmssp_get_challenge: failed to get challenge: %s\n",
-				  nt_errstr(status)));
-			return status;
-		}
-	}
-
-	return status;
-}
-
-/**
- * Some authentication methods 'fix' the challenge, so we may not be able to set it
- *
- * @return If the effective challenge used by the auth subsystem may be modified
- */
-static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(ntlmssp_state->callback_private,
-				      struct gensec_ntlmssp_context);
-	struct auth4_context *auth_context = gensec_ntlmssp->gensec_security->auth_context;
-
-	if (auth_context->challenge_may_be_modified) {
-		return auth_context->challenge_may_be_modified(auth_context);
-	}
-	return false;
-}
-
-/**
- * NTLM2 authentication modifies the effective challenge, 
- * @param challenge The new challenge value
- */
-static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(ntlmssp_state->callback_private,
-				      struct gensec_ntlmssp_context);
-	struct auth4_context *auth_context = gensec_ntlmssp->gensec_security->auth_context;
-	NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
-	const uint8_t *chal;
-
-	if (challenge->length != 8) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	chal = challenge->data;
-
-	if (auth_context->set_challenge) {
-		nt_status = auth_context->set_challenge(auth_context,
-							chal,
-							"NTLMSSP callback (NTLM2)");
-	}
-	return nt_status;
-}
-
-/**
- * Check the password on an NTLMSSP login.  
- *
- * Return the session keys used on the connection.
- */
-
-static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
-					    TALLOC_CTX *mem_ctx,
-					    DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key)
-{
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(ntlmssp_state->callback_private,
-				      struct gensec_ntlmssp_context);
-	struct auth4_context *auth_context = gensec_ntlmssp->gensec_security->auth_context;
-	NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
-	struct auth_usersupplied_info *user_info;
-
-	user_info = talloc_zero(ntlmssp_state, struct auth_usersupplied_info);
-	if (!user_info) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	user_info->logon_parameters = MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT | MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT;
-	user_info->flags = 0;
-	user_info->mapped_state = false;
-	user_info->client.account_name = ntlmssp_state->user;
-	user_info->client.domain_name = ntlmssp_state->domain;
-	user_info->workstation_name = ntlmssp_state->client.netbios_name;
-	user_info->remote_host = gensec_get_remote_address(gensec_ntlmssp->gensec_security);
-
-	user_info->password_state = AUTH_PASSWORD_RESPONSE;
-	user_info->password.response.lanman = ntlmssp_state->lm_resp;
-	user_info->password.response.lanman.data = talloc_steal(user_info, ntlmssp_state->lm_resp.data);
-	user_info->password.response.nt = ntlmssp_state->nt_resp;
-	user_info->password.response.nt.data = talloc_steal(user_info, ntlmssp_state->nt_resp.data);
-
-	if (auth_context->check_password) {
-		nt_status = auth_context->check_password(auth_context,
-							 gensec_ntlmssp,
-							 user_info,
-							 &gensec_ntlmssp->server_returned_info,
-							 user_session_key, lm_session_key);
-	}
-	talloc_free(user_info);
-	NT_STATUS_NOT_OK_RETURN(nt_status);
-
-	talloc_steal(mem_ctx, user_session_key->data);
-	talloc_steal(mem_ctx, lm_session_key->data);
-	
-	return nt_status;
-}
-
-/** 
- * Return the credentials of a logged on user, including session keys
- * etc.
- *
- * Only valid after a successful authentication
- *
- * May only be called once per authentication.
- *
- */
-
-NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security,
-				     TALLOC_CTX *mem_ctx,
-				     struct auth_session_info **session_info) 
-{
-	NTSTATUS nt_status;
-	struct gensec_ntlmssp_context *gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-	uint32_t session_info_flags = 0;
-
-	if (gensec_security->want_features & GENSEC_FEATURE_UNIX_TOKEN) {
-		session_info_flags |= AUTH_SESSION_INFO_UNIX_TOKEN;
-	}
-
-	session_info_flags |= AUTH_SESSION_INFO_DEFAULT_GROUPS;
-
-	if (gensec_security->auth_context && gensec_security->auth_context->generate_session_info) {
-		nt_status = gensec_security->auth_context->generate_session_info(mem_ctx, gensec_security->auth_context,
-										 gensec_ntlmssp->server_returned_info,
-										 gensec_ntlmssp->ntlmssp_state->user,
-										 session_info_flags,
-										 session_info);
-	} else {
-		DEBUG(0, ("Cannot generate a session_info without the auth_context\n"));
-		return NT_STATUS_INTERNAL_ERROR;
-	}
-	
-	NT_STATUS_NOT_OK_RETURN(nt_status);
-
-	return gensec_ntlmssp_session_key(gensec_security, *session_info,
-					  &(*session_info)->session_key);
-}
-
-/**
- * Start NTLMSSP on the server side 
- *
- */
-NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
-{
-	NTSTATUS nt_status;
-	struct ntlmssp_state *ntlmssp_state;
-	struct gensec_ntlmssp_context *gensec_ntlmssp;
-
-	nt_status = gensec_ntlmssp_start(gensec_security);
-	NT_STATUS_NOT_OK_RETURN(nt_status);
-
-	gensec_ntlmssp =
-		talloc_get_type_abort(gensec_security->private_data,
-				      struct gensec_ntlmssp_context);
-
-	ntlmssp_state = talloc_zero(gensec_ntlmssp,
-				    struct ntlmssp_state);
-	if (!ntlmssp_state) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	ntlmssp_state->callback_private = gensec_ntlmssp;
-
-	gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
-
-	ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-
-	ntlmssp_state->role = NTLMSSP_SERVER;
-
-	ntlmssp_state->expected_state = NTLMSSP_NEGOTIATE;
-
-	ntlmssp_state->allow_lm_key = (lpcfg_lanman_auth(gensec_security->settings->lp_ctx)
-					  && gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "allow_lm_key", false));
-
-	ntlmssp_state->neg_flags =
-		NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_VERSION;
-
-	ntlmssp_state->lm_resp = data_blob(NULL, 0);
-	ntlmssp_state->nt_resp = data_blob(NULL, 0);
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "128bit", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "56bit", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "keyexchange", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "alwayssign", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
-	}
-
-	if (gensec_setting_bool(gensec_security->settings, "ntlmssp_server", "ntlm2", true)) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
-	}
-
-	if (gensec_security->want_features & GENSEC_FEATURE_SIGN) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-	}
-	if (gensec_security->want_features & GENSEC_FEATURE_SEAL) {
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
-		ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
-	}
-
-	ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge;
-	ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge;
-	ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge;
-	ntlmssp_state->check_password = auth_ntlmssp_check_password;
-	if (lpcfg_server_role(gensec_security->settings->lp_ctx) == ROLE_STANDALONE) {
-		ntlmssp_state->server.is_standalone = true;
-	} else {
-		ntlmssp_state->server.is_standalone = false;
-	}
-
-	ntlmssp_state->server.netbios_name = lpcfg_netbios_name(gensec_security->settings->lp_ctx);
-
-	ntlmssp_state->server.netbios_domain = lpcfg_workgroup(gensec_security->settings->lp_ctx);
-
-	{
-		const char *dnsdomain = lpcfg_dnsdomain(gensec_security->settings->lp_ctx);
-		char *dnsname, *lower_netbiosname;
-		lower_netbiosname = strlower_talloc(ntlmssp_state, ntlmssp_state->server.netbios_name);
-
-		/* Find out the DNS host name */
-		if (dnsdomain && dnsdomain[0] != '\0') {
-			dnsname = talloc_asprintf(ntlmssp_state, "%s.%s",
-						  lower_netbiosname,
-						  dnsdomain);
-			talloc_free(lower_netbiosname);
-			ntlmssp_state->server.dns_name = dnsname;
-		} else {
-			ntlmssp_state->server.dns_name = lower_netbiosname;
-		}
-
-		NT_STATUS_HAVE_NO_MEMORY(ntlmssp_state->server.dns_name);
-
-		ntlmssp_state->server.dns_domain
-			= talloc_strdup(ntlmssp_state,
-					lpcfg_dnsdomain(gensec_security->settings->lp_ctx));
-		NT_STATUS_HAVE_NO_MEMORY(ntlmssp_state->server.dns_domain);
-	}
-
-	return NT_STATUS_OK;
-}
-
diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build
deleted file mode 100644
index 4d25271a8b..0000000000
--- a/source4/auth/ntlmssp/wscript_build
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_MODULE('gensec_ntlmssp',
-	source='''ntlmssp.c
-                  ntlmssp_client.c ntlmssp_server.c''',
-	autoproto='proto.h',
-	subsystem='gensec',
-	init_function='gensec_ntlmssp_init',
-	deps='samba-credentials NTLMSSP_COMMON',
-	internal_module=True
-	)
-
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index ebee49b89c..3b43a62b2a 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -2,7 +2,6 @@
 
 bld.RECURSE('gensec')
 bld.RECURSE('kerberos')
-bld.RECURSE('ntlmssp')
 bld.RECURSE('ntlm')
 
 bld.SAMBA_SUBSYSTEM('auth_session',