schannel: move schannel_sign to main directory.

Guenther

6 files changed, 52 insertions, 9 deletions

diff --git a/source4/auth/gensec/schannel.h b/libcli/auth/schannel.h
index 1ec605e524..bfccd950b6 100644
--- a/source4/auth/gensec/schannel.h
+++ b/libcli/auth/schannel.h
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    dcerpc schannel operations
@@ -10,18 +10,17 @@
    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 "libcli/auth/libcli_auth.h"
-#include "auth/gensec/schannel_state.h"
 #include "libcli/auth/schannel_state.h"
 
 enum schannel_position {
@@ -36,4 +35,4 @@ struct schannel_state {
 	struct netlogon_creds_CredentialState *creds;
 };
 
-#include "auth/gensec/schannel_proto.h"
+#include "libcli/auth/schannel_proto.h"
diff --git a/libcli/auth/schannel_proto.h b/libcli/auth/schannel_proto.h
new file mode 100644
index 0000000000..d31707d5c2
--- /dev/null
+++ b/libcli/auth/schannel_proto.h
@@ -0,0 +1,42 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   dcerpc schannel operations
+
+   Copyright (C) Andrew Tridgell 2004
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004-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/>.
+*/
+
+#ifndef _LIBCLI_AUTH_SCHANNEL_PROTO_H__
+#define _LIBCLI_AUTH_SCHANNEL_PROTO_H__
+
+NTSTATUS schannel_unseal_packet(struct schannel_state *state,
+				TALLOC_CTX *mem_ctx,
+				uint8_t *data, size_t length,
+				const DATA_BLOB *sig);
+NTSTATUS schannel_check_packet(struct schannel_state *state,
+			       TALLOC_CTX *mem_ctx,
+			       const uint8_t *data, size_t length,
+			       const DATA_BLOB *sig);
+NTSTATUS schannel_seal_packet(struct schannel_state *state,
+			      TALLOC_CTX *mem_ctx,
+			      uint8_t *data, size_t length,
+			      DATA_BLOB *sig);
+NTSTATUS schannel_sign_packet(struct schannel_state *state,
+			      TALLOC_CTX *mem_ctx,
+			      const uint8_t *data, size_t length,
+			      DATA_BLOB *sig);
+#endif
diff --git a/source4/auth/gensec/schannel_sign.c b/libcli/auth/schannel_sign.c
index ca066b102d..45f3989e11 100644
--- a/source4/auth/gensec/schannel_sign.c
+++ b/libcli/auth/schannel_sign.c
@@ -21,10 +21,10 @@
 */
 
 #include "includes.h"
+#include "../libcli/auth/schannel.h"
 #include "../lib/crypto/crypto.h"
 #include "auth/gensec/gensec.h"
 #include "auth/gensec/gensec_proto.h"
-#include "auth/gensec/schannel.h"
 
 #define NETSEC_SIGN_SIGNATURE { 0x77, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }
 #define NETSEC_SEAL_SIGNATURE { 0x77, 0x00, 0x7a, 0x00, 0xff, 0xff, 0x00, 0x00 }
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index d2e41dadd7..84314f54e2 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -72,7 +72,7 @@ OUTPUT_TYPE = MERGED_OBJ
 # End MODULE gensec_schannel
 ################################################
 
-gensec_schannel_OBJ_FILES = $(addprefix $(gensecsrcdir)/, schannel.o schannel_sign.o)
+gensec_schannel_OBJ_FILES = $(addprefix $(gensecsrcdir)/, schannel.o) ../libcli/auth/schannel_sign.o
 $(eval $(call proto_header_template,$(gensecsrcdir)/schannel_proto.h,$(gensec_schannel_OBJ_FILES:.o=.c)))
 
 ################################################
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index 90b90fca9c..3efaf9bcca 100644
--- a/source4/auth/gensec/schannel.c
+++ b/source4/auth/gensec/schannel.c
@@ -26,7 +26,8 @@
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "auth/gensec/gensec_proto.h"
-#include "auth/gensec/schannel.h"
+#include "../libcli/auth/schannel.h"
+#include "auth/gensec/schannel_state.h"
 #include "librpc/rpc/dcerpc.h"
 #include "param/param.h"
 #include "auth/session_proto.h"
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 4ec6b74020..baba4157e6 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -32,7 +32,8 @@
 #include "rpc_server/samr/proto.h"
 #include "../lib/util/util_ldb.h"
 #include "libcli/auth/libcli_auth.h"
-#include "auth/gensec/schannel.h"
+#include "../libcli/auth/schannel.h"
+#include "auth/gensec/schannel_state.h"
 #include "libcli/security/security.h"
 #include "param/param.h"
 #include "lib/messaging/irpc.h"