summaryrefslogtreecommitdiff
path: root/libcli
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-25 16:04:38 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-10-18 13:13:31 +1100
commit0c6e4adcb26557ae6e55169c051f0260151dc5d9 (patch)
treeecf95f05bbc93f1da279d987856410cf79bdb736 /libcli
parent5e6543ad76490b5d21b99841e1f984bad7f17e33 (diff)
downloadsamba-0c6e4adcb26557ae6e55169c051f0260151dc5d9.tar.gz
samba-0c6e4adcb26557ae6e55169c051f0260151dc5d9.tar.bz2
samba-0c6e4adcb26557ae6e55169c051f0260151dc5d9.zip
ntlmssp: Move ntlmssp code to auth/ntlmssp
This brings in the code from both libcli/auth and source4/auth/ntlmssp. Andrew Bartlett Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'libcli')
-rw-r--r--libcli/auth/ntlmssp.c144
-rw-r--r--libcli/auth/ntlmssp.h173
-rw-r--r--libcli/auth/ntlmssp_ndr.c133
-rw-r--r--libcli/auth/ntlmssp_ndr.h38
-rw-r--r--libcli/auth/ntlmssp_private.h57
-rw-r--r--libcli/auth/ntlmssp_server.c582
-rw-r--r--libcli/auth/ntlmssp_sign.c694
-rw-r--r--libcli/auth/wscript_build11
8 files changed, 5 insertions, 1827 deletions
diff --git a/libcli/auth/ntlmssp.c b/libcli/auth/ntlmssp.c
deleted file mode 100644
index 4817329314..0000000000
--- a/libcli/auth/ntlmssp.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- 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 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 "../libcli/auth/ntlmssp.h"
-#include "../libcli/auth/ntlmssp_private.h"
-
-/**
- * Print out the NTLMSSP flags for debugging
- * @param neg_flags The flags from the packet
- */
-void debug_ntlmssp_flags(uint32_t neg_flags)
-{
- DEBUG(3,("Got NTLMSSP neg_flags=0x%08x\n", neg_flags));
-
- if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_UNICODE\n"));
- if (neg_flags & NTLMSSP_NEGOTIATE_OEM)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_OEM\n"));
- if (neg_flags & NTLMSSP_REQUEST_TARGET)
- DEBUGADD(4, (" NTLMSSP_REQUEST_TARGET\n"));
- if (neg_flags & NTLMSSP_NEGOTIATE_SIGN)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_SIGN\n"));
- if (neg_flags & NTLMSSP_NEGOTIATE_SEAL)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_SEAL\n"));
- 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)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_NETWARE\n"));
- if (neg_flags & NTLMSSP_NEGOTIATE_NTLM)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_NTLM\n"));
- 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)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_ALWAYS_SIGN\n"));
- 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_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)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_KEY_EXCH\n"));
- if (neg_flags & NTLMSSP_NEGOTIATE_56)
- DEBUGADD(4, (" NTLMSSP_NEGOTIATE_56\n"));
-}
-
-void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
- uint32_t 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;
- }
-
- 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;
- }
-}
-
-/* Does this blob looks like it could be NTLMSSP? */
-bool ntlmssp_blob_matches_magic(const DATA_BLOB *blob)
-{
- if (blob->length > 8 && memcmp("NTLMSSP\0", blob->data, 8) == 0) {
- return true;
- } else {
- return false;
- }
-}
diff --git a/libcli/auth/ntlmssp.h b/libcli/auth/ntlmssp.h
deleted file mode 100644
index cf8bb8dd30..0000000000
--- a/libcli/auth/ntlmssp.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- SMB parameters and setup
- Copyright (C) Andrew Tridgell 1992-1997
- Copyright (C) Luke Kenneth Casson Leighton 1996-1997
- Copyright (C) Paul Ashton 1997
- Copyright (C) Andrew Bartlett 2010
-
- 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 "../librpc/gen_ndr/ntlmssp.h"
-
-/* NTLMSSP mode */
-enum ntlmssp_role
-{
- NTLMSSP_SERVER,
- NTLMSSP_CLIENT
-};
-
-/* NTLMSSP message types */
-enum ntlmssp_message_type
-{
- NTLMSSP_INITIAL = 0 /* samba internal state */,
- NTLMSSP_NEGOTIATE = 1,
- NTLMSSP_CHALLENGE = 2,
- NTLMSSP_AUTH = 3,
- NTLMSSP_UNKNOWN = 4,
- NTLMSSP_DONE = 5 /* samba final state */
-};
-
-#define NTLMSSP_FEATURE_SESSION_KEY 0x00000001
-#define NTLMSSP_FEATURE_SIGN 0x00000002
-#define NTLMSSP_FEATURE_SEAL 0x00000004
-#define NTLMSSP_FEATURE_CCACHE 0x00000008
-
-union ntlmssp_crypt_state;
-
-struct ntlmssp_state
-{
- enum ntlmssp_role role;
- uint32_t expected_state;
-
- bool unicode;
- bool use_ntlmv2;
- bool use_ccache;
- bool use_nt_response; /* Set to 'False' to debug what happens when the NT response is omited */
- bool allow_lm_key; /* The LM_KEY code is not very secure... */
-
- const char *user;
- const char *domain;
- uint8_t *nt_hash;
- uint8_t *lm_hash;
-
- struct {
- const char *netbios_name;
- const char *netbios_domain;
- } client;
-
- struct {
- bool is_standalone;
- const char *netbios_name;
- const char *netbios_domain;
- const char *dns_name;
- const char *dns_domain;
- } server;
-
- DATA_BLOB internal_chal; /* Random challenge as supplied to the client for NTLM authentication */
-
- DATA_BLOB chal; /* Random challenge as input into the actual NTLM (or NTLM2) authentication */
- DATA_BLOB lm_resp;
- DATA_BLOB nt_resp;
- DATA_BLOB session_key;
-
- uint32_t neg_flags; /* the current state of negotiation with the NTLMSSP partner */
-
- /**
- * Private data for the callback functions
- */
- void *callback_private;
-
- /**
- * Callback to get the 'challenge' used for NTLM authentication.
- *
- * @param ntlmssp_state This structure
- * @return 8 bytes of challenge data, determined by the server to be the challenge for NTLM authentication
- *
- */
- NTSTATUS (*get_challenge)(const struct ntlmssp_state *ntlmssp_state,
- uint8_t challenge[8]);
-
- /**
- * Callback to find if the challenge used by NTLM authentication may be modified
- *
- * The NTLM2 authentication scheme modifies the effective challenge, but this is not compatiable with the
- * current 'security=server' implementation..
- *
- * @param ntlmssp_state This structure
- * @return Can the challenge be set to arbitary values?
- *
- */
- bool (*may_set_challenge)(const struct ntlmssp_state *ntlmssp_state);
-
- /**
- * Callback to set the 'challenge' used for NTLM authentication.
- *
- * The callback may use the void *auth_context to store state information, but the same value is always available
- * from the DATA_BLOB chal on this structure.
- *
- * @param ntlmssp_state This structure
- * @param challenge 8 bytes of data, agreed by the client and server to be the effective challenge for NTLM2 authentication
- *
- */
- NTSTATUS (*set_challenge)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge);
-
- /**
- * Callback to check the user's password.
- *
- * The callback must reads the feilds of this structure for the information it needs on the user
- * @param ntlmssp_state This structure
- * @param mem_ctx Talloc context for LM and NT session key to be returned on
- * @param nt_session_key If an NT session key is returned by the authentication process, return it here
- * @param lm_session_key If an LM session key is returned by the authentication process, return it here
- *
- */
- NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state, TALLOC_CTX *mem_ctx,
- DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key);
-
- union ntlmssp_crypt_state *crypt;
-};
-
-/* The following definitions come from libcli/auth/ntlmssp_sign.c */
-
-NTSTATUS ntlmssp_sign_packet(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *sig_mem_ctx,
- const uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- DATA_BLOB *sig);
-NTSTATUS ntlmssp_check_packet(struct ntlmssp_state *ntlmssp_state,
- const uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- const DATA_BLOB *sig) ;
-NTSTATUS ntlmssp_seal_packet(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *sig_mem_ctx,
- uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- DATA_BLOB *sig);
-NTSTATUS ntlmssp_unseal_packet(struct ntlmssp_state *ntlmssp_state,
- uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- const DATA_BLOB *sig);
-NTSTATUS ntlmssp_wrap(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB *in,
- DATA_BLOB *out);
-NTSTATUS ntlmssp_unwrap(struct ntlmssp_state *ntlmssp_stae,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB *in,
- DATA_BLOB *out);
-NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state);
-
-bool ntlmssp_blob_matches_magic(const DATA_BLOB *blob);
diff --git a/libcli/auth/ntlmssp_ndr.c b/libcli/auth/ntlmssp_ndr.c
deleted file mode 100644
index fd31e853d2..0000000000
--- a/libcli/auth/ntlmssp_ndr.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- Unix SMB/Netbios implementation.
- NTLMSSP ndr functions
-
- Copyright (C) Guenther Deschner 2009
-
- 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 "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../libcli/auth/ntlmssp_ndr.h"
-
-#define NTLMSSP_PULL_MESSAGE(type, blob, mem_ctx, r) \
-do { \
- enum ndr_err_code __ndr_err; \
- __ndr_err = ndr_pull_struct_blob(blob, mem_ctx, r, \
- (ndr_pull_flags_fn_t)ndr_pull_ ##type); \
- if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \
- return ndr_map_error2ntstatus(__ndr_err); \
- } \
- if (memcmp(r->Signature, "NTLMSSP\0", 8)) {\
- return NT_STATUS_INVALID_PARAMETER; \
- } \
- return NT_STATUS_OK; \
-} while(0);
-
-#define NTLMSSP_PUSH_MESSAGE(type, blob, mem_ctx, r) \
-do { \
- enum ndr_err_code __ndr_err; \
- __ndr_err = ndr_push_struct_blob(blob, mem_ctx, r, \
- (ndr_push_flags_fn_t)ndr_push_ ##type); \
- if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \
- return ndr_map_error2ntstatus(__ndr_err); \
- } \
- return NT_STATUS_OK; \
-} while(0);
-
-
-/**
- * Pull NTLMSSP NEGOTIATE_MESSAGE struct from a blob
- * @param blob The plain packet blob
- * @param mem_ctx A talloc context
- * @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure
- */
-
-NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- struct NEGOTIATE_MESSAGE *r)
-{
- NTLMSSP_PULL_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, r);
-}
-
-/**
- * Pull NTLMSSP CHALLENGE_MESSAGE struct from a blob
- * @param blob The plain packet blob
- * @param mem_ctx A talloc context
- * @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure
- */
-
-NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- struct CHALLENGE_MESSAGE *r)
-{
- NTLMSSP_PULL_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, r);
-}
-
-/**
- * Pull NTLMSSP AUTHENTICATE_MESSAGE struct from a blob
- * @param blob The plain packet blob
- * @param mem_ctx A talloc context
- * @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure
- */
-
-NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- struct AUTHENTICATE_MESSAGE *r)
-{
- NTLMSSP_PULL_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, r);
-}
-
-/**
- * Push NTLMSSP NEGOTIATE_MESSAGE struct into a blob
- * @param blob The plain packet blob
- * @param mem_ctx A talloc context
- * @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure
- */
-
-NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- const struct NEGOTIATE_MESSAGE *r)
-{
- NTLMSSP_PUSH_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, r);
-}
-
-/**
- * Push NTLMSSP CHALLENGE_MESSAGE struct into a blob
- * @param blob The plain packet blob
- * @param mem_ctx A talloc context
- * @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure
- */
-
-NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- const struct CHALLENGE_MESSAGE *r)
-{
- NTLMSSP_PUSH_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, r);
-}
-
-/**
- * Push NTLMSSP AUTHENTICATE_MESSAGE struct into a blob
- * @param blob The plain packet blob
- * @param mem_ctx A talloc context
- * @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure
- */
-
-NTSTATUS ntlmssp_push_AUTHENTICATE_MESSAGE(DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- const struct AUTHENTICATE_MESSAGE *r)
-{
- NTLMSSP_PUSH_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, r);
-}
diff --git a/libcli/auth/ntlmssp_ndr.h b/libcli/auth/ntlmssp_ndr.h
deleted file mode 100644
index e61923170e..0000000000
--- a/libcli/auth/ntlmssp_ndr.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Unix SMB/Netbios implementation.
- NTLMSSP ndr functions
-
- Copyright (C) Guenther Deschner 2009
-
- 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/>.
-*/
-
-NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- struct NEGOTIATE_MESSAGE *r);
-NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- struct CHALLENGE_MESSAGE *r);
-NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- struct AUTHENTICATE_MESSAGE *r);
-NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- const struct NEGOTIATE_MESSAGE *r);
-NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- const struct CHALLENGE_MESSAGE *r);
-NTSTATUS ntlmssp_push_AUTHENTICATE_MESSAGE(DATA_BLOB *blob,
- TALLOC_CTX *mem_ctx,
- const struct AUTHENTICATE_MESSAGE *r);
diff --git a/libcli/auth/ntlmssp_private.h b/libcli/auth/ntlmssp_private.h
deleted file mode 100644
index ff7b285b41..0000000000
--- a/libcli/auth/ntlmssp_private.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Version 3.0
- * NTLMSSP Signing routines
- * Copyright (C) Andrew Bartlett 2003-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/>.
- */
-
-/* For structures internal to the NTLMSSP implementation that should not be exposed */
-
-#include "../lib/crypto/arcfour.h"
-
-struct ntlmssp_crypt_direction {
- uint32_t seq_num;
- uint8_t sign_key[16];
- struct arcfour_state seal_state;
-};
-
-union ntlmssp_crypt_state {
- /* NTLM */
- struct ntlmssp_crypt_direction ntlm;
-
- /* NTLM2 */
- struct {
- struct ntlmssp_crypt_direction sending;
- struct ntlmssp_crypt_direction receiving;
- } ntlm2;
-};
-
-/* The following definitions come from libcli/auth/ntlmssp.c */
-
-void debug_ntlmssp_flags(uint32_t neg_flags);
-void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
- uint32_t neg_flags, bool allow_lm);
-
-/* The following definitions come from libcli/auth/ntlmssp_server.c */
-
-const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
- uint32_t neg_flags, uint32_t *chal_flags);
-NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB in, DATA_BLOB *out);
-NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB request, DATA_BLOB *reply);
diff --git a/libcli/auth/ntlmssp_server.c b/libcli/auth/ntlmssp_server.c
deleted file mode 100644
index 802ac402b4..0000000000
--- a/libcli/auth/ntlmssp_server.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- Unix SMB/Netbios implementation.
- Version 3.0
- handle NTLMSSP, server side
-
- Copyright (C) Andrew Tridgell 2001
- Copyright (C) Andrew Bartlett 2001-2010
-
- 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 "../libcli/auth/ntlmssp.h"
-#include "../libcli/auth/ntlmssp_private.h"
-#include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../libcli/auth/ntlmssp_ndr.h"
-#include "../libcli/auth/libcli_auth.h"
-#include "../lib/crypto/crypto.h"
-
-/**
- * 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
- * @return The 'target name' string.
- */
-
-const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
- uint32_t neg_flags, uint32_t *chal_flags)
-{
- if (neg_flags & NTLMSSP_REQUEST_TARGET) {
- *chal_flags |= NTLMSSP_NEGOTIATE_TARGET_INFO;
- *chal_flags |= NTLMSSP_REQUEST_TARGET;
- if (ntlmssp_state->server.is_standalone) {
- *chal_flags |= NTLMSSP_TARGET_TYPE_SERVER;
- return ntlmssp_state->server.netbios_name;
- } else {
- *chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN;
- return ntlmssp_state->server.netbios_domain;
- };
- } else {
- return "";
- }
-}
-
-/**
- * Next state function for the Negotiate packet
- *
- * @param ntlmssp_state NTLMSSP 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 ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB request, DATA_BLOB *reply)
-{
- DATA_BLOB struct_blob;
- uint32_t neg_flags = 0;
- uint32_t ntlmssp_command, chal_flags;
- uint8_t cryptkey[8];
- const char *target_name;
- NTSTATUS status;
-
- /* parse the NTLMSSP packet */
-#if 0
- file_save("ntlmssp_negotiate.dat", request.data, request.length);
-#endif
-
- if (request.length) {
- 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;
- }
- debug_ntlmssp_flags(neg_flags);
-
- if (DEBUGLEVEL >= 10) {
- struct NEGOTIATE_MESSAGE *negotiate = talloc(
- ntlmssp_state, struct NEGOTIATE_MESSAGE);
- if (negotiate != NULL) {
- status = ntlmssp_pull_NEGOTIATE_MESSAGE(
- &request, negotiate, negotiate);
- if (NT_STATUS_IS_OK(status)) {
- NDR_PRINT_DEBUG(NEGOTIATE_MESSAGE,
- negotiate);
- }
- TALLOC_FREE(negotiate);
- }
- }
- }
-
- ntlmssp_handle_neg_flags(ntlmssp_state, neg_flags, ntlmssp_state->allow_lm_key);
-
- /* Ask our caller what challenge they would like in the packet */
- status = ntlmssp_state->get_challenge(ntlmssp_state, cryptkey);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("ntlmssp_server_negotiate: backend doesn't give a challenge: %s\n",
- nt_errstr(status)));
- return status;
- }
-
- /* Check if we may set the challenge */
- if (!ntlmssp_state->may_set_challenge(ntlmssp_state)) {
- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
- }
-
- /* 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 creates the 'blob' of names that appears at the end of the packet */
- if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO)
- {
- status = msrpc_gen(ntlmssp_state, &struct_blob, "aaaaa",
- MsvAvNbDomainName, target_name,
- MsvAvNbComputerName, ntlmssp_state->server.netbios_name,
- MsvAvDnsDomainName, ntlmssp_state->server.dns_domain,
- MsvAvDnsComputerName, ntlmssp_state->server.dns_name,
- MsvAvEOL, "");
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
- } else {
- struct_blob = data_blob_null;
- }
-
- {
- /* Marshal the packet in the right format, be it unicode or ASCII */
- const char *gen_string;
- DATA_BLOB version_blob = data_blob_null;
-
- if (chal_flags & NTLMSSP_NEGOTIATE_VERSION) {
- enum ndr_err_code err;
- struct ntlmssp_VERSION vers;
-
- /* "What Windows returns" as a version number. */
- ZERO_STRUCT(vers);
- vers.ProductMajorVersion = NTLMSSP_WINDOWS_MAJOR_VERSION_6;
- vers.ProductMinorVersion = NTLMSSP_WINDOWS_MINOR_VERSION_1;
- vers.ProductBuild = 0;
- vers.NTLMRevisionCurrent = NTLMSSP_REVISION_W2K3;
-
- err = ndr_push_struct_blob(&version_blob,
- ntlmssp_state,
- &vers,
- (ndr_push_flags_fn_t)ndr_push_ntlmssp_VERSION);
-
- if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
- data_blob_free(&struct_blob);
- return NT_STATUS_NO_MEMORY;
- }
- }
-
- if (ntlmssp_state->unicode) {
- gen_string = "CdUdbddBb";
- } else {
- gen_string = "CdAdbddBb";
- }
-
- status = msrpc_gen(out_mem_ctx, reply, gen_string,
- "NTLMSSP",
- NTLMSSP_CHALLENGE,
- target_name,
- chal_flags,
- cryptkey, 8,
- 0, 0,
- struct_blob.data, struct_blob.length,
- version_blob.data, version_blob.length);
-
- if (!NT_STATUS_IS_OK(status)) {
- data_blob_free(&version_blob);
- data_blob_free(&struct_blob);
- return status;
- }
-
- data_blob_free(&version_blob);
-
- if (DEBUGLEVEL >= 10) {
- struct CHALLENGE_MESSAGE *challenge = talloc(
- ntlmssp_state, struct CHALLENGE_MESSAGE);
- if (challenge != NULL) {
- challenge->NegotiateFlags = chal_flags;
- status = ntlmssp_pull_CHALLENGE_MESSAGE(
- reply, challenge, challenge);
- if (NT_STATUS_IS_OK(status)) {
- NDR_PRINT_DEBUG(CHALLENGE_MESSAGE,
- challenge);
- }
- TALLOC_FREE(challenge);
- }
- }
- }
-
- data_blob_free(&struct_blob);
-
- ntlmssp_state->expected_state = NTLMSSP_AUTH;
-
- return NT_STATUS_MORE_PROCESSING_REQUIRED;
-}
-
-struct ntlmssp_server_auth_state {
- DATA_BLOB user_session_key;
- DATA_BLOB lm_session_key;
- /* internal variables used by KEY_EXCH (client-supplied user session key */
- DATA_BLOB encrypted_session_key;
- bool doing_ntlm2;
- /* internal variables used by NTLM2 */
- uint8_t session_nonce[16];
-};
-
-/**
- * Next state function for the Authenticate packet
- *
- * @param ntlmssp_state NTLMSSP State
- * @param request The request, as a DATA_BLOB
- * @return Errors or NT_STATUS_OK.
- */
-
-static NTSTATUS ntlmssp_server_preauth(struct ntlmssp_state *ntlmssp_state,
- struct ntlmssp_server_auth_state *state,
- const DATA_BLOB request)
-{
- uint32_t ntlmssp_command, auth_flags;
- NTSTATUS nt_status;
-
- uint8_t session_nonce_hash[16];
-
- const char *parse_string;
-
-#if 0
- file_save("ntlmssp_auth.dat", request.data, request.length);
-#endif
-
- if (ntlmssp_state->unicode) {
- parse_string = "CdBBUUUBd";
- } else {
- parse_string = "CdBBAAABd";
- }
-
- /* zero these out */
- data_blob_free(&ntlmssp_state->session_key);
- data_blob_free(&ntlmssp_state->lm_resp);
- data_blob_free(&ntlmssp_state->nt_resp);
-
- ntlmssp_state->user = NULL;
- ntlmssp_state->domain = NULL;
- ntlmssp_state->client.netbios_name = NULL;
-
- /* 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->client.netbios_name,
- &state->encrypted_session_key,
- &auth_flags)) {
- DEBUG(10, ("ntlmssp_server_auth: failed to parse NTLMSSP (nonfatal):\n"));
- dump_data(10, request.data, request.length);
-
- /* zero this out */
- data_blob_free(&state->encrypted_session_key);
- 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->client.netbios_name)) {
- 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;
- }
- }
-
- talloc_steal(state, state->encrypted_session_key.data);
-
- if (auth_flags)
- ntlmssp_handle_neg_flags(ntlmssp_state, auth_flags, ntlmssp_state->allow_lm_key);
-
- if (DEBUGLEVEL >= 10) {
- struct AUTHENTICATE_MESSAGE *authenticate = talloc(
- ntlmssp_state, struct AUTHENTICATE_MESSAGE);
- if (authenticate != NULL) {
- NTSTATUS status;
- authenticate->NegotiateFlags = auth_flags;
- status = ntlmssp_pull_AUTHENTICATE_MESSAGE(
- &request, authenticate, authenticate);
- if (NT_STATUS_IS_OK(status)) {
- NDR_PRINT_DEBUG(AUTHENTICATE_MESSAGE,
- authenticate);
- }
- TALLOC_FREE(authenticate);
- }
- }
-
- DEBUG(3,("Got user=[%s] domain=[%s] workstation=[%s] len1=%lu len2=%lu\n",
- ntlmssp_state->user, ntlmssp_state->domain,
- ntlmssp_state->client.netbios_name,
- (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
-
- /* 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;
- state->doing_ntlm2 = true;
-
- memcpy(state->session_nonce, ntlmssp_state->internal_chal.data, 8);
- memcpy(&state->session_nonce[8], ntlmssp_state->lm_resp.data, 8);
-
- SMB_ASSERT(ntlmssp_state->internal_chal.data && ntlmssp_state->internal_chal.length == 8);
-
- MD5Init(&md5_session_nonce_ctx);
- MD5Update(&md5_session_nonce_ctx, state->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))) {
- return nt_status;
- }
-
- /* LM Key is incompatible. */
- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
- }
- }
- return NT_STATUS_OK;
-}
-
-/**
- * Next state function for the Authenticate packet
- * (after authentication - figures out the session keys etc)
- *
- * @param ntlmssp_state NTLMSSP State
- * @return Errors or NT_STATUS_OK.
- */
-
-static NTSTATUS ntlmssp_server_postauth(struct ntlmssp_state *ntlmssp_state,
- struct ntlmssp_server_auth_state *state)
-{
- DATA_BLOB user_session_key = state->user_session_key;
- DATA_BLOB lm_session_key = state->lm_session_key;
- NTSTATUS nt_status = NT_STATUS_OK;
- DATA_BLOB session_key = data_blob(NULL, 0);
-
- 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 (state->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, state->session_nonce,
- sizeof(state->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)
- /* Ensure we can never get here on NTLMv2 */
- && (ntlmssp_state->nt_resp.length == 0 || ntlmssp_state->nt_resp.length == 24)) {
-
- 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 {
- static const uint8_t zeros[24] = {0, };
- session_key = data_blob_talloc(
- ntlmssp_state, NULL, 16);
- if (session_key.data == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
- SMBsesskeygen_lm_sess_key(zeros, zeros,
- session_key.data);
- DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n"));
- }
- dump_data_pw("LM session key:\n", session_key.data,
- session_key.length);
- } else {
- /* LM Key not selected */
- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-
- 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);
-
- /* LM Key not selected */
- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-
- } else if (lm_session_key.data) {
- /* Very weird to have LM key, but no user session key, but anyway.. */
- 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);
-
- /* LM Key not selected */
- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-
- } else {
- DEBUG(10,("ntlmssp_server_auth: Failed to create unmodified session key.\n"));
- session_key = data_blob_null;
-
- /* LM Key not selected */
- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
- }
-
- /* 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 (!state->encrypted_session_key.data
- || state->encrypted_session_key.length != 16) {
- DEBUG(1, ("Client-supplied KEY_EXCH session key was of invalid length (%u)!\n",
- (unsigned)state->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;
- talloc_steal(ntlmssp_state, session_key.data);
- } else {
- dump_data_pw("KEY_EXCH session key (enc):\n",
- state->encrypted_session_key.data,
- state->encrypted_session_key.length);
- arcfour_crypt(state->encrypted_session_key.data,
- session_key.data,
- state->encrypted_session_key.length);
- ntlmssp_state->session_key = data_blob_talloc(ntlmssp_state,
- state->encrypted_session_key.data,
- state->encrypted_session_key.length);
- dump_data_pw("KEY_EXCH session key:\n",
- state->encrypted_session_key.data,
- state->encrypted_session_key.length);
- }
- } else {
- ntlmssp_state->session_key = session_key;
- talloc_steal(ntlmssp_state, session_key.data);
- }
-
- if (ntlmssp_state->session_key.length) {
- nt_status = ntlmssp_sign_init(ntlmssp_state);
- }
-
- ntlmssp_state->expected_state = NTLMSSP_DONE;
-
- return nt_status;
-}
-
-
-/**
- * Next state function for the Authenticate packet
- *
- * @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 ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB in, DATA_BLOB *out)
-{
- struct ntlmssp_server_auth_state *state;
- NTSTATUS nt_status;
-
- /* zero the outbound NTLMSSP packet */
- *out = data_blob_null;
-
- state = talloc_zero(ntlmssp_state, struct ntlmssp_server_auth_state);
- if (state == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- nt_status = ntlmssp_server_preauth(ntlmssp_state, state, in);
- if (!NT_STATUS_IS_OK(nt_status)) {
- TALLOC_FREE(state);
- return nt_status;
- }
-
- /*
- * 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 */
- nt_status = ntlmssp_state->check_password(ntlmssp_state,
- state,
- &state->user_session_key,
- &state->lm_session_key);
- if (!NT_STATUS_IS_OK(nt_status)) {
- TALLOC_FREE(state);
- return nt_status;
- }
-
- /* When we get more async in the auth code behind
- ntlmssp_state->check_password, the ntlmssp_server_postpath
- can be done in a callback */
-
- nt_status = ntlmssp_server_postauth(ntlmssp_state, state);
- TALLOC_FREE(state);
- return nt_status;
-}
diff --git a/libcli/auth/ntlmssp_sign.c b/libcli/auth/ntlmssp_sign.c
deleted file mode 100644
index 42b459c6d4..0000000000
--- a/libcli/auth/ntlmssp_sign.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Version 3.0
- * NTLMSSP Signing routines
- * Copyright (C) Andrew Bartlett 2003-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 "../libcli/auth/ntlmssp.h"
-#include "../libcli/auth/libcli_auth.h"
-#include "../lib/crypto/md5.h"
-#include "../lib/crypto/hmacmd5.h"
-#include "../lib/crypto/crc32.h"
-#include "../libcli/auth/ntlmssp_private.h"
-
-#define CLI_SIGN "session key to client-to-server signing key magic constant"
-#define CLI_SEAL "session key to client-to-server sealing key magic constant"
-#define SRV_SIGN "session key to server-to-client signing key magic constant"
-#define SRV_SEAL "session key to server-to-client sealing key magic constant"
-
-/**
- * Some notes on the NTLM2 code:
- *
- * NTLM2 is a AEAD system. This means that the data encrypted is not
- * all the data that is signed. In DCE-RPC case, the headers of the
- * DCE-RPC packets are also signed. This prevents some of the
- * fun-and-games one might have by changing them.
- *
- */
-
-static void dump_arc4_state(const char *description,
- struct arcfour_state *state)
-{
- dump_data_pw(description, state->sbox, sizeof(state->sbox));
-}
-
-static void calc_ntlmv2_key(uint8_t subkey[16],
- DATA_BLOB session_key,
- const char *constant)
-{
- struct MD5Context ctx3;
- MD5Init(&ctx3);
- MD5Update(&ctx3, session_key.data, session_key.length);
- MD5Update(&ctx3, (const uint8_t *)constant, strlen(constant)+1);
- MD5Final(subkey, &ctx3);
-}
-
-enum ntlmssp_direction {
- NTLMSSP_SEND,
- NTLMSSP_RECEIVE
-};
-
-static NTSTATUS ntlmssp_make_packet_signature(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *sig_mem_ctx,
- const uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- enum ntlmssp_direction direction,
- DATA_BLOB *sig, bool encrypt_sig)
-{
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- HMACMD5Context ctx;
- uint8_t digest[16];
- uint8_t seq_num[4];
-
- *sig = data_blob_talloc(sig_mem_ctx, NULL, NTLMSSP_SIG_SIZE);
- if (!sig->data) {
- return NT_STATUS_NO_MEMORY;
- }
-
- switch (direction) {
- case NTLMSSP_SEND:
- DEBUG(100,("ntlmssp_make_packet_signature: SEND seq = %u, len = %u, pdu_len = %u\n",
- ntlmssp_state->crypt->ntlm2.sending.seq_num,
- (unsigned int)length,
- (unsigned int)pdu_length));
-
- SIVAL(seq_num, 0, ntlmssp_state->crypt->ntlm2.sending.seq_num);
- ntlmssp_state->crypt->ntlm2.sending.seq_num++;
- hmac_md5_init_limK_to_64(ntlmssp_state->crypt->ntlm2.sending.sign_key, 16, &ctx);
- break;
- case NTLMSSP_RECEIVE:
-
- DEBUG(100,("ntlmssp_make_packet_signature: RECV seq = %u, len = %u, pdu_len = %u\n",
- ntlmssp_state->crypt->ntlm2.receiving.seq_num,
- (unsigned int)length,
- (unsigned int)pdu_length));
-
- SIVAL(seq_num, 0, ntlmssp_state->crypt->ntlm2.receiving.seq_num);
- ntlmssp_state->crypt->ntlm2.receiving.seq_num++;
- hmac_md5_init_limK_to_64(ntlmssp_state->crypt->ntlm2.receiving.sign_key, 16, &ctx);
- break;
- }
-
- dump_data_pw("pdu data ", whole_pdu, pdu_length);
-
- hmac_md5_update(seq_num, sizeof(seq_num), &ctx);
- hmac_md5_update(whole_pdu, pdu_length, &ctx);
- hmac_md5_final(digest, &ctx);
-
- if (encrypt_sig && (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
- switch (direction) {
- case NTLMSSP_SEND:
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm2.sending.seal_state,
- digest, 8);
- break;
- case NTLMSSP_RECEIVE:
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm2.receiving.seal_state,
- digest, 8);
- break;
- }
- }
-
- SIVAL(sig->data, 0, NTLMSSP_SIGN_VERSION);
- memcpy(sig->data + 4, digest, 8);
- memcpy(sig->data + 12, seq_num, 4);
-
- dump_data_pw("ntlmssp v2 sig ", sig->data, sig->length);
-
- } else {
- NTSTATUS status;
- uint32_t crc;
-
- crc = crc32_calc_buffer(data, length);
-
- status = msrpc_gen(sig_mem_ctx,
- sig, "dddd",
- NTLMSSP_SIGN_VERSION, 0, crc,
- ntlmssp_state->crypt->ntlm.seq_num);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- ntlmssp_state->crypt->ntlm.seq_num++;
-
- dump_arc4_state("ntlmssp hash: \n",
- &ntlmssp_state->crypt->ntlm.seal_state);
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm.seal_state,
- sig->data+4, sig->length-4);
- }
- return NT_STATUS_OK;
-}
-
-NTSTATUS ntlmssp_sign_packet(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *sig_mem_ctx,
- const uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- DATA_BLOB *sig)
-{
- NTSTATUS nt_status;
-
- if (!(ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
- DEBUG(3, ("NTLMSSP Signing not negotiated - cannot sign packet!\n"));
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- if (!ntlmssp_state->session_key.length) {
- DEBUG(3, ("NO session key, cannot check sign packet\n"));
- return NT_STATUS_NO_USER_SESSION_KEY;
- }
-
- nt_status = ntlmssp_make_packet_signature(ntlmssp_state,
- sig_mem_ctx,
- data, length,
- whole_pdu, pdu_length,
- NTLMSSP_SEND, sig, true);
-
- return nt_status;
-}
-
-/**
- * Check the signature of an incoming packet
- * @note caller *must* check that the signature is the size it expects
- *
- */
-
-NTSTATUS ntlmssp_check_packet(struct ntlmssp_state *ntlmssp_state,
- const uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- const DATA_BLOB *sig)
-{
- DATA_BLOB local_sig;
- NTSTATUS nt_status;
- TALLOC_CTX *tmp_ctx;
-
- if (!ntlmssp_state->session_key.length) {
- DEBUG(3, ("NO session key, cannot check packet signature\n"));
- return NT_STATUS_NO_USER_SESSION_KEY;
- }
-
- if (sig->length < 8) {
- DEBUG(0, ("NTLMSSP packet check failed due to short signature (%lu bytes)!\n",
- (unsigned long)sig->length));
- }
-
- tmp_ctx = talloc_new(ntlmssp_state);
- if (!tmp_ctx) {
- return NT_STATUS_NO_MEMORY;
- }
-
- nt_status = ntlmssp_make_packet_signature(ntlmssp_state,
- tmp_ctx,
- data, length,
- whole_pdu, pdu_length,
- NTLMSSP_RECEIVE,
- &local_sig, true);
-
- if (!NT_STATUS_IS_OK(nt_status)) {
- DEBUG(0,("NTLMSSP packet sig creation failed with %s\n",
- nt_errstr(nt_status)));
- talloc_free(tmp_ctx);
- return nt_status;
- }
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- if (local_sig.length != sig->length ||
- memcmp(local_sig.data, sig->data, sig->length) != 0) {
- DEBUG(5, ("BAD SIG NTLM2: wanted signature of\n"));
- dump_data(5, local_sig.data, local_sig.length);
-
- DEBUG(5, ("BAD SIG: got signature of\n"));
- dump_data(5, sig->data, sig->length);
-
- DEBUG(0, ("NTLMSSP NTLM2 packet check failed due to invalid signature!\n"));
- talloc_free(tmp_ctx);
- return NT_STATUS_ACCESS_DENIED;
- }
- } else {
- if (local_sig.length != sig->length ||
- memcmp(local_sig.data + 8, sig->data + 8, sig->length - 8) != 0) {
- DEBUG(5, ("BAD SIG NTLM1: wanted signature of\n"));
- dump_data(5, local_sig.data, local_sig.length);
-
- DEBUG(5, ("BAD SIG: got signature of\n"));
- dump_data(5, sig->data, sig->length);
-
- DEBUG(0, ("NTLMSSP NTLM1 packet check failed due to invalid signature!\n"));
- talloc_free(tmp_ctx);
- return NT_STATUS_ACCESS_DENIED;
- }
- }
- dump_data_pw("checked ntlmssp signature\n", sig->data, sig->length);
- DEBUG(10,("ntlmssp_check_packet: NTLMSSP signature OK !\n"));
-
- talloc_free(tmp_ctx);
- return NT_STATUS_OK;
-}
-
-/**
- * Seal data with the NTLMSSP algorithm
- *
- */
-
-NTSTATUS ntlmssp_seal_packet(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *sig_mem_ctx,
- uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- DATA_BLOB *sig)
-{
- if (!(ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
- DEBUG(3, ("NTLMSSP Sealing not negotiated - cannot seal packet!\n"));
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- if (!ntlmssp_state->session_key.length) {
- DEBUG(3, ("NO session key, cannot seal packet\n"));
- return NT_STATUS_NO_USER_SESSION_KEY;
- }
-
- DEBUG(10,("ntlmssp_seal_data: seal\n"));
- dump_data_pw("ntlmssp clear data\n", data, length);
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- NTSTATUS nt_status;
- /*
- * The order of these two operations matters - we
- * must first seal the packet, then seal the
- * sequence number - this is because the
- * send_seal_hash is not constant, but is is rather
- * updated with each iteration
- */
- nt_status = ntlmssp_make_packet_signature(ntlmssp_state,
- sig_mem_ctx,
- data, length,
- whole_pdu, pdu_length,
- NTLMSSP_SEND,
- sig, false);
- if (!NT_STATUS_IS_OK(nt_status)) {
- return nt_status;
- }
-
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm2.sending.seal_state,
- data, length);
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm2.sending.seal_state,
- sig->data+4, 8);
- }
- } else {
- NTSTATUS status;
- uint32_t crc;
-
- crc = crc32_calc_buffer(data, length);
-
- status = msrpc_gen(sig_mem_ctx,
- sig, "dddd",
- NTLMSSP_SIGN_VERSION, 0, crc,
- ntlmssp_state->crypt->ntlm.seq_num);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- /*
- * The order of these two operations matters - we
- * must first seal the packet, then seal the
- * sequence number - this is because the ntlmv1_arc4_state
- * is not constant, but is is rather updated with
- * each iteration
- */
-
- dump_arc4_state("ntlmv1 arc4 state:\n",
- &ntlmssp_state->crypt->ntlm.seal_state);
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm.seal_state,
- data, length);
-
- dump_arc4_state("ntlmv1 arc4 state:\n",
- &ntlmssp_state->crypt->ntlm.seal_state);
-
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm.seal_state,
- sig->data+4, sig->length-4);
-
- ntlmssp_state->crypt->ntlm.seq_num++;
- }
- dump_data_pw("ntlmssp signature\n", sig->data, sig->length);
- dump_data_pw("ntlmssp sealed data\n", data, length);
-
- return NT_STATUS_OK;
-}
-
-/**
- * Unseal data with the NTLMSSP algorithm
- *
- */
-
-NTSTATUS ntlmssp_unseal_packet(struct ntlmssp_state *ntlmssp_state,
- uint8_t *data, size_t length,
- const uint8_t *whole_pdu, size_t pdu_length,
- const DATA_BLOB *sig)
-{
- NTSTATUS status;
- if (!ntlmssp_state->session_key.length) {
- DEBUG(3, ("NO session key, cannot unseal packet\n"));
- return NT_STATUS_NO_USER_SESSION_KEY;
- }
-
- DEBUG(10,("ntlmssp_unseal_packet: seal\n"));
- dump_data_pw("ntlmssp sealed data\n", data, length);
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- /* First unseal the data. */
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm2.receiving.seal_state,
- data, length);
- dump_data_pw("ntlmv2 clear data\n", data, length);
- } else {
- arcfour_crypt_sbox(&ntlmssp_state->crypt->ntlm.seal_state,
- data, length);
- dump_data_pw("ntlmv1 clear data\n", data, length);
- }
- status = ntlmssp_check_packet(ntlmssp_state,
- data, length,
- whole_pdu, pdu_length,
- sig);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1,("NTLMSSP packet check for unseal failed due to invalid signature on %llu bytes of input:\n",
- (unsigned long long)length));
- }
- return status;
-}
-
-NTSTATUS ntlmssp_wrap(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB *in,
- DATA_BLOB *out)
-{
- NTSTATUS nt_status;
- DATA_BLOB sig;
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
- *out = data_blob_talloc(out_mem_ctx, NULL, in->length + NTLMSSP_SIG_SIZE);
- if (!out->data) {
- return NT_STATUS_NO_MEMORY;
- }
- memcpy(out->data + NTLMSSP_SIG_SIZE, in->data, in->length);
-
- nt_status = ntlmssp_seal_packet(ntlmssp_state, out_mem_ctx,
- out->data + NTLMSSP_SIG_SIZE,
- out->length - NTLMSSP_SIG_SIZE,
- out->data + NTLMSSP_SIG_SIZE,
- out->length - NTLMSSP_SIG_SIZE,
- &sig);
-
- if (NT_STATUS_IS_OK(nt_status)) {
- memcpy(out->data, sig.data, NTLMSSP_SIG_SIZE);
- talloc_free(sig.data);
- }
- return nt_status;
-
- } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
-
- *out = data_blob_talloc(out_mem_ctx, NULL, in->length + NTLMSSP_SIG_SIZE);
- if (!out->data) {
- return NT_STATUS_NO_MEMORY;
- }
- memcpy(out->data + NTLMSSP_SIG_SIZE, in->data, in->length);
-
- nt_status = ntlmssp_sign_packet(ntlmssp_state, out_mem_ctx,
- out->data + NTLMSSP_SIG_SIZE,
- out->length - NTLMSSP_SIG_SIZE,
- out->data + NTLMSSP_SIG_SIZE,
- out->length - NTLMSSP_SIG_SIZE,
- &sig);
-
- if (NT_STATUS_IS_OK(nt_status)) {
- memcpy(out->data, sig.data, NTLMSSP_SIG_SIZE);
- talloc_free(sig.data);
- }
- return nt_status;
- } else {
- *out = data_blob_talloc(out_mem_ctx, in->data, in->length);
- if (!out->data) {
- return NT_STATUS_NO_MEMORY;
- }
- return NT_STATUS_OK;
- }
-}
-
-NTSTATUS ntlmssp_unwrap(struct ntlmssp_state *ntlmssp_state,
- TALLOC_CTX *out_mem_ctx,
- const DATA_BLOB *in,
- DATA_BLOB *out)
-{
- DATA_BLOB sig;
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
- if (in->length < NTLMSSP_SIG_SIZE) {
- return NT_STATUS_INVALID_PARAMETER;
- }
- sig.data = in->data;
- sig.length = NTLMSSP_SIG_SIZE;
-
- *out = data_blob_talloc(out_mem_ctx, in->data + NTLMSSP_SIG_SIZE, in->length - NTLMSSP_SIG_SIZE);
-
- return ntlmssp_unseal_packet(ntlmssp_state,
- out->data, out->length,
- out->data, out->length,
- &sig);
-
- } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
- NTSTATUS status;
- struct ntlmssp_crypt_direction save_direction;
-
- if (in->length < NTLMSSP_SIG_SIZE) {
- return NT_STATUS_INVALID_PARAMETER;
- }
- sig.data = in->data;
- sig.length = NTLMSSP_SIG_SIZE;
- *out = data_blob_talloc(out_mem_ctx, in->data + NTLMSSP_SIG_SIZE, in->length - NTLMSSP_SIG_SIZE);
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- save_direction = ntlmssp_state->crypt->ntlm2.receiving;
- } else {
- save_direction = ntlmssp_state->crypt->ntlm;
- }
-
- status = ntlmssp_check_packet(ntlmssp_state,
- out->data, out->length,
- out->data, out->length,
- &sig);
- if (!NT_STATUS_IS_OK(status)) {
- NTSTATUS check_status = status;
- /*
- * The Windows LDAP libraries seems to have a bug
- * and always use sealing even if only signing was
- * negotiated. So we need to fallback.
- */
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- ntlmssp_state->crypt->ntlm2.receiving = save_direction;
- } else {
- ntlmssp_state->crypt->ntlm = save_direction;
- }
-
- status = ntlmssp_unseal_packet(ntlmssp_state,
- out->data,
- out->length,
- out->data,
- out->length,
- &sig);
- if (NT_STATUS_IS_OK(status)) {
- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
- } else {
- status = check_status;
- }
- }
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("NTLMSSP packet check for unwrap failed due to invalid signature\n"));
- }
- return status;
- } else {
- *out = data_blob_talloc(out_mem_ctx, in->data, in->length);
- if (!out->data) {
- return NT_STATUS_NO_MEMORY;
- }
- return NT_STATUS_OK;
- }
-}
-
-/**
- Initialise the state for NTLMSSP signing.
-*/
-NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state)
-{
- DEBUG(3, ("NTLMSSP Sign/Seal - Initialising with flags:\n"));
- debug_ntlmssp_flags(ntlmssp_state->neg_flags);
-
- if (ntlmssp_state->session_key.length < 8) {
- DEBUG(3, ("NO session key, cannot intialise signing\n"));
- return NT_STATUS_NO_USER_SESSION_KEY;
- }
-
- ntlmssp_state->crypt = talloc_zero(ntlmssp_state,
- union ntlmssp_crypt_state);
- if (ntlmssp_state->crypt == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- DATA_BLOB weak_session_key = ntlmssp_state->session_key;
- const char *send_sign_const;
- const char *send_seal_const;
- const char *recv_sign_const;
- const char *recv_seal_const;
- uint8_t send_seal_key[16];
- DATA_BLOB send_seal_blob = data_blob_const(send_seal_key,
- sizeof(send_seal_key));
- uint8_t recv_seal_key[16];
- DATA_BLOB recv_seal_blob = data_blob_const(recv_seal_key,
- sizeof(recv_seal_key));
-
- switch (ntlmssp_state->role) {
- case NTLMSSP_CLIENT:
- send_sign_const = CLI_SIGN;
- send_seal_const = CLI_SEAL;
- recv_sign_const = SRV_SIGN;
- recv_seal_const = SRV_SEAL;
- break;
- case NTLMSSP_SERVER:
- send_sign_const = SRV_SIGN;
- send_seal_const = SRV_SEAL;
- recv_sign_const = CLI_SIGN;
- recv_seal_const = CLI_SEAL;
- break;
- default:
- return NT_STATUS_INTERNAL_ERROR;
- }
-
- /*
- * Weaken NTLMSSP keys to cope with down-level
- * clients, servers and export restrictions.
- *
- * We probably should have some parameters to
- * control this, once we get NTLM2 working.
- *
- * Key weakening was not performed on the master key
- * for NTLM2, but must be done on the encryption subkeys only.
- */
-
- if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_128) {
- /* nothing to do */
- } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_56) {
- weak_session_key.length = 7;
- } else { /* forty bits */
- weak_session_key.length = 5;
- }
-
- dump_data_pw("NTLMSSP weakend master key:\n",
- weak_session_key.data,
- weak_session_key.length);
-
- /* SEND: sign key */
- calc_ntlmv2_key(ntlmssp_state->crypt->ntlm2.sending.sign_key,
- ntlmssp_state->session_key, send_sign_const);
- dump_data_pw("NTLMSSP send sign key:\n",
- ntlmssp_state->crypt->ntlm2.sending.sign_key, 16);
-
- /* SEND: seal ARCFOUR pad */
- calc_ntlmv2_key(send_seal_key,
- weak_session_key, send_seal_const);
- dump_data_pw("NTLMSSP send seal key:\n", send_seal_key, 16);
-
- arcfour_init(&ntlmssp_state->crypt->ntlm2.sending.seal_state,
- &send_seal_blob);
-
- dump_arc4_state("NTLMSSP send seal arc4 state:\n",
- &ntlmssp_state->crypt->ntlm2.sending.seal_state);
-
- /* SEND: seq num */
- ntlmssp_state->crypt->ntlm2.sending.seq_num = 0;
-
- /* RECV: sign key */
- calc_ntlmv2_key(ntlmssp_state->crypt->ntlm2.receiving.sign_key,
- ntlmssp_state->session_key, recv_sign_const);
- dump_data_pw("NTLMSSP recv sign key:\n",
- ntlmssp_state->crypt->ntlm2.receiving.sign_key, 16);
-
- /* RECV: seal ARCFOUR pad */
- calc_ntlmv2_key(recv_seal_key,
- weak_session_key, recv_seal_const);
- dump_data_pw("NTLMSSP recv seal key:\n", recv_seal_key, 16);
-
- arcfour_init(&ntlmssp_state->crypt->ntlm2.receiving.seal_state,
- &recv_seal_blob);
-
- dump_arc4_state("NTLMSSP recv seal arc4 state:\n",
- &ntlmssp_state->crypt->ntlm2.receiving.seal_state);
-
- /* RECV: seq num */
- ntlmssp_state->crypt->ntlm2.receiving.seq_num = 0;
- } else {
- uint8_t weak_session_key[8];
- DATA_BLOB seal_session_key = ntlmssp_state->session_key;
- bool do_weak = false;
-
- DEBUG(5, ("NTLMSSP Sign/Seal - using NTLM1\n"));
-
- /*
- * 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) {
- do_weak = true;
- }
-
- /*
- * Nothing to weaken.
- * We certainly don't want to 'extend' the length...
- */
- if (seal_session_key.length < 16) {
- /* TODO: is this really correct? */
- do_weak = false;
- }
-
- if (do_weak) {
- memcpy(weak_session_key, seal_session_key.data, 8);
- seal_session_key = data_blob_const(weak_session_key, 8);
-
- /*
- * 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) {
- weak_session_key[7] = 0xa0;
- } else { /* forty bits */
- weak_session_key[5] = 0xe5;
- weak_session_key[6] = 0x38;
- weak_session_key[7] = 0xb0;
- }
- }
-
- arcfour_init(&ntlmssp_state->crypt->ntlm.seal_state,
- &seal_session_key);
-
- dump_arc4_state("NTLMv1 arc4 state:\n",
- &ntlmssp_state->crypt->ntlm.seal_state);
-
- ntlmssp_state->crypt->ntlm.seq_num = 0;
- }
-
- return NT_STATUS_OK;
-}
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 2afab44ac2..a140df2cc0 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -2,20 +2,19 @@
bld.SAMBA_LIBRARY('cliauth',
source='',
- deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE KRB5_WRAP errors',
+ deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE KRB5_WRAP errors NTLM_CHECK',
private_library=True,
grouping_library=True)
-bld.SAMBA_SUBSYSTEM('NTLMSSP_COMMON',
- source='ntlmssp.c ntlmssp_ndr.c ntlmssp_server.c ntlmssp_sign.c ntlm_check.c',
- deps='samba-util NDR_NTLMSSP MSRPC_PARSE')
-
-
bld.SAMBA_SUBSYSTEM('MSRPC_PARSE',
source='msrpc_parse.c',
deps='talloc'
)
+bld.SAMBA_SUBSYSTEM('NTLM_CHECK',
+ source='ntlm_check.c',
+ deps = 'talloc'
+ )
bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
source='credentials.c session.c smbencrypt.c smbdes.c',