libcli/smb: move smb_seal.c to the toplevel

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Oct 21 10:22:39 CEST 2011 on sn-devel-104

diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h
index 1f21e553bae87f883a814cc83f132a186f826db3..228e451b8de3bb4f71431d526082202a3c55929e 100644 (file)
--- a/libcli/smb/smb_common.h
+++ b/libcli/smb/smb_common.h
@@ -28,5 +28,6 @@
 #include "libcli/smb/smb_constants.h"
 #include "libcli/smb/smb_util.h"
 #include "libcli/smb/smb_unix_ext.h"
+#include "libcli/smb/smb_seal.h"
 
 #endif

diff --git a/source3/libsmb/smb_seal.c b/libcli/smb/smb_seal.c
similarity index 98%
rename from source3/libsmb/smb_seal.c
rename to libcli/smb/smb_seal.c
index e27f609d39acca40116e7587a9487ec4521af019..bf9576f288048e7e633368ff862fe9788856084e 100644 (file)
--- a/source3/libsmb/smb_seal.c
+++ b/libcli/smb/smb_seal.c
@@ -1,25 +1,24 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB Transport encryption (sealing) code.
    Copyright (C) Jeremy Allison 2007.
-   
+
    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 "smb_crypt.h"
-#include "libsmb/libsmb.h"
+#include "smb_common.h"
 #include "libcli/auth/krb5_wrap.h"
 #include "auth/gensec/gensec.h"
 
@@ -193,7 +192,7 @@ static NTSTATUS common_gss_decrypt_buffer(struct smb_tran_enc_state_gss *gss_sta
                        &in_buf,
                        &out_buf,
                        &flags_got,             /* did we get sign+seal ? */
-                       (gss_qop_t *) NULL);    
+                       (gss_qop_t *) NULL);
 
        if (ret != GSS_S_COMPLETE) {
                NTSTATUS status = NT_STATUS_ACCESS_DENIED;
@@ -234,7 +233,7 @@ static NTSTATUS common_gss_decrypt_buffer(struct smb_tran_enc_state_gss *gss_sta
 
 static NTSTATUS common_gss_encrypt_buffer(struct smb_tran_enc_state_gss *gss_state,
                                        uint16_t enc_ctx_num,
-                                       char *buf,
+                                       char *buf,
                                        char **ppbuf_out)
 {
        gss_ctx_id_t gss_ctx = gss_state->gss_ctx;
@@ -283,7 +282,7 @@ static NTSTATUS common_gss_encrypt_buffer(struct smb_tran_enc_state_gss *gss_sta
                return NT_STATUS_NOT_SUPPORTED;
        }
 
-       /* Ya see - this is why I *hate* gss-api. I don't 
+       /* Ya see - this is why I *hate* gss-api. I don't
         * want to have to malloc another buffer of the
         * same size + 8 bytes just to get a continuous
         * header + buffer, but gss won't let me pass in

diff --git a/source3/include/smb_crypt.h b/libcli/smb/smb_seal.h
similarity index 97%
rename from source3/include/smb_crypt.h
rename to libcli/smb/smb_seal.h
index 307e90e585cbaf56d04729e7b143f735a6e13ab7..fcee2057d8b0b4d49f82001b2fc85e6bcbd9351d 100644 (file)
--- a/source3/include/smb_crypt.h
+++ b/libcli/smb/smb_seal.h
@@ -59,7 +59,7 @@ struct smb_trans_enc_state {
         } s;
 };
 
-/* The following definitions come from libsmb/smb_seal.c  */
+/* The following definitions come from smb_seal.c  */
 
 NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16_t *p_enc_ctx_num);
 bool common_encryption_on(struct smb_trans_enc_state *es);

diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 8043c8049b7060c05840dc41038431adb43fc68f..63349586f45e830d2cfd043e7fe5b89d457f43f9 100644 (file)
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -2,12 +2,13 @@
 
 
 bld.SAMBA_LIBRARY('cli_smb_common',
-       source='smb2_create_blob.c smb2_signing.c util.c',
+       source='smb_seal.c smb2_create_blob.c smb2_signing.c util.c',
        autoproto='smb_common_proto.h',
-       deps='LIBCRYPTO',
+       deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP',
        public_deps='talloc samba-util',
        private_library=True,
        public_headers='''smb_common.h smb2_constants.h smb_constants.h
+                       smb_seal.h
                        smb2_create_blob.h smb2_signing.h smb_util.h smb_unix_ext.h
        ''',
        )

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6bf03d34d4b7ed71c1a535bc9369447dd8461bfa..62aff34094aed6ce57380d61a254460864b40870 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -602,8 +602,9 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
             libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
             libsmb/clioplock.o libsmb/clirap2.o \
-            libsmb/smb_seal.o libsmb/async_smb.o \
+            libsmb/async_smb.o \
             libsmb/read_smb.o libsmb/clisigning.o \
+            ../libcli/smb/smb_seal.o \
             libsmb/smb2cli_base.o \
             libsmb/smb2cli_negprot.o \
             libsmb/smb2cli_session.o \

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 43dfa22b9dfa8fe37f9b352fec737eeb4eb26b36..3786638a0d05e16a19711ef5e9abd9a4c3291de2 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -23,7 +23,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "../lib/util/tevent_unix.h"
 #include "async_smb.h"
-#include "smb_crypt.h"
+#include "../libcli/smb/smb_seal.h"
 #include "libsmb/nmblib.h"
 #include "read_smb.h"
 

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index e8f4fbd2fc3975597fc2617d09eb8ca3e3accdd3..f5123eaf65e08eef0feef0232b93d4e4aab55d27 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -22,7 +22,7 @@
 #include "libsmb/libsmb.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "smb_signing.h"
-#include "smb_crypt.h"
+#include "../libcli/smb/smb_seal.h"
 #include "async_smb.h"
 
 /*******************************************************************

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 24692003536872dcbd72d24bbeadd994b4c19436..a5b7838b2a2620878832b462c8f2024187a9f6ac 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -24,7 +24,7 @@
 #include "../auth/ntlmssp/ntlmssp.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
-#include "smb_crypt.h"
+#include "../libcli/smb/smb_seal.h"
 #include "trans2.h"
 #include "ntlmssp_wrap.h"
 #include "auth/gensec/gensec.h"

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 7d1d44e071afb89a9e7eb0b3328c25b47193ac84..2c668dd7a010b708d24d44266ebb7d3ef5bdb44c 100644 (file)
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -23,7 +23,7 @@
 #include "../libcli/auth/spnego.h"
 #include "../auth/ntlmssp/ntlmssp.h"
 #include "ntlmssp_wrap.h"
-#include "smb_crypt.h"
+#include "../libcli/smb/smb_seal.h"
 #include "../lib/util/asn1.h"
 #include "auth.h"
 #include "libsmb/libsmb.h"

diff --git a/source3/wscript_build b/source3/wscript_build
index efbe235e8ad2a6ecfa5db3ed8e9bd708d54fb582..1c43be3b20d6f4207e7f69c24023040eee288ea3 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -126,7 +126,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
              libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
              libsmb/clioplock.c libsmb/clirap2.c
-             libsmb/smb_seal.c libsmb/async_smb.c
+             libsmb/async_smb.c
              libsmb/read_smb.c libsmb/clisigning.c
              libsmb/smb2cli_base.c
              libsmb/smb2cli_negprot.c