libcli/auth Make gd's NDR NTLMSSP parsers helpers common
[ira/wip.git] / source3 / libsmb / ntlmssp.c
index 66dc6e08eb82bf7b0b95665c26c9dd7491cd6ff3..84cba43063b2dd7404ee14a04402cb24a8d1f868 100644 (file)
-/* 
+/*
    Unix SMB/Netbios implementation.
    Version 3.0
    handle NLTMSSP, server side
 
    Copyright (C) Andrew Tridgell      2001
    Copyright (C) Andrew Bartlett 2001-2003
+   Copyright (C) Andrew Bartlett 2005 (Updated from gensec).
 
    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 2 of the License, or
+   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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_ntlmssp.h"
+#include "../libcli/auth/ntlmssp_ndr.h"
+
+static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+                                      DATA_BLOB reply, DATA_BLOB *next_request);
+static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
+                                        const DATA_BLOB in, DATA_BLOB *out);
+static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
+                                        const DATA_BLOB reply, DATA_BLOB *next_request);
+static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
+                                   const DATA_BLOB request, DATA_BLOB *reply);
 
 /**
- * Print out the NTLMSSP flags for debugging 
+ * Callbacks for NTLMSSP - for both client and server operating modes
+ *
+ */
+
+static const struct ntlmssp_callbacks {
+       enum NTLMSSP_ROLE role;
+       enum NTLM_MESSAGE_TYPE ntlmssp_command;
+       NTSTATUS (*fn)(struct ntlmssp_state *ntlmssp_state,
+                      DATA_BLOB in, DATA_BLOB *out);
+} ntlmssp_callbacks[] = {
+       {NTLMSSP_CLIENT, NTLMSSP_INITIAL, ntlmssp_client_initial},
+       {NTLMSSP_SERVER, NTLMSSP_NEGOTIATE, ntlmssp_server_negotiate},
+       {NTLMSSP_CLIENT, NTLMSSP_CHALLENGE, ntlmssp_client_challenge},
+       {NTLMSSP_SERVER, NTLMSSP_AUTH, ntlmssp_server_auth},
+       {NTLMSSP_CLIENT, NTLMSSP_UNKNOWN, NULL},
+       {NTLMSSP_SERVER, NTLMSSP_UNKNOWN, NULL}
+};
+
+
+/**
+ * Print out the NTLMSSP flags for debugging
  * @param neg_flags The flags from the packet
  */
 
 void debug_ntlmssp_flags(uint32 neg_flags)
 {
        DEBUG(3,("Got NTLMSSP neg_flags=0x%08x\n", neg_flags));
-       
-       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) 
+
+       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_UNICODE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_OEM) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_OEM)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM\n"));
-       if (neg_flags & NTLMSSP_REQUEST_TARGET) 
+       if (neg_flags & NTLMSSP_REQUEST_TARGET)
                DEBUGADD(4, ("  NTLMSSP_REQUEST_TARGET\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SIGN) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_SIGN)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SIGN\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SEAL) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_SEAL)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SEAL\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_DATAGRAM)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_DATAGRAM\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_LM_KEY)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_LM_KEY\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NETWARE) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_NETWARE)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NETWARE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NTLM\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_ALWAYS_SIGN\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM2) 
+       if (neg_flags & NTLMSSP_REQUEST_NON_NT_SESSION_KEY)
+               DEBUGADD(4, ("  NTLMSSP_REQUEST_NON_NT_SESSION_KEY\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM2)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NTLM2\n"));
-       if (neg_flags & NTLMSSP_CHAL_TARGET_INFO) 
-               DEBUGADD(4, ("  NTLMSSP_CHAL_TARGET_INFO\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_128) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_TARGET_INFO)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_TARGET_INFO\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_VERSION)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_VERSION\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_128)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_128\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) 
+       if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)
                DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_KEY_EXCH\n"));
+       if (neg_flags & NTLMSSP_NEGOTIATE_56)
+               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_56\n"));
 }
 
 /**
  * Default challenge generation code.
  *
  */
-   
-static const uint8 *get_challenge(struct ntlmssp_state *ntlmssp_state)
+
+static void get_challenge(const struct ntlmssp_state *ntlmssp_state,
+                         uint8_t chal[8])
+{
+       generate_random_buffer(chal, 8);
+}
+
+/**
+ * Default 'we can set the challenge to anything we like' implementation
+ *
+ */
+
+static bool may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
 {
-       static uchar chal[8];
-       generate_random_buffer(chal, sizeof(chal), False);
+       return True;
+}
 
-       return chal;
+/**
+ * Default 'we can set the challenge to anything we like' implementation
+ *
+ * Does not actually do anything, as the value is always in the structure anyway.
+ *
+ */
+
+static NTSTATUS set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
+{
+       SMB_ASSERT(challenge->length == 8);
+       return NT_STATUS_OK;
 }
 
 /**
- * Determine correct target name flags for reply, given server role 
+ * Set a username on an NTLMSSP context - ensures it is talloc()ed
+ *
+ */
+
+NTSTATUS ntlmssp_set_username(NTLMSSP_STATE *ntlmssp_state, const char *user)
+{
+       ntlmssp_state->user = talloc_strdup(ntlmssp_state, user ? user : "" );
+       if (!ntlmssp_state->user) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
+}
+
+/**
+ * Store NT and LM hashes on an NTLMSSP context - ensures they are talloc()ed
+ *
+ */
+NTSTATUS ntlmssp_set_hashes(NTLMSSP_STATE *ntlmssp_state,
+               const unsigned char lm_hash[16],
+               const unsigned char nt_hash[16])
+{
+       ntlmssp_state->lm_hash = (unsigned char *)
+               TALLOC_MEMDUP(ntlmssp_state, lm_hash, 16);
+       ntlmssp_state->nt_hash = (unsigned char *)
+               TALLOC_MEMDUP(ntlmssp_state, nt_hash, 16);
+       if (!ntlmssp_state->lm_hash || !ntlmssp_state->nt_hash) {
+               TALLOC_FREE(ntlmssp_state->lm_hash);
+               TALLOC_FREE(ntlmssp_state->nt_hash);
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
+}
+
+/**
+ * Converts a password to the hashes on an NTLMSSP context.
+ *
+ */
+NTSTATUS ntlmssp_set_password(NTLMSSP_STATE *ntlmssp_state, const char *password)
+{
+       if (!password) {
+               ntlmssp_state->lm_hash = NULL;
+               ntlmssp_state->nt_hash = NULL;
+       } else {
+               unsigned char lm_hash[16];
+               unsigned char nt_hash[16];
+
+               E_deshash(password, lm_hash);
+               E_md4hash(password, nt_hash);
+               return ntlmssp_set_hashes(ntlmssp_state, lm_hash, nt_hash);
+       }
+       return NT_STATUS_OK;
+}
+
+/**
+ * Set a domain on an NTLMSSP context - ensures it is talloc()ed
+ *
+ */
+NTSTATUS ntlmssp_set_domain(NTLMSSP_STATE *ntlmssp_state, const char *domain)
+{
+       ntlmssp_state->domain = talloc_strdup(ntlmssp_state,
+                                             domain ? domain : "" );
+       if (!ntlmssp_state->domain) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
+}
+
+/**
+ * Set a workstation on an NTLMSSP context - ensures it is talloc()ed
+ *
+ */
+NTSTATUS ntlmssp_set_workstation(NTLMSSP_STATE *ntlmssp_state, const char *workstation)
+{
+       ntlmssp_state->workstation = talloc_strdup(ntlmssp_state, workstation);
+       if (!ntlmssp_state->workstation) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       return NT_STATUS_OK;
+}
+
+/**
+ *  Store a DATA_BLOB containing an NTLMSSP response, for use later.
+ *  This copies the data blob
+ */
+
+NTSTATUS ntlmssp_store_response(NTLMSSP_STATE *ntlmssp_state,
+                               DATA_BLOB response)
+{
+       ntlmssp_state->stored_response = data_blob_talloc(ntlmssp_state,
+                                                         response.data,
+                                                         response.length);
+       return NT_STATUS_OK;
+}
+
+/**
+ * Request features for the NTLMSSP negotiation
+ *
+ * @param ntlmssp_state NTLMSSP state
+ * @param feature_list List of space seperated features requested from NTLMSSP.
+ */
+void ntlmssp_want_feature_list(NTLMSSP_STATE *ntlmssp_state, char *feature_list)
+{
+       /*
+        * 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.
+        */
+       if (in_list("NTLMSSP_FEATURE_SESSION_KEY", feature_list, True)) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
+       }
+       if (in_list("NTLMSSP_FEATURE_SIGN", feature_list, True)) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
+       }
+       if(in_list("NTLMSSP_FEATURE_SEAL", feature_list, True)) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
+       }
+}
+
+/**
+ * Request a feature for the NTLMSSP negotiation
+ *
+ * @param ntlmssp_state NTLMSSP state
+ * @param feature Bit flag specifying the requested feature
+ */
+void ntlmssp_want_feature(NTLMSSP_STATE *ntlmssp_state, uint32 feature)
+{
+       /* As per JRA's comment above */
+       if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
+       }
+       if (feature & NTLMSSP_FEATURE_SIGN) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
+       }
+       if (feature & NTLMSSP_FEATURE_SEAL) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
+       }
+}
+
+/**
+ * Next state function for the NTLMSSP state machine
+ *
+ * @param ntlmssp_state NTLMSSP State
+ * @param in The packet in from the NTLMSSP partner, as a DATA_BLOB
+ * @param out The reply, as an allocated DATA_BLOB, caller to free.
+ * @return Errors, NT_STATUS_MORE_PROCESSING_REQUIRED or NT_STATUS_OK.
+ */
+
+NTSTATUS ntlmssp_update(NTLMSSP_STATE *ntlmssp_state,
+                       const DATA_BLOB in, DATA_BLOB *out)
+{
+       DATA_BLOB input;
+       uint32 ntlmssp_command;
+       int i;
+
+       if (ntlmssp_state->expected_state == NTLMSSP_DONE) {
+               /* Called update after negotiations finished. */
+               DEBUG(1, ("Called NTLMSSP after state machine was 'done'\n"));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       *out = data_blob_null;
+
+       if (!in.length && ntlmssp_state->stored_response.length) {
+               input = ntlmssp_state->stored_response;
+
+               /* we only want to read the stored response once - overwrite it */
+               ntlmssp_state->stored_response = data_blob_null;
+       } else {
+               input = in;
+       }
+
+       if (!input.length) {
+               switch (ntlmssp_state->role) {
+               case NTLMSSP_CLIENT:
+                       ntlmssp_command = NTLMSSP_INITIAL;
+                       break;
+               case NTLMSSP_SERVER:
+                       /* 'datagram' mode - no neg packet */
+                       ntlmssp_command = NTLMSSP_NEGOTIATE;
+                       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(1, ("got NTLMSSP command %u, expected %u\n", ntlmssp_command, ntlmssp_state->expected_state));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       for (i=0; ntlmssp_callbacks[i].fn; i++) {
+               if (ntlmssp_callbacks[i].role == ntlmssp_state->role
+                   && ntlmssp_callbacks[i].ntlmssp_command == ntlmssp_command) {
+                       return ntlmssp_callbacks[i].fn(ntlmssp_state, input, out);
+               }
+       }
+
+       DEBUG(1, ("failed to find NTLMSSP callback for NTLMSSP mode %u, command %u\n",
+                 ntlmssp_state->role, ntlmssp_command));
+
+       return NT_STATUS_INVALID_PARAMETER;
+}
+
+/**
+ * End an NTLMSSP state machine
+ *
+ * @param ntlmssp_state NTLMSSP State, free()ed by this function
+ */
+
+void ntlmssp_end(NTLMSSP_STATE **ntlmssp_state)
+{
+       (*ntlmssp_state)->ref_count--;
+
+       if ((*ntlmssp_state)->ref_count == 0) {
+               data_blob_free(&(*ntlmssp_state)->chal);
+               data_blob_free(&(*ntlmssp_state)->lm_resp);
+               data_blob_free(&(*ntlmssp_state)->nt_resp);
+               TALLOC_FREE(*ntlmssp_state);
+       }
+
+       *ntlmssp_state = NULL;
+       return;
+}
+
+/**
+ * Determine correct target name flags for reply, given server role
  * and negotiated flags
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param neg_flags The flags from the packet
  * @param chal_flags The flags to be set in the reply packet
@@ -90,10 +382,10 @@ static const uint8 *get_challenge(struct ntlmssp_state *ntlmssp_state)
  */
 
 static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
-                                      uint32 neg_flags, uint32 *chal_flags) 
+                                      uint32 neg_flags, uint32 *chal_flags)
 {
        if (neg_flags & NTLMSSP_REQUEST_TARGET) {
-               *chal_flags |= NTLMSSP_CHAL_TARGET_INFO;
+               *chal_flags |= NTLMSSP_NEGOTIATE_TARGET_INFO;
                *chal_flags |= NTLMSSP_REQUEST_TARGET;
                if (ntlmssp_state->server_role == ROLE_STANDALONE) {
                        *chal_flags |= NTLMSSP_TARGET_TYPE_SERVER;
@@ -107,25 +399,127 @@ static const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
        }
 }
 
+static void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+                                     uint32 neg_flags, bool allow_lm) {
+       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
+               ntlmssp_state->unicode = True;
+       } else {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_UNICODE;
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
+               ntlmssp_state->unicode = False;
+       }
+
+       if ((neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) && allow_lm) {
+               /* other end forcing us to use LM */
+               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
+               ntlmssp_state->use_ntlmv2 = False;
+       } else {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_NTLM2)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_128)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_56)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_56;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_KEY_EXCH;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SIGN;
+       }
+
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SEAL;
+       }
+
+       /* Woop Woop - unknown flag for Windows compatibility...
+          What does this really do ? JRA. */
+       if (!(neg_flags & NTLMSSP_NEGOTIATE_VERSION)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_VERSION;
+       }
+
+       if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
+               ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET;
+       }
+}
+
+/**
+ Weaken NTLMSSP keys to cope with down-level clients and servers.
+
+ We probably should have some parameters to control this, but as
+ it only occours for LM_KEY connections, and this is controlled
+ by the client lanman auth/lanman auth parameters, it isn't too bad.
+*/
+
+DATA_BLOB ntlmssp_weaken_keys(NTLMSSP_STATE *ntlmssp_state, TALLOC_CTX *mem_ctx)
+{
+       DATA_BLOB weakened_key = data_blob_talloc(mem_ctx,
+                                       ntlmssp_state->session_key.data,
+                                       ntlmssp_state->session_key.length);
+
+       /* Nothing to weaken.  We certainly don't want to 'extend' the length... */
+       if (weakened_key.length < 16) {
+               /* perhaps there was no key? */
+               return weakened_key;
+       }
+
+       /* Key weakening not performed on the master key for NTLM2
+          and does not occour for NTLM1.  Therefore we only need
+          to do this for the LM_KEY.
+       */
+
+       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) {
+               /* LM key doesn't support 128 bit crypto, so this is
+                * the best we can do.  If you negotiate 128 bit, but
+                * not 56, you end up with 40 bit... */
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_56) {
+                       weakened_key.data[7] = 0xa0;
+               } else { /* forty bits */
+                       weakened_key.data[5] = 0xe5;
+                       weakened_key.data[6] = 0x38;
+                       weakened_key.data[7] = 0xb0;
+               }
+               weakened_key.length = 8;
+       }
+       return weakened_key;
+}
+
 /**
  * Next state function for the Negotiate packet
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or MORE_PROCESSING_REQUIRED if a reply is sent. 
+ * @return Errors or MORE_PROCESSING_REQUIRED if a reply is sent.
  */
 
 static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
-                                        const DATA_BLOB request, DATA_BLOB *reply) 
+                                        const DATA_BLOB request, DATA_BLOB *reply)
 {
        DATA_BLOB struct_blob;
-       fstring dnsname, dnsdomname;
+       const char *dnsname;
+       char *dnsdomname = NULL;
        uint32 neg_flags = 0;
        uint32 ntlmssp_command, chal_flags;
-       char *cliname=NULL, *domname=NULL;
-       const uint8 *cryptkey;
+       uint8_t cryptkey[8];
        const char *target_name;
+       struct NEGOTIATE_MESSAGE negotiate;
+       struct CHALLENGE_MESSAGE challenge;
 
        /* parse the NTLMSSP packet */
 #if 0
@@ -133,91 +527,112 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 #endif
 
        if (request.length) {
-               if (!msrpc_parse(&request, "CddAA",
-                                "NTLMSSP",
-                                &ntlmssp_command,
-                                &neg_flags,
-                                &cliname,
-                                &domname)) {
-                       DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP:\n"));
+               if ((request.length < 16) || !msrpc_parse(ntlmssp_state, &request, "Cdd",
+                                                         "NTLMSSP",
+                                                         &ntlmssp_command,
+                                                         &neg_flags)) {
+                       DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP Negotiate of length %u\n",
+                               (unsigned int)request.length));
                        dump_data(2, request.data, request.length);
                        return NT_STATUS_INVALID_PARAMETER;
                }
-               
-               SAFE_FREE(cliname);
-               SAFE_FREE(domname);
-               
                debug_ntlmssp_flags(neg_flags);
+
+               if (DEBUGLEVEL >= 10) {
+                       if (NT_STATUS_IS_OK(ntlmssp_pull_NEGOTIATE_MESSAGE(&request,
+                                                      ntlmssp_state,
+                                                      NULL,
+                                                      &negotiate)))
+                       {
+                               NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE, &negotiate);
+                       }
+               }
        }
-       
-       cryptkey = ntlmssp_state->get_challenge(ntlmssp_state);
 
-       data_blob_free(&ntlmssp_state->chal);
-       ntlmssp_state->chal = data_blob(cryptkey, 8);
-
-       /* Give them the challenge. For now, ignore neg_flags and just
-          return the flags we want. Obviously this is not correct */
-       
-       chal_flags = 
-               NTLMSSP_NEGOTIATE_128 | 
-               NTLMSSP_NEGOTIATE_NTLM;
-       
-       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
-               chal_flags |= NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->unicode = True;
-       } else {
-               chal_flags |= NTLMSSP_NEGOTIATE_OEM;
+       ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, lp_lanman_auth());
+
+       /* Ask our caller what challenge they would like in the packet */
+       ntlmssp_state->get_challenge(ntlmssp_state, cryptkey);
+
+       /* Check if we may set the challenge */
+       if (!ntlmssp_state->may_set_challenge(ntlmssp_state)) {
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
        }
 
-       target_name = ntlmssp_target_name(ntlmssp_state, 
-                                         neg_flags, &chal_flags); 
+       /* The flags we send back are not just the negotiated flags,
+        * they are also 'what is in this packet'.  Therfore, we
+        * operate on 'chal_flags' from here on
+        */
+
+       chal_flags = ntlmssp_state->neg_flags;
+
+       /* get the right name to fill in as 'target' */
+       target_name = ntlmssp_target_name(ntlmssp_state,
+                                         neg_flags, &chal_flags);
+       if (target_name == NULL)
+               return NT_STATUS_INVALID_PARAMETER;
+
+       ntlmssp_state->chal = data_blob_talloc(ntlmssp_state, cryptkey, 8);
+       ntlmssp_state->internal_chal = data_blob_talloc(ntlmssp_state,
+                                                       cryptkey, 8);
 
        /* This should be a 'netbios domain -> DNS domain' mapping */
-       dnsdomname[0] = '\0';
-       get_mydomname(dnsdomname);
+       dnsdomname = get_mydnsdomname(ntlmssp_state);
+       if (!dnsdomname) {
+               dnsdomname = talloc_strdup(ntlmssp_state, "");
+       }
+       if (!dnsdomname) {
+               return NT_STATUS_NO_MEMORY;
+       }
        strlower_m(dnsdomname);
-       
-       dnsname[0] = '\0';
-       get_myfullname(dnsname);
-       strlower_m(dnsname);
-       
-       if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) 
-       {
-               const char *target_name_dns = "";
-               if (chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN) {
-                       target_name_dns = dnsdomname;
-               } else if (chal_flags |= NTLMSSP_TARGET_TYPE_SERVER) {
-                       target_name_dns = dnsname;
-               }
 
-               msrpc_gen(&struct_blob, "aaaaa",
-                         ntlmssp_state->unicode, NTLMSSP_NAME_TYPE_DOMAIN, target_name,
-                         ntlmssp_state->unicode, NTLMSSP_NAME_TYPE_SERVER, ntlmssp_state->get_global_myname(),
-                         ntlmssp_state->unicode, NTLMSSP_NAME_TYPE_DOMAIN_DNS, target_name_dns,
-                         ntlmssp_state->unicode, NTLMSSP_NAME_TYPE_SERVER_DNS, dnsdomname,
-                         ntlmssp_state->unicode, 0, "");
+       dnsname = get_mydnsfullname();
+       if (!dnsname) {
+               dnsname = "";
+       }
+
+       /* This creates the 'blob' of names that appears at the end of the packet */
+       if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO)
+       {
+               msrpc_gen(ntlmssp_state, &struct_blob, "aaaaa",
+                         MsvAvNbDomainName, target_name,
+                         MsvAvNbComputerName, ntlmssp_state->get_global_myname(),
+                         MsvAvDnsDomainName, dnsdomname,
+                         MsvAvDnsComputerName, dnsname,
+                         MsvAvEOL, "");
        } else {
-               struct_blob = data_blob(NULL, 0);
+               struct_blob = data_blob_null;
        }
 
        {
+               /* Marshel the packet in the right format, be it unicode or ASCII */
                const char *gen_string;
                if (ntlmssp_state->unicode) {
                        gen_string = "CdUdbddB";
                } else {
                        gen_string = "CdAdbddB";
                }
-               
-               msrpc_gen(reply, gen_string,
-                         "NTLMSSP", 
+
+               msrpc_gen(ntlmssp_state, reply, gen_string,
+                         "NTLMSSP",
                          NTLMSSP_CHALLENGE,
                          target_name,
                          chal_flags,
                          cryptkey, 8,
                          0, 0,
                          struct_blob.data, struct_blob.length);
+
+               if (DEBUGLEVEL >= 10) {
+                       if (NT_STATUS_IS_OK(ntlmssp_pull_CHALLENGE_MESSAGE(reply,
+                                                      ntlmssp_state,
+                                                      NULL,
+                                                      &challenge)))
+                       {
+                               NDR_PRINT_DEBUG(CHALLENGE_MESSAGE, &challenge);
+                       }
+               }
        }
-               
+
        data_blob_free(&struct_blob);
 
        ntlmssp_state->expected_state = NTLMSSP_AUTH;
@@ -227,23 +642,35 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 
 /**
  * Next state function for the Authenticate packet
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK. 
+ * @return Errors or NT_STATUS_OK.
  */
 
 static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
-                                   const DATA_BLOB request, DATA_BLOB *reply) 
+                                   const DATA_BLOB request, DATA_BLOB *reply)
 {
-       DATA_BLOB sess_key;
-       uint32 ntlmssp_command, neg_flags;
-       NTSTATUS nt_status;
+       DATA_BLOB encrypted_session_key = data_blob_null;
+       DATA_BLOB user_session_key = data_blob_null;
+       DATA_BLOB lm_session_key = data_blob_null;
+       DATA_BLOB session_key = data_blob_null;
+       uint32 ntlmssp_command, auth_flags;
+       NTSTATUS nt_status = NT_STATUS_OK;
+       struct AUTHENTICATE_MESSAGE authenticate;
+
+       /* used by NTLM2 */
+       bool doing_ntlm2 = False;
+
+       uchar session_nonce[16];
+       uchar session_nonce_hash[16];
 
        const char *parse_string;
 
        /* parse the NTLMSSP packet */
+       *reply = data_blob_null;
+
 #if 0
        file_save("ntlmssp_auth.dat", request.data, request.length);
 #endif
@@ -257,64 +684,238 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
        data_blob_free(&ntlmssp_state->lm_resp);
        data_blob_free(&ntlmssp_state->nt_resp);
 
-       SAFE_FREE(ntlmssp_state->user);
-       SAFE_FREE(ntlmssp_state->domain);
-       SAFE_FREE(ntlmssp_state->workstation);
+       ntlmssp_state->user = NULL;
+       ntlmssp_state->domain = NULL;
+       ntlmssp_state->workstation = NULL;
 
        /* now the NTLMSSP encoded auth hashes */
-       if (!msrpc_parse(&request, parse_string,
-                        "NTLMSSP", 
-                        &ntlmssp_command, 
+       if (!msrpc_parse(ntlmssp_state, &request, parse_string,
+                        "NTLMSSP",
+                        &ntlmssp_command,
                         &ntlmssp_state->lm_resp,
                         &ntlmssp_state->nt_resp,
-                        &ntlmssp_state->domain, 
-                        &ntlmssp_state->user, 
+                        &ntlmssp_state->domain,
+                        &ntlmssp_state->user,
                         &ntlmssp_state->workstation,
-                        &sess_key,
-                        &neg_flags)) {
-               DEBUG(1, ("ntlmssp_server_auth: failed to parse NTLMSSP:\n"));
-               dump_data(2, request.data, request.length);
-               return NT_STATUS_INVALID_PARAMETER;
+                        &encrypted_session_key,
+                        &auth_flags)) {
+               auth_flags = 0;
+
+               /* Try again with a shorter string (Win9X truncates this packet) */
+               if (ntlmssp_state->unicode) {
+                       parse_string = "CdBBUUU";
+               } else {
+                       parse_string = "CdBBAAA";
+               }
+
+               /* now the NTLMSSP encoded auth hashes */
+               if (!msrpc_parse(ntlmssp_state, &request, parse_string,
+                                "NTLMSSP",
+                                &ntlmssp_command,
+                                &ntlmssp_state->lm_resp,
+                                &ntlmssp_state->nt_resp,
+                                &ntlmssp_state->domain,
+                                &ntlmssp_state->user,
+                                &ntlmssp_state->workstation)) {
+                       DEBUG(1, ("ntlmssp_server_auth: failed to parse NTLMSSP (tried both formats):\n"));
+                       dump_data(2, request.data, request.length);
+
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+       }
+
+       if (auth_flags)
+               ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, lp_lanman_auth());
+
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_AUTHENTICATE_MESSAGE(&request,
+                                                 ntlmssp_state,
+                                                 NULL,
+                                                 &authenticate)))
+               {
+                       NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE, &authenticate);
+               }
        }
 
-       data_blob_free(&sess_key);
-       
-       DEBUG(3,("Got user=[%s] domain=[%s] workstation=[%s] len1=%d len2=%d\n",
-                ntlmssp_state->user, ntlmssp_state->domain, ntlmssp_state->workstation, ntlmssp_state->lm_resp.length, ntlmssp_state->nt_resp.length));
+       DEBUG(3,("Got user=[%s] domain=[%s] workstation=[%s] len1=%lu len2=%lu\n",
+                ntlmssp_state->user, ntlmssp_state->domain, ntlmssp_state->workstation, (unsigned long)ntlmssp_state->lm_resp.length, (unsigned long)ntlmssp_state->nt_resp.length));
 
 #if 0
        file_save("nthash1.dat",  &ntlmssp_state->nt_resp.data,  &ntlmssp_state->nt_resp.length);
        file_save("lmhash1.dat",  &ntlmssp_state->lm_resp.data,  &ntlmssp_state->lm_resp.length);
 #endif
 
-       nt_status = ntlmssp_state->check_password(ntlmssp_state);
-       
-       *reply = data_blob(NULL, 0);
+       /* NTLM2 uses a 'challenge' that is made of up both the server challenge, and a
+          client challenge
+
+          However, the NTLM2 flag may still be set for the real NTLMv2 logins, be careful.
+       */
+       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+               if (ntlmssp_state->nt_resp.length == 24 && ntlmssp_state->lm_resp.length == 24) {
+                       struct MD5Context md5_session_nonce_ctx;
+                       SMB_ASSERT(ntlmssp_state->internal_chal.data && ntlmssp_state->internal_chal.length == 8);
+
+                       doing_ntlm2 = True;
+
+                       memcpy(session_nonce, ntlmssp_state->internal_chal.data, 8);
+                       memcpy(&session_nonce[8], ntlmssp_state->lm_resp.data, 8);
+
+                       MD5Init(&md5_session_nonce_ctx);
+                       MD5Update(&md5_session_nonce_ctx, session_nonce, 16);
+                       MD5Final(session_nonce_hash, &md5_session_nonce_ctx);
+
+                       ntlmssp_state->chal = data_blob_talloc(
+                               ntlmssp_state, session_nonce_hash, 8);
+
+                       /* LM response is no longer useful */
+                       data_blob_free(&ntlmssp_state->lm_resp);
+
+                       /* We changed the effective challenge - set it */
+                       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_state->set_challenge(ntlmssp_state, &ntlmssp_state->chal))) {
+                               data_blob_free(&encrypted_session_key);
+                               return nt_status;
+                       }
+
+                       /* LM Key is incompatible. */
+                       ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+               }
+       }
+
+       /*
+        * Note we don't check here for NTLMv2 auth settings. If NTLMv2 auth
+        * is required (by "ntlm auth = no" and "lm auth = no" being set in the
+        * smb.conf file) and no NTLMv2 response was sent then the password check
+        * will fail here. JRA.
+        */
+
+       /* Finally, actually ask if the password is OK */
+
+       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_state->check_password(ntlmssp_state,
+                                                                      &user_session_key, &lm_session_key))) {
+               data_blob_free(&encrypted_session_key);
+               return nt_status;
+       }
+
+       dump_data_pw("NT session key:\n", user_session_key.data, user_session_key.length);
+       dump_data_pw("LM first-8:\n", lm_session_key.data, lm_session_key.length);
+
+       /* Handle the different session key derivation for NTLM2 */
+       if (doing_ntlm2) {
+               if (user_session_key.data && user_session_key.length == 16) {
+                       session_key = data_blob_talloc(ntlmssp_state,
+                                                      NULL, 16);
+                       hmac_md5(user_session_key.data, session_nonce,
+                                sizeof(session_nonce), session_key.data);
+                       DEBUG(10,("ntlmssp_server_auth: Created NTLM2 session key.\n"));
+                       dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length);
+
+               } else {
+                       DEBUG(10,("ntlmssp_server_auth: Failed to create NTLM2 session key.\n"));
+                       session_key = data_blob_null;
+               }
+       } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) {
+               if (lm_session_key.data && lm_session_key.length >= 8) {
+                       if (ntlmssp_state->lm_resp.data && ntlmssp_state->lm_resp.length == 24) {
+                               session_key = data_blob_talloc(ntlmssp_state,
+                                                              NULL, 16);
+                               if (session_key.data == NULL) {
+                                       return NT_STATUS_NO_MEMORY;
+                               }
+                               SMBsesskeygen_lm_sess_key(lm_session_key.data, ntlmssp_state->lm_resp.data,
+                                                         session_key.data);
+                               DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n"));
+                       } else {
+                               uint8 zeros[24];
+                               ZERO_STRUCT(zeros);
+                               session_key = data_blob_talloc(
+                                       ntlmssp_state, NULL, 16);
+                               if (session_key.data == NULL) {
+                                       return NT_STATUS_NO_MEMORY;
+                               }
+                               SMBsesskeygen_lm_sess_key(
+                                       lm_session_key.data, zeros,
+                                       session_key.data);
+                       }
+                       dump_data_pw("LM session key:\n", session_key.data,
+                                    session_key.length);
+               } else {
+                       DEBUG(10,("ntlmssp_server_auth: Failed to create NTLM session key.\n"));
+                       session_key = data_blob_null;
+               }
+       } else if (user_session_key.data) {
+               session_key = user_session_key;
+               DEBUG(10,("ntlmssp_server_auth: Using unmodified nt session key.\n"));
+               dump_data_pw("unmodified session key:\n", session_key.data, session_key.length);
+       } else if (lm_session_key.data) {
+               session_key = lm_session_key;
+               DEBUG(10,("ntlmssp_server_auth: Using unmodified lm session key.\n"));
+               dump_data_pw("unmodified session key:\n", session_key.data, session_key.length);
+       } else {
+               DEBUG(10,("ntlmssp_server_auth: Failed to create unmodified session key.\n"));
+               session_key = data_blob_null;
+       }
+
+       /* With KEY_EXCH, the client supplies the proposed session key,
+          but encrypts it with the long-term key */
+       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
+               if (!encrypted_session_key.data || encrypted_session_key.length != 16) {
+                       data_blob_free(&encrypted_session_key);
+                       DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n",
+                                 (unsigned int)encrypted_session_key.length));
+                       return NT_STATUS_INVALID_PARAMETER;
+               } else if (!session_key.data || session_key.length != 16) {
+                       DEBUG(5, ("server session key is invalid (len == %u), cannot do KEY_EXCH!\n",
+                                 (unsigned int)session_key.length));
+                       ntlmssp_state->session_key = session_key;
+               } else {
+                       dump_data_pw("KEY_EXCH session key (enc):\n", encrypted_session_key.data, encrypted_session_key.length);
+                       arcfour_crypt_blob(encrypted_session_key.data,
+                                          encrypted_session_key.length,
+                                          &session_key);
+                       ntlmssp_state->session_key = data_blob_talloc(
+                               ntlmssp_state, encrypted_session_key.data,
+                               encrypted_session_key.length);
+                       dump_data_pw("KEY_EXCH session key:\n", encrypted_session_key.data,
+                                    encrypted_session_key.length);
+               }
+       } else {
+               ntlmssp_state->session_key = session_key;
+       }
+
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               ntlmssp_state->session_key = data_blob_null;
+       } else if (ntlmssp_state->session_key.length) {
+               nt_status = ntlmssp_sign_init(ntlmssp_state);
+       }
+
+       data_blob_free(&encrypted_session_key);
+
+       /* Only one authentication allowed per server state. */
+       ntlmssp_state->expected_state = NTLMSSP_DONE;
 
        return nt_status;
 }
 
 /**
  * Create an NTLMSSP state machine
- * 
+ *
  * @param ntlmssp_state NTLMSSP State, allocated by this function
  */
 
 NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("NTLMSSP context");
-       
-       *ntlmssp_state = talloc_zero(mem_ctx, sizeof(**ntlmssp_state));
+       *ntlmssp_state = TALLOC_ZERO_P(NULL, NTLMSSP_STATE);
        if (!*ntlmssp_state) {
                DEBUG(0,("ntlmssp_server_start: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
+               talloc_destroy(*ntlmssp_state);
                return NT_STATUS_NO_MEMORY;
        }
 
-       (*ntlmssp_state)->mem_ctx = mem_ctx;
+       (*ntlmssp_state)->role = NTLMSSP_SERVER;
+
        (*ntlmssp_state)->get_challenge = get_challenge;
+       (*ntlmssp_state)->set_challenge = set_challenge;
+       (*ntlmssp_state)->may_set_challenge = may_set_challenge;
 
        (*ntlmssp_state)->get_global_myname = global_myname;
        (*ntlmssp_state)->get_domain = lp_workgroup;
@@ -322,144 +923,103 @@ NTSTATUS ntlmssp_server_start(NTLMSSP_STATE **ntlmssp_state)
 
        (*ntlmssp_state)->expected_state = NTLMSSP_NEGOTIATE;
 
-       return NT_STATUS_OK;
-}
-
-/**
- * End an NTLMSSP state machine
- * 
- * @param ntlmssp_state NTLMSSP State, free()ed by this function
- */
-
-NTSTATUS ntlmssp_server_end(NTLMSSP_STATE **ntlmssp_state)
-{
-       TALLOC_CTX *mem_ctx = (*ntlmssp_state)->mem_ctx;
-
-       data_blob_free(&(*ntlmssp_state)->chal);
-       data_blob_free(&(*ntlmssp_state)->lm_resp);
-       data_blob_free(&(*ntlmssp_state)->nt_resp);
+       (*ntlmssp_state)->ref_count = 1;
 
-       SAFE_FREE((*ntlmssp_state)->user);
-       SAFE_FREE((*ntlmssp_state)->domain);
-       SAFE_FREE((*ntlmssp_state)->workstation);
+       (*ntlmssp_state)->neg_flags =
+               NTLMSSP_NEGOTIATE_128 |
+               NTLMSSP_NEGOTIATE_56 |
+               NTLMSSP_NEGOTIATE_VERSION |
+               NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
+               NTLMSSP_NEGOTIATE_NTLM |
+               NTLMSSP_NEGOTIATE_NTLM2 |
+               NTLMSSP_NEGOTIATE_KEY_EXCH |
+               NTLMSSP_NEGOTIATE_SIGN |
+               NTLMSSP_NEGOTIATE_SEAL;
 
-       talloc_destroy(mem_ctx);
-       *ntlmssp_state = NULL;
        return NT_STATUS_OK;
 }
 
-/**
- * Next state function for the NTLMSSP state machine
- * 
- * @param ntlmssp_state NTLMSSP State
- * @param request The request, as a DATA_BLOB
- * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors, NT_STATUS_MORE_PROCESSING_REQUIRED or NT_STATUS_OK. 
- */
-
-NTSTATUS ntlmssp_server_update(NTLMSSP_STATE *ntlmssp_state, 
-                              const DATA_BLOB request, DATA_BLOB *reply) 
-{
-       uint32 ntlmssp_command;
-       *reply = data_blob(NULL, 0);
-
-       if (request.length) {
-               if (!msrpc_parse(&request, "Cd",
-                                "NTLMSSP",
-                                &ntlmssp_command)) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-       } else {
-               /* 'datagram' mode - no neg packet */
-               ntlmssp_command = NTLMSSP_NEGOTIATE;
-       }
-
-       if (ntlmssp_command != ntlmssp_state->expected_state) {
-               DEBUG(1, ("got NTLMSSP command %u, expected %u\n", ntlmssp_command, ntlmssp_state->expected_state));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (ntlmssp_command == NTLMSSP_NEGOTIATE) {
-               return ntlmssp_server_negotiate(ntlmssp_state, request, reply);
-       } else if (ntlmssp_command == NTLMSSP_AUTH) {
-               return ntlmssp_server_auth(ntlmssp_state, request, reply);
-       } else {
-               DEBUG(1, ("unknown NTLMSSP command %u, expected %u\n", ntlmssp_command, ntlmssp_state->expected_state));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-}
-
 /*********************************************************************
  Client side NTLMSSP
 *********************************************************************/
 
 /**
  * Next state function for the Initial packet
- * 
+ *
  * @param ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB.  reply.data must be NULL
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK. 
+ * @return Errors or NT_STATUS_OK.
  */
 
-static NTSTATUS ntlmssp_client_initial(struct ntlmssp_client_state *ntlmssp_state, 
-                                 DATA_BLOB reply, DATA_BLOB *next_request) 
+static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+                                 DATA_BLOB reply, DATA_BLOB *next_request)
 {
+       struct NEGOTIATE_MESSAGE negotiate;
+
        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 */
-       msrpc_gen(next_request, "CddAA",
+       msrpc_gen(ntlmssp_state, next_request, "CddAA",
                  "NTLMSSP",
                  NTLMSSP_NEGOTIATE,
                  ntlmssp_state->neg_flags,
-                 ntlmssp_state->get_domain(), 
+                 ntlmssp_state->get_domain(),
                  ntlmssp_state->get_global_myname());
 
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_NEGOTIATE_MESSAGE(next_request,
+                                              ntlmssp_state,
+                                              NULL,
+                                              &negotiate)))
+               {
+                       NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE, &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 ntlmssp_state NTLMSSP State
  * @param request The request, as a DATA_BLOB.  reply.data must be NULL
  * @param request The reply, as an allocated DATA_BLOB, caller to free.
- * @return Errors or NT_STATUS_OK. 
+ * @return Errors or NT_STATUS_OK.
  */
 
-static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_state, 
-                                        const DATA_BLOB reply, DATA_BLOB *next_request) 
+static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
+                                        const DATA_BLOB reply, DATA_BLOB *next_request)
 {
        uint32 chal_flags, ntlmssp_command, unkn1, unkn2;
        DATA_BLOB server_domain_blob;
        DATA_BLOB challenge_blob;
-       DATA_BLOB struct_blob = data_blob(NULL, 0);
+       DATA_BLOB struct_blob = data_blob_null;
        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);
-       uint8 datagram_sess_key[16];
-       size_t datagram_sess_key_len;
-
-#if 0 /* until we know what flag to tigger it on */
-       generate_random_buffer(datagram_sess_key, sizeof(datagram_sess_key), False);    
-       datagram_sess_key_len = sizeof(datagram_sess_key);
-#else
-       ZERO_STRUCT(datagram_sess_key);
-       datagram_sess_key_len = 0;
-#endif
-
-       if (!msrpc_parse(&reply, "CdBd",
+       DATA_BLOB lm_response = data_blob_null;
+       DATA_BLOB nt_response = data_blob_null;
+       DATA_BLOB session_key = data_blob_null;
+       DATA_BLOB encrypted_session_key = data_blob_null;
+       NTSTATUS nt_status = NT_STATUS_OK;
+       struct CHALLENGE_MESSAGE challenge;
+       struct AUTHENTICATE_MESSAGE authenticate;
+
+       if (!msrpc_parse(ntlmssp_state, &reply, "CdBd",
                         "NTLMSSP",
-                        &ntlmssp_command, 
+                        &ntlmssp_command,
                         &server_domain_blob,
                         &chal_flags)) {
                DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#1)\n"));
@@ -467,58 +1027,47 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
 
                return NT_STATUS_INVALID_PARAMETER;
        }
-       
+
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_CHALLENGE_MESSAGE(&reply,
+                                              ntlmssp_state,
+                                              NULL,
+                                              &challenge)))
+               {
+                       NDR_PRINT_DEBUG(CHALLENGE_MESSAGE, &challenge);
+               }
+       }
+
        data_blob_free(&server_domain_blob);
 
        DEBUG(3, ("Got challenge flags:\n"));
        debug_ntlmssp_flags(chal_flags);
 
-       if (chal_flags & NTLMSSP_NEGOTIATE_UNICODE) {
-               if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) {
+       ntlmssp_handle_neg_flags(ntlmssp_state, chal_flags, lp_client_lanman_auth());
+
+       if (ntlmssp_state->unicode) {
+               if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
                        chal_parse_string = "CdUdbddB";
                } else {
                        chal_parse_string = "CdUdbdd";
                }
                auth_gen_string = "CdBBUUUBd";
-               ntlmssp_state->unicode = True;
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
-       } else if (chal_flags & NTLMSSP_NEGOTIATE_OEM) {
-               if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) {
+       } else {
+               if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
                        chal_parse_string = "CdAdbddB";
                } else {
                        chal_parse_string = "CdAdbdd";
                }
-               auth_gen_string = "CdBBAAABd";
-               ntlmssp_state->unicode = False;
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
-       } else {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
 
-       if (chal_flags & NTLMSSP_NEGOTIATE_LM_KEY && lp_client_lanman_auth()) {
-               /* server forcing us to use LM */
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
-               ntlmssp_state->use_ntlmv2 = False;
-       } else {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-       }
-
-       if (!(chal_flags & NTLMSSP_NEGOTIATE_NTLM2)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
-       }
-
-       if (!(chal_flags & NTLMSSP_NEGOTIATE_128)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128;
+               auth_gen_string = "CdBBAAABd";
        }
 
        DEBUG(3, ("NTLMSSP: Set final flags:\n"));
        debug_ntlmssp_flags(ntlmssp_state->neg_flags);
 
-       if (!msrpc_parse(&reply, chal_parse_string,
+       if (!msrpc_parse(ntlmssp_state, &reply, chal_parse_string,
                         "NTLMSSP",
-                        &ntlmssp_command, 
+                        &ntlmssp_command,
                         &server_domain,
                         &chal_flags,
                         &challenge_blob, 8,
@@ -529,104 +1078,177 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       SAFE_FREE(server_domain);
+       ntlmssp_state->server_domain = server_domain;
+
        if (challenge_blob.length != 8) {
                data_blob_free(&struct_blob);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (ntlmssp_state->use_ntlmv2) {
+       if (!ntlmssp_state->nt_hash || !ntlmssp_state->lm_hash) {
+               uchar zeros[16];
+               /* do nothing - blobs are zero length */
 
+               ZERO_STRUCT(zeros);
+
+               /* session key is all zeros */
+               session_key = data_blob_talloc(ntlmssp_state, zeros, 16);
+
+               /* not doing NLTM2 without a password */
+               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
+       } else if (ntlmssp_state->use_ntlmv2) {
                if (!struct_blob.length) {
                        /* be lazy, match win2k - we can't do NTLMv2 without it */
+                       DEBUG(1, ("Server did not provide 'target information', required for NTLMv2\n"));
                        return NT_STATUS_INVALID_PARAMETER;
                }
 
                /* TODO: if the remote server is standalone, then we should replace 'domain'
                   with the server name as supplied above */
-               
-               if (!SMBNTLMv2encrypt(ntlmssp_state->user, 
-                                     ntlmssp_state->domain, 
-                                     ntlmssp_state->password, &challenge_blob, 
-                                     &struct_blob, 
-                                     &lm_response, &nt_response, &session_key)) {
+
+               if (!SMBNTLMv2encrypt_hash(ntlmssp_state,
+                                          ntlmssp_state->user,
+                                          ntlmssp_state->domain,
+                                          ntlmssp_state->nt_hash, &challenge_blob,
+                                          &struct_blob,
+                                          &lm_response, &nt_response, NULL,
+                                          &session_key)) {
                        data_blob_free(&challenge_blob);
                        data_blob_free(&struct_blob);
                        return NT_STATUS_NO_MEMORY;
                }
+       } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+               struct MD5Context md5_session_nonce_ctx;
+               uchar session_nonce[16];
+               uchar session_nonce_hash[16];
+               uchar user_session_key[16];
+
+               lm_response = data_blob_talloc(ntlmssp_state, NULL, 24);
+               generate_random_buffer(lm_response.data, 8);
+               memset(lm_response.data+8, 0, 16);
+
+               memcpy(session_nonce, challenge_blob.data, 8);
+               memcpy(&session_nonce[8], lm_response.data, 8);
+
+               MD5Init(&md5_session_nonce_ctx);
+               MD5Update(&md5_session_nonce_ctx, challenge_blob.data, 8);
+               MD5Update(&md5_session_nonce_ctx, lm_response.data, 8);
+               MD5Final(session_nonce_hash, &md5_session_nonce_ctx);
+
+               DEBUG(5, ("NTLMSSP challenge set by NTLM2\n"));
+               DEBUG(5, ("challenge is: \n"));
+               dump_data(5, session_nonce_hash, 8);
+
+               nt_response = data_blob_talloc(ntlmssp_state, NULL, 24);
+               SMBNTencrypt_hash(ntlmssp_state->nt_hash,
+                                 session_nonce_hash,
+                                 nt_response.data);
+
+               session_key = data_blob_talloc(ntlmssp_state, NULL, 16);
+
+               SMBsesskeygen_ntv1(ntlmssp_state->nt_hash, user_session_key);
+               hmac_md5(user_session_key, session_nonce, sizeof(session_nonce), session_key.data);
+               dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length);
        } else {
-               uchar lm_hash[16];
-               uchar nt_hash[16];
-               E_deshash(ntlmssp_state->password, lm_hash);
-               E_md4hash(ntlmssp_state->password, nt_hash);
-               
                /* lanman auth is insecure, it may be disabled */
                if (lp_client_lanman_auth()) {
-                       lm_response = data_blob(NULL, 24);
-                       SMBencrypt(ntlmssp_state->password,challenge_blob.data,
+                       lm_response = data_blob_talloc(ntlmssp_state,
+                                                      NULL, 24);
+                       SMBencrypt_hash(ntlmssp_state->lm_hash,challenge_blob.data,
                                   lm_response.data);
                }
-               
-               nt_response = data_blob(NULL, 24);
-               SMBNTencrypt(ntlmssp_state->password,challenge_blob.data,
+
+               nt_response = data_blob_talloc(ntlmssp_state, NULL, 24);
+               SMBNTencrypt_hash(ntlmssp_state->nt_hash,challenge_blob.data,
                             nt_response.data);
 
-               session_key = data_blob(NULL, 16);
-               if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) 
-                     && lp_client_lanman_auth()) {
-                       SMBsesskeygen_lmv1(lm_hash, lm_response.data, 
-                                          session_key.data);
+               session_key = data_blob_talloc(ntlmssp_state, NULL, 16);
+               if ((ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY)
+                   && lp_client_lanman_auth()) {
+                       SMBsesskeygen_lm_sess_key(ntlmssp_state->lm_hash, lm_response.data,
+                                       session_key.data);
+                       dump_data_pw("LM session key\n", session_key.data, session_key.length);
                } else {
-                       SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
+                       SMBsesskeygen_ntv1(ntlmssp_state->nt_hash, session_key.data);
+                       dump_data_pw("NT session key:\n", session_key.data, session_key.length);
                }
        }
        data_blob_free(&struct_blob);
 
+       /* 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 client_session_key[16];
+               generate_random_buffer(client_session_key, sizeof(client_session_key));
+
+               /* Encrypt the new session key with the old one */
+               encrypted_session_key = data_blob(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_blob(encrypted_session_key.data, encrypted_session_key.length, &session_key);
+               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 */
+               data_blob_free(&session_key);
+               session_key = data_blob_talloc(ntlmssp_state,
+                                              client_session_key,
+                                              sizeof(client_session_key));
+       }
+
        /* this generates the actual auth packet */
-       if (!msrpc_gen(next_request, auth_gen_string, 
-                      "NTLMSSP", 
-                      NTLMSSP_AUTH, 
+       if (!msrpc_gen(ntlmssp_state, next_request, auth_gen_string,
+                      "NTLMSSP",
+                      NTLMSSP_AUTH,
                       lm_response.data, lm_response.length,
                       nt_response.data, nt_response.length,
-                      ntlmssp_state->domain, 
-                      ntlmssp_state->user, 
-                      ntlmssp_state->get_global_myname(), 
-                      datagram_sess_key, datagram_sess_key_len,
+                      ntlmssp_state->domain,
+                      ntlmssp_state->user,
+                      ntlmssp_state->get_global_myname(),
+                      encrypted_session_key.data, encrypted_session_key.length,
                       ntlmssp_state->neg_flags)) {
-               
-               data_blob_free(&lm_response);
-               data_blob_free(&nt_response);
-               data_blob_free(&session_key);
+
                return NT_STATUS_NO_MEMORY;
        }
 
+       if (DEBUGLEVEL >= 10) {
+               if (NT_STATUS_IS_OK(ntlmssp_pull_AUTHENTICATE_MESSAGE(next_request,
+                                                 ntlmssp_state,
+                                                 NULL,
+                                                 &authenticate)))
+               {
+                       NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE, &authenticate);
+               }
+       }
+
+       data_blob_free(&encrypted_session_key);
+
        data_blob_free(&ntlmssp_state->chal);
-       data_blob_free(&ntlmssp_state->lm_resp);
-       data_blob_free(&ntlmssp_state->nt_resp);
-       data_blob_free(&ntlmssp_state->session_key);
+
+       ntlmssp_state->session_key = session_key;
 
        ntlmssp_state->chal = challenge_blob;
        ntlmssp_state->lm_resp = lm_response;
        ntlmssp_state->nt_resp = nt_response;
-       ntlmssp_state->session_key = session_key;
 
-       return NT_STATUS_MORE_PROCESSING_REQUIRED;
+       ntlmssp_state->expected_state = NTLMSSP_DONE;
+
+       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_sign_init(ntlmssp_state))) {
+               DEBUG(1, ("Could not setup NTLMSSP signing/sealing system (error was: %s)\n", nt_errstr(nt_status)));
+       }
+
+       return nt_status;
 }
 
-NTSTATUS ntlmssp_client_start(NTLMSSP_CLIENT_STATE **ntlmssp_state)
+NTSTATUS ntlmssp_client_start(NTLMSSP_STATE **ntlmssp_state)
 {
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("NTLMSSP Client context");
-       
-       *ntlmssp_state = talloc_zero(mem_ctx, sizeof(**ntlmssp_state));
+       *ntlmssp_state = TALLOC_ZERO_P(NULL, NTLMSSP_STATE);
        if (!*ntlmssp_state) {
-               DEBUG(0,("ntlmssp_server_start: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
+               DEBUG(0,("ntlmssp_client_start: talloc failed!\n"));
+               talloc_destroy(*ntlmssp_state);
                return NT_STATUS_NO_MEMORY;
        }
 
-       (*ntlmssp_state)->mem_ctx = mem_ctx;
+       (*ntlmssp_state)->role = NTLMSSP_CLIENT;
 
        (*ntlmssp_state)->get_global_myname = global_myname;
        (*ntlmssp_state)->get_domain = lp_workgroup;
@@ -635,102 +1257,17 @@ NTSTATUS ntlmssp_client_start(NTLMSSP_CLIENT_STATE **ntlmssp_state)
 
        (*ntlmssp_state)->use_ntlmv2 = lp_client_ntlmv2_auth();
 
-       (*ntlmssp_state)->neg_flags = 
-               NTLMSSP_NEGOTIATE_128 |
-               NTLMSSP_NEGOTIATE_NTLM |
-               NTLMSSP_REQUEST_TARGET;
+       (*ntlmssp_state)->expected_state = NTLMSSP_INITIAL;
 
        (*ntlmssp_state)->ref_count = 1;
 
-       return NT_STATUS_OK;
-}
-
-NTSTATUS ntlmssp_client_end(NTLMSSP_CLIENT_STATE **ntlmssp_state)
-{
-       TALLOC_CTX *mem_ctx = (*ntlmssp_state)->mem_ctx;
-
-       (*ntlmssp_state)->ref_count--;
-
-       if ((*ntlmssp_state)->ref_count == 0) {
-               data_blob_free(&(*ntlmssp_state)->chal);
-               data_blob_free(&(*ntlmssp_state)->lm_resp);
-               data_blob_free(&(*ntlmssp_state)->nt_resp);
-               data_blob_free(&(*ntlmssp_state)->session_key);
-               data_blob_free(&(*ntlmssp_state)->stored_response);
-               talloc_destroy(mem_ctx);
-       }
-
-       *ntlmssp_state = NULL;
-       return NT_STATUS_OK;
-}
-
-NTSTATUS ntlmssp_client_update(NTLMSSP_CLIENT_STATE *ntlmssp_state, 
-                              DATA_BLOB reply, DATA_BLOB *next_request) 
-{
-       NTSTATUS nt_status = NT_STATUS_INVALID_PARAMETER;
-       uint32 ntlmssp_command;
-       *next_request = data_blob(NULL, 0);
-
-       if (!reply.length) {
-               /* If there is a cached reply, use it - otherwise this is the first packet */
-               if (!ntlmssp_state->stored_response.length) {
-                       return ntlmssp_client_initial(ntlmssp_state, reply, next_request);
-               }
-               
-               reply = ntlmssp_state->stored_response;
-       }
-
-       if (!msrpc_parse(&reply, "Cd",
-                        "NTLMSSP",
-                        &ntlmssp_command)) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (ntlmssp_command == NTLMSSP_CHALLENGE) {
-               nt_status = ntlmssp_client_challenge(ntlmssp_state, reply, next_request);
-       }
-       if (ntlmssp_state->stored_response.length) {
-               data_blob_free(&ntlmssp_state->stored_response);
-       }
-       return nt_status;
-}
-
-NTSTATUS ntlmssp_set_username(NTLMSSP_CLIENT_STATE *ntlmssp_state, const char *user) 
-{
-       ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user);
-       if (!ntlmssp_state->user) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-NTSTATUS ntlmssp_set_password(NTLMSSP_CLIENT_STATE *ntlmssp_state, const char *password) 
-{
-       ntlmssp_state->password = talloc_strdup(ntlmssp_state->mem_ctx, password);
-       if (!ntlmssp_state->password) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-NTSTATUS ntlmssp_set_domain(NTLMSSP_CLIENT_STATE *ntlmssp_state, const char *domain) 
-{
-       ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain);
-       if (!ntlmssp_state->domain) {
-               return NT_STATUS_NO_MEMORY;
-       }
-       return NT_STATUS_OK;
-}
-
-/**
- *  Store a DATA_BLOB containing an NTLMSSP response, for use later.
- *  This 'keeps' the data blob - the caller must *not* free it.
- */
+       (*ntlmssp_state)->neg_flags =
+               NTLMSSP_NEGOTIATE_128 |
+               NTLMSSP_NEGOTIATE_ALWAYS_SIGN |
+               NTLMSSP_NEGOTIATE_NTLM |
+               NTLMSSP_NEGOTIATE_NTLM2 |
+               NTLMSSP_NEGOTIATE_KEY_EXCH |
+               NTLMSSP_REQUEST_TARGET;
 
-NTSTATUS ntlmssp_client_store_response(NTLMSSP_CLIENT_STATE *ntlmssp_state,
-                                      DATA_BLOB response) 
-{
-       data_blob_free(&ntlmssp_state->stored_response);
-       ntlmssp_state->stored_response = response;
        return NT_STATUS_OK;
 }