summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-19 15:33:16 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-19 17:32:23 +0200
commit1b9c8d4867aed7aa19fecba563957a0d99280ce9 (patch)
tree184243ef4c91e82a0893f8d34412fbb735168b5e
parentbd8b2754ba2002b35815df986b29838ded8fb1da (diff)
downloadsamba-1b9c8d4867aed7aa19fecba563957a0d99280ce9.tar.gz
samba-1b9c8d4867aed7aa19fecba563957a0d99280ce9.tar.bz2
samba-1b9c8d4867aed7aa19fecba563957a0d99280ce9.zip
s3:include: move smb_seal.c prototypes to smb_crypt.h
metze
-rw-r--r--source3/include/smb_crypt.h9
-rw-r--r--source3/libsmb/clientgen.c1
-rw-r--r--source3/libsmb/proto.h9
3 files changed, 10 insertions, 9 deletions
diff --git a/source3/include/smb_crypt.h b/source3/include/smb_crypt.h
index 4449a1605d..ed0063e2e2 100644
--- a/source3/include/smb_crypt.h
+++ b/source3/include/smb_crypt.h
@@ -59,4 +59,13 @@ struct smb_trans_enc_state {
} s;
};
+/* The following definitions come from libsmb/smb_seal.c */
+
+NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16 *p_enc_ctx_num);
+bool common_encryption_on(struct smb_trans_enc_state *es);
+NTSTATUS common_encrypt_buffer(struct smb_trans_enc_state *es, char *buffer, char **buf_out);
+NTSTATUS common_decrypt_buffer(struct smb_trans_enc_state *es, char *buf);
+void common_free_encryption_state(struct smb_trans_enc_state **pp_es);
+void common_free_enc_buffer(struct smb_trans_enc_state *es, char *buf);
+
#endif /* _HEADER_SMB_CRYPT_H */
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 1fae2642ba..e8f4fbd2fc 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -22,6 +22,7 @@
#include "libsmb/libsmb.h"
#include "../lib/util/tevent_ntstatus.h"
#include "smb_signing.h"
+#include "smb_crypt.h"
#include "async_smb.h"
/*******************************************************************
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index d17d38aa8b..ffb2ca0117 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -848,15 +848,6 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
uint8_t **rparam, uint32_t min_rparam, uint32_t *num_rparam,
uint8_t **rdata, uint32_t min_rdata, uint32_t *num_rdata);
-/* The following definitions come from libsmb/smb_seal.c */
-
-NTSTATUS get_enc_ctx_num(const uint8_t *buf, uint16 *p_enc_ctx_num);
-bool common_encryption_on(struct smb_trans_enc_state *es);
-NTSTATUS common_encrypt_buffer(struct smb_trans_enc_state *es, char *buffer, char **buf_out);
-NTSTATUS common_decrypt_buffer(struct smb_trans_enc_state *es, char *buf);
-void common_free_encryption_state(struct smb_trans_enc_state **pp_es);
-void common_free_enc_buffer(struct smb_trans_enc_state *es, char *buf);
-
/* The following definitions come from libsmb/clisigning.c */
bool cli_simple_set_signing(struct cli_state *cli,