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>

diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/gensec_ntlmssp.c
similarity index 58%
rename from source4/auth/ntlmssp/ntlmssp_sign.c
rename to auth/ntlmssp/gensec_ntlmssp.c
index 72cd1549fefae48729279380436cf51685d494b1..55b2f8748a344fe1f8fb23841ee61fc427081538 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/auth/ntlmssp/gensec_ntlmssp.c
@@ -22,7 +22,114 @@
 #include "includes.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/gensec/gensec.h"
-#include "../libcli/auth/ntlmssp_private.h"
+#include "auth/ntlmssp/ntlmssp_private.h"
+
+NTSTATUS gensec_ntlmssp_magic(struct gensec_security *gensec_security,
+                             const DATA_BLOB *first_packet)
+{
+       if (ntlmssp_blob_matches_magic(first_packet)) {
+               return NT_STATUS_OK;
+       } else {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+}
+
+/**
+ * Return the NTLMSSP master session key
+ *
+ * @param ntlmssp_state NTLMSSP State
+ */
+
+NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security,
+                                   TALLOC_CTX *mem_ctx,
+                                   DATA_BLOB *session_key)
+{
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+
+       if (ntlmssp_state->expected_state != NTLMSSP_DONE) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+
+       if (!ntlmssp_state->session_key.data) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
+       *session_key = data_blob_talloc(mem_ctx, ntlmssp_state->session_key.data, ntlmssp_state->session_key.length);
+       if (!session_key->data) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       return NT_STATUS_OK;
+}
+
+bool gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
+                                uint32_t feature)
+{
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+
+       if (feature & GENSEC_FEATURE_SIGN) {
+               if (!ntlmssp_state->session_key.length) {
+                       return false;
+               }
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
+                       return true;
+               }
+       }
+       if (feature & GENSEC_FEATURE_SEAL) {
+               if (!ntlmssp_state->session_key.length) {
+                       return false;
+               }
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
+                       return true;
+               }
+       }
+       if (feature & GENSEC_FEATURE_SESSION_KEY) {
+               if (ntlmssp_state->session_key.length) {
+                       return true;
+               }
+       }
+       if (feature & GENSEC_FEATURE_DCE_STYLE) {
+               return true;
+       }
+       if (feature & GENSEC_FEATURE_ASYNC_REPLIES) {
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+                       return true;
+               }
+       }
+       return false;
+}
+
+NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
+{
+       struct gensec_ntlmssp_context *gensec_ntlmssp;
+       struct ntlmssp_state *ntlmssp_state;
+
+       gensec_ntlmssp = talloc_zero(gensec_security,
+                                    struct gensec_ntlmssp_context);
+       if (!gensec_ntlmssp) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       gensec_ntlmssp->gensec_security = gensec_security;
+
+       ntlmssp_state = talloc_zero(gensec_ntlmssp,
+                                   struct ntlmssp_state);
+       if (!ntlmssp_state) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ntlmssp_state->callback_private = gensec_ntlmssp;
+
+       gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
+
+       gensec_security->private_data = gensec_ntlmssp;
+       return NT_STATUS_OK;
+}
 
 NTSTATUS gensec_ntlmssp_sign_packet(struct gensec_security *gensec_security,
                                    TALLOC_CTX *sig_mem_ctx,
@@ -103,14 +210,14 @@ NTSTATUS gensec_ntlmssp_unseal_packet(struct gensec_security *gensec_security,
        return nt_status;
 }
 
-size_t gensec_ntlmssp_sig_size(struct gensec_security *gensec_security, size_t data_size) 
+size_t gensec_ntlmssp_sig_size(struct gensec_security *gensec_security, size_t data_size)
 {
        return NTLMSSP_SIG_SIZE;
 }
 
-NTSTATUS gensec_ntlmssp_wrap(struct gensec_security *gensec_security, 
+NTSTATUS gensec_ntlmssp_wrap(struct gensec_security *gensec_security,
                             TALLOC_CTX *out_mem_ctx,
-                            const DATA_BLOB *in, 
+                            const DATA_BLOB *in,
                             DATA_BLOB *out)
 {
        struct gensec_ntlmssp_context *gensec_ntlmssp =
@@ -123,9 +230,9 @@ NTSTATUS gensec_ntlmssp_wrap(struct gensec_security *gensec_security,
 }
 
 
-NTSTATUS gensec_ntlmssp_unwrap(struct gensec_security *gensec_security, 
+NTSTATUS gensec_ntlmssp_unwrap(struct gensec_security *gensec_security,
                               TALLOC_CTX *out_mem_ctx,
-                              const DATA_BLOB *in, 
+                              const DATA_BLOB *in,
                               DATA_BLOB *out)
 {
        struct gensec_ntlmssp_context *gensec_ntlmssp =

diff --git a/libcli/auth/ntlmssp.c b/auth/ntlmssp/ntlmssp.c
similarity index 98%
rename from libcli/auth/ntlmssp.c
rename to auth/ntlmssp/ntlmssp.c
index 4817329314af347bdef99874c1ae46d211efee41..96793abfda1dc8199abfa3979202c091a4298ee5 100644 (file)
--- a/libcli/auth/ntlmssp.c
+++ b/auth/ntlmssp/ntlmssp.c
@@ -22,8 +22,8 @@
 */
 
 #include "includes.h"
-#include "../libcli/auth/ntlmssp.h"
-#include "../libcli/auth/ntlmssp_private.h"
+#include "../auth/ntlmssp/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp_private.h"
 
 /**
  * Print out the NTLMSSP flags for debugging

diff --git a/libcli/auth/ntlmssp.h b/auth/ntlmssp/ntlmssp.h
similarity index 72%
rename from libcli/auth/ntlmssp.h
rename to auth/ntlmssp/ntlmssp.h
index cf8bb8dd301cc1e63fc9d973274ef88901620acf..93bfb258240159694ce116119bc1a89b6bea99f2 100644 (file)
--- a/libcli/auth/ntlmssp.h
+++ b/auth/ntlmssp/ntlmssp.h
@@ -22,6 +22,14 @@
 
 #include "../librpc/gen_ndr/ntlmssp.h"
 
+NTSTATUS gensec_ntlmssp_init(void);
+
+struct gensec_ntlmssp_context {
+       struct gensec_security *gensec_security;
+       struct ntlmssp_state *ntlmssp_state;
+       struct auth_user_info_dc *user_info_dc;
+};
+
 /* NTLMSSP mode */
 enum ntlmssp_role
 {
@@ -171,3 +179,49 @@ NTSTATUS ntlmssp_unwrap(struct ntlmssp_state *ntlmssp_stae,
 NTSTATUS ntlmssp_sign_init(struct ntlmssp_state *ntlmssp_state);
 
 bool ntlmssp_blob_matches_magic(const DATA_BLOB *blob);
+/* The following definitions come from ../source4/auth/ntlmssp/ntlmssp.c  */
+
+
+/**
+ * Return the NTLMSSP master session key
+ *
+ * @param ntlmssp_state NTLMSSP State
+ */
+NTSTATUS gensec_ntlmssp_magic(struct gensec_security *gensec_security,
+                             const DATA_BLOB *first_packet);
+bool gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
+                                uint32_t feature);
+NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security,
+                                   TALLOC_CTX *mem_ctx,
+                                   DATA_BLOB *session_key);
+NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security);
+
+/* The following definitions come from ../source4/auth/ntlmssp/ntlmssp_sign.c  */
+
+NTSTATUS gensec_ntlmssp_sign_packet(struct gensec_security *gensec_security,
+                                   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 gensec_ntlmssp_check_packet(struct gensec_security *gensec_security,
+                                    const uint8_t *data, size_t length,
+                                    const uint8_t *whole_pdu, size_t pdu_length,
+                                    const DATA_BLOB *sig);
+NTSTATUS gensec_ntlmssp_seal_packet(struct gensec_security *gensec_security,
+                                   TALLOC_CTX *sig_mem_ctx,
+                                   uint8_t *data, size_t length,
+                                   const uint8_t *whole_pdu, size_t pdu_length,
+                                   DATA_BLOB *sig);
+NTSTATUS gensec_ntlmssp_unseal_packet(struct gensec_security *gensec_security,
+                                     uint8_t *data, size_t length,
+                                     const uint8_t *whole_pdu, size_t pdu_length,
+                                     const DATA_BLOB *sig);
+size_t gensec_ntlmssp_sig_size(struct gensec_security *gensec_security, size_t data_size) ;
+NTSTATUS gensec_ntlmssp_wrap(struct gensec_security *gensec_security,
+                            TALLOC_CTX *out_mem_ctx,
+                            const DATA_BLOB *in,
+                            DATA_BLOB *out);
+NTSTATUS gensec_ntlmssp_unwrap(struct gensec_security *gensec_security,
+                              TALLOC_CTX *out_mem_ctx,
+                              const DATA_BLOB *in,
+                              DATA_BLOB *out);

diff --git a/libcli/auth/ntlmssp_ndr.c b/auth/ntlmssp/ntlmssp_ndr.c
similarity index 98%
rename from libcli/auth/ntlmssp_ndr.c
rename to auth/ntlmssp/ntlmssp_ndr.c
index fd31e853d2cf515db0087497633b77822875728f..af24be9dc228e935667d60f32f70a36675fdc8d3 100644 (file)
--- a/libcli/auth/ntlmssp_ndr.c
+++ b/auth/ntlmssp/ntlmssp_ndr.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../libcli/auth/ntlmssp_ndr.h"
+#include "ntlmssp_ndr.h"
 
 #define NTLMSSP_PULL_MESSAGE(type, blob, mem_ctx, r) \
 do { \

diff --git a/libcli/auth/ntlmssp_ndr.h b/auth/ntlmssp/ntlmssp_ndr.h
similarity index 100%
rename from libcli/auth/ntlmssp_ndr.h
rename to auth/ntlmssp/ntlmssp_ndr.h

diff --git a/libcli/auth/ntlmssp_private.h b/auth/ntlmssp/ntlmssp_private.h
similarity index 92%
rename from libcli/auth/ntlmssp_private.h
rename to auth/ntlmssp/ntlmssp_private.h
index ff7b285b41b45ddb0eaecdda8f853fda2bf5bf36..fc74428288540847e962260deba0993053575b23 100644 (file)
--- a/libcli/auth/ntlmssp_private.h
+++ b/auth/ntlmssp/ntlmssp_private.h
@@ -39,13 +39,13 @@ union ntlmssp_crypt_state {
        } ntlm2;
 };
 
-/* The following definitions come from libcli/auth/ntlmssp.c  */
+/* The following definitions come from 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  */
+/* The following definitions come from auth/ntlmssp_server.c  */
 
 const char *ntlmssp_target_name(struct ntlmssp_state *ntlmssp_state,
                                uint32_t neg_flags, uint32_t *chal_flags);

diff --git a/libcli/auth/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c
similarity index 99%
rename from libcli/auth/ntlmssp_server.c
rename to auth/ntlmssp/ntlmssp_server.c
index 802ac402b4969fb861117db53c0b182661b47ad0..b190cf3ab761dd05bca94e82afe142741768fd04 100644 (file)
--- a/libcli/auth/ntlmssp_server.c
+++ b/auth/ntlmssp/ntlmssp_server.c
@@ -21,10 +21,10 @@
 */
 
 #include "includes.h"
-#include "../libcli/auth/ntlmssp.h"
-#include "../libcli/auth/ntlmssp_private.h"
+#include "auth/ntlmssp/ntlmssp.h"
+#include "auth/ntlmssp/ntlmssp_private.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../libcli/auth/ntlmssp_ndr.h"
+#include "auth/ntlmssp/ntlmssp_ndr.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/crypto.h"
 

diff --git a/libcli/auth/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c
similarity index 99%
rename from libcli/auth/ntlmssp_sign.c
rename to auth/ntlmssp/ntlmssp_sign.c
index 42b459c6d47a0f0ee5b5d71b1d65e4e537f65794..019ea3ce3b3b99574db5bbb74bf0bf47be3e89c9 100644 (file)
--- a/libcli/auth/ntlmssp_sign.c
+++ b/auth/ntlmssp/ntlmssp_sign.c
@@ -19,12 +19,12 @@
  */
 
 #include "includes.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/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"
+#include "../auth/ntlmssp/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"

diff --git a/auth/ntlmssp/wscript_build b/auth/ntlmssp/wscript_build
new file mode 100644 (file)
index 0000000..16c31ac
--- /dev/null
+++ b/auth/ntlmssp/wscript_build
@@ -0,0 +1,3 @@
+bld.SAMBA_SUBSYSTEM('NTLMSSP_COMMON',
+                    source='gensec_ntlmssp.c ntlmssp.c ntlmssp_ndr.c ntlmssp_server.c ntlmssp_sign.c',
+                    deps='samba-util NDR_NTLMSSP MSRPC_PARSE NTLM_CHECK')

diff --git a/auth/wscript_build b/auth/wscript_build
index 540317a40135db12297cabb2757cbdb8f4a54fc7..01948151a142ad4907954334b7a02ae95e48cbbb 100644 (file)
--- a/auth/wscript_build
+++ b/auth/wscript_build
@@ -8,4 +8,5 @@ bld.SAMBA_LIBRARY('auth_sam_reply',
                   )
 
 bld.RECURSE('gensec')
+bld.RECURSE('ntlmssp')
 bld.RECURSE('credentials')

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 2afab44ac24ee9a1de6c8fb4ed11017e975c7392..a140df2cc08e57c308d0dd5ed160d89a06a74c65 100644 (file)
--- 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',

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9e74d08ad9bef0eeea5f8199e491de0d5a3832cf..89f3ec99bfa4df1b2e779a63e72f94b2ab29c691 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -562,11 +562,11 @@ LIBSMB_OBJ0 = \
               ../auth/gensec/gensec_start.o \
               ../auth/credentials/credentials.o \
               ../auth/credentials/credentials_samba3.o \
-              ../libcli/auth/ntlmssp.o \
-              ../libcli/auth/ntlmssp_sign.o \
+              ../auth/ntlmssp/ntlmssp.o \
+              ../auth/ntlmssp/ntlmssp_sign.o \
               $(LIBNDR_NTLMSSP_OBJ) \
-              ../libcli/auth/ntlmssp_ndr.o \
-              ../libcli/auth/ntlmssp_server.o
+              ../auth/ntlmssp/ntlmssp_ndr.o \
+              ../auth/ntlmssp/ntlmssp_server.o
 
 LIBSAMBA_OBJ = $(LIBSMB_OBJ0) \
               $(LIBSMB_ERR_OBJ)

diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index 6f006bd38df2d218efba672f802768a5c36817ff..b4bc9f9c15c2e18289366afa5369f601077f202c 100644 (file)
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "auth.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../lib/tsocket/tsocket.h"

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index a3001863b82db46ec5e87218f069ffa1d138e0f9..a39971eafb7396e5e7308406f9fab95404fa212c 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ads.h"
 #include "smb_krb5.h"
 

diff --git a/source3/librpc/crypto/cli_spnego.c b/source3/librpc/crypto/cli_spnego.c
index 63a84a88383d2a2d9bad3fdf9bf2a4f4420a9dee..3420e20d272cce7b047ee811cd4d53be1956c68a 100644 (file)
--- a/source3/librpc/crypto/cli_spnego.c
+++ b/source3/librpc/crypto/cli_spnego.c
@@ -21,7 +21,7 @@
 #include "../libcli/auth/spnego.h"
 #include "include/ntlmssp_wrap.h"
 #include "librpc/gen_ndr/ntlmssp.h"
-#include "libcli/auth/ntlmssp.h"
+#include "auth/ntlmssp/ntlmssp.h"
 #include "librpc/crypto/gse.h"
 #include "librpc/crypto/spnego.h"
 

diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
index b53587ddb38d41b1f4d5f79697f33c0e949d40f2..32dbfdfe483ca85822a81e9c52a3114ee2f66cdf 100644 (file)
--- a/source3/librpc/rpc/dcerpc_helpers.c
+++ b/source3/librpc/rpc/dcerpc_helpers.c
@@ -24,7 +24,7 @@
 #include "librpc/gen_ndr/ndr_schannel.h"
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "librpc/crypto/gse.h"
 #include "librpc/crypto/spnego.h"

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index e4402ba20feb17518234b58d90752f47e1b602ea..da47bc512c82dd64d32f51568cbf557bfcfd466f 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -26,7 +26,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
 #include "smb_krb5.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "libads/kerberos_proto.h"
 #include "krb5_env.h"
 #include "../lib/util/tevent_ntstatus.h"

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 9005d4dac4aa24991ef2ff590aab997855e9cc2b..12961c93900def7c38db7e2753d15ad2c42e9a7f 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "libsmb/libsmb.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "smb_crypt.h"

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 9436ca1c3f8f0088edfaa7e0c3742c9567f734d7..01cc1cc02e7f46145452d04d5b91a6c8271394f5 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -22,11 +22,11 @@
 */
 
 #include "includes.h"
-#include "../libcli/auth/ntlmssp.h"
-#include "../libcli/auth/ntlmssp_private.h"
+#include "../auth/ntlmssp/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp_private.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../libcli/auth/ntlmssp_ndr.h"
+#include "../auth/ntlmssp/ntlmssp_ndr.h"
 #include "../lib/crypto/md5.h"
 #include "../lib/crypto/arcfour.h"
 #include "../lib/crypto/hmacmd5.h"

diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c
index 0f6991c92fe489fbd85dc64202579f2a809028f7..b90399c559c8733acae593cdb1f6357dad8ea3eb 100644 (file)
--- a/source3/libsmb/ntlmssp_wrap.c
+++ b/source3/libsmb/ntlmssp_wrap.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "libcli/auth/ntlmssp.h"
+#include "auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "auth/gensec/gensec.h"
 

diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 58204be772420a093973f9f1882745ceda83df9e..f09932a5d546d421ac066becdb55039de0ef0c51 100644 (file)
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -25,7 +25,7 @@
 #include "libsmb/proto.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 
 struct smb2cli_session_setup_state {
        uint8_t fixed[24];

diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index 65ccdbbeab3bbb1294acb7b4e06ded69439c8af1..1c7bec38890711bc22d3ae5922fa5c6983b57d13 100644 (file)
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "smb_crypt.h"
 #include "libsmb/libsmb.h"
 #include "ntlmssp_wrap.h"

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index ae5b88f02c0be623f9a36cb7ef695ef47858c3bf..65bc028c41904c2a97e4b883d401c4a425ab30a1 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -25,7 +25,7 @@
 #include "../librpc/gen_ndr/ndr_dssetup.h"
 #include "../libcli/auth/schannel.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"

diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c
index a31bb3628425c821eda456e4e164d470800e09f4..076a48da4397f77e7f56da624f3fde5680633acf 100644 (file)
--- a/source3/rpc_server/dcesrv_ntlmssp.c
+++ b/source3/rpc_server/dcesrv_ntlmssp.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "rpc_server/dcesrv_ntlmssp.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "auth.h"
 

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index c0aaa5ab7d73e96c3bfdc71b1517c653a3cf8f2b..b19c9ede3d9937c1ba6b43874ccf6d99325983f6 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -21,7 +21,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "smb_crypt.h"
 #include "../lib/util/asn1.h"

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 28ae24e95f8698a448f63382b7ae0982beed3f18..4d48e73f92d5c128d4ccea08309880ca6b05d651 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -27,7 +27,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "../librpc/gen_ndr/krb5pac.h"
 #include "libads/kerberos_proto.h"

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index e645770014b4cc08219b9730c64903087b377d1a..ece5de12822a9dad85dd157e48f26c44fcf3f2cc 100644 (file)
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -24,8 +24,8 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
 #include "../auth/gensec/gensec.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "../librpc/gen_ndr/krb5pac.h"
 #include "libads/kerberos_proto.h"

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 9cd47d0611e39fca9bd652279b58b332bc7cb9d3..00c7d4dbba06f4adebe746f887ad7609bc2f006f 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -28,7 +28,7 @@
 #include "utils/ntlm_auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 #include "smb_krb5.h"
 #include <iniparser.h>
 #include "../lib/crypto/arcfour.h"

diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index 0b52ae2eb9a3f1028531dbbc0153016009439cb1..37e8eee727391df4a78f3f03b4c1804fda0a8ef1 100644 (file)
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
-#include "../libcli/auth/ntlmssp.h"
+#include "../auth/ntlmssp/ntlmssp.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c
index 9b3aef0c65a234aeca1b2243b22521ba23c58b1a..0c63d05d68357f85218bc22607fb1ba122fabcde 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp.c
+++ b/source4/auth/ntlmssp/ntlmssp.c
@@ -21,8 +21,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+struct auth_session_info;
+
 #include "includes.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "source4/auth/ntlmssp/proto.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "auth/gensec/gensec.h"
@@ -61,16 +64,6 @@ static const struct ntlmssp_callbacks {
 };
 
 
-static NTSTATUS gensec_ntlmssp_magic(struct gensec_security *gensec_security, 
-                                    const DATA_BLOB *first_packet) 
-{
-       if (ntlmssp_blob_matches_magic(first_packet)) {
-               return NT_STATUS_OK;
-       } else {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-}
-
 static NTSTATUS gensec_ntlmssp_update_find(struct ntlmssp_state *ntlmssp_state,
                                           const DATA_BLOB input, uint32_t *idx)
 {
@@ -175,103 +168,6 @@ static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
        return NT_STATUS_OK;
 }
 
-/**
- * Return the NTLMSSP master session key
- * 
- * @param ntlmssp_state NTLMSSP State
- */
-
-NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security, 
-                                   TALLOC_CTX *mem_ctx,
-                                   DATA_BLOB *session_key)
-{
-       struct gensec_ntlmssp_context *gensec_ntlmssp =
-               talloc_get_type_abort(gensec_security->private_data,
-                                     struct gensec_ntlmssp_context);
-       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-
-       if (ntlmssp_state->expected_state != NTLMSSP_DONE) {
-               return NT_STATUS_NO_USER_SESSION_KEY;
-       }
-
-       if (!ntlmssp_state->session_key.data) {
-               return NT_STATUS_NO_USER_SESSION_KEY;
-       }
-       *session_key = data_blob_talloc(mem_ctx, ntlmssp_state->session_key.data, ntlmssp_state->session_key.length);
-       if (!session_key->data) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       return NT_STATUS_OK;
-}
-
-static bool gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
-                                       uint32_t feature)
-{
-       struct gensec_ntlmssp_context *gensec_ntlmssp =
-               talloc_get_type_abort(gensec_security->private_data,
-                                     struct gensec_ntlmssp_context);
-       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-
-       if (feature & GENSEC_FEATURE_SIGN) {
-               if (!ntlmssp_state->session_key.length) {
-                       return false;
-               }
-               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
-                       return true;
-               }
-       }
-       if (feature & GENSEC_FEATURE_SEAL) {
-               if (!ntlmssp_state->session_key.length) {
-                       return false;
-               }
-               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
-                       return true;
-               }
-       }
-       if (feature & GENSEC_FEATURE_SESSION_KEY) {
-               if (ntlmssp_state->session_key.length) {
-                       return true;
-               }
-       }
-       if (feature & GENSEC_FEATURE_DCE_STYLE) {
-               return true;
-       }
-       if (feature & GENSEC_FEATURE_ASYNC_REPLIES) {
-               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
-                       return true;
-               }
-       }
-       return false;
-}
-
-NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
-{
-       struct gensec_ntlmssp_context *gensec_ntlmssp;
-       struct ntlmssp_state *ntlmssp_state;
-
-       gensec_ntlmssp = talloc_zero(gensec_security,
-                                    struct gensec_ntlmssp_context);
-       if (!gensec_ntlmssp) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       gensec_ntlmssp->gensec_security = gensec_security;
-
-       ntlmssp_state = talloc_zero(gensec_ntlmssp,
-                                   struct ntlmssp_state);
-       if (!ntlmssp_state) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ntlmssp_state->callback_private = gensec_ntlmssp;
-
-       gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
-
-       gensec_security->private_data = gensec_ntlmssp;
-       return NT_STATUS_OK;
-}
-
 static const char *gensec_ntlmssp_oids[] = { 
        GENSEC_OID_NTLMSSP, 
        NULL

diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
deleted file mode 100644 (file)
index 1126cdf..0000000
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ /dev/null
@@ -1,37 +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"
-#include "../libcli/auth/ntlmssp.h"
-
-struct gensec_ntlmssp_context {
-       struct gensec_security *gensec_security;
-       struct ntlmssp_state *ntlmssp_state;
-       struct auth_user_info_dc *user_info_dc;
-};
-
-struct loadparm_context;
-struct auth_session_info;
-
-NTSTATUS gensec_ntlmssp_init(void);
-
-#include "auth/ntlmssp/proto.h"

diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 53bd7a4d238d8e50967a770d6f8d73ca1641c97f..858b16f0538058a2c64aa435a4fa80748c1601d2 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -21,14 +21,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+struct auth_session_info;
+
 #include "includes.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "source4/auth/ntlmssp/proto.h"
 #include "../lib/crypto/crypto.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
-#include "libcli/auth/ntlmssp_private.h"
+#include "auth/ntlmssp/ntlmssp_private.h"
 
 /*********************************************************************
  Client side NTLMSSP

diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 1f281479ff523ffd983ba5ff8925f53ec46fc93f..68a802ce78e50caa5755284964ffaae06fd6b591 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -26,14 +26,15 @@
 #include "lib/tsocket/tsocket.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "../librpc/gen_ndr/ndr_ntlmssp.h"
-#include "../libcli/auth/ntlmssp_ndr.h"
-#include "../libcli/auth/ntlmssp_private.h"
+#include "auth/ntlmssp/ntlmssp_ndr.h"
+#include "auth/ntlmssp/ntlmssp_private.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/crypto.h"
 #include "auth/gensec/gensec.h"
 #include "auth/gensec/gensec_proto.h"
 #include "auth/auth.h"
 #include "param/param.h"
+#include "source4/auth/ntlmssp/proto.h"
 
 /**
  * Next state function for the Negotiate packet (GENSEC wrapper)

diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build
index adbb1fa957d81c7a16bafb368396e8658d28750e..4d25271a8be22d878e9fb8311c6c76a09c4fd5f3 100644 (file)
--- a/source4/auth/ntlmssp/wscript_build
+++ b/source4/auth/ntlmssp/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 bld.SAMBA_MODULE('gensec_ntlmssp',
-       source='''ntlmssp.c ntlmssp_sign.c
+       source='''ntlmssp.c
                   ntlmssp_client.c ntlmssp_server.c''',
        autoproto='proto.h',
        subsystem='gensec',