summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-03-02 14:00:23 +0100
committerGünther Deschner <gd@samba.org>2011-03-16 10:11:16 +0100
commit6c8d802391e0aaf375108bcd1270565983d735a8 (patch)
tree04a8ab295977f77ce7620c2245bce7125dc4f840 /source3/include
parente1f84330baa544ebaef42492a7ea2d69cb844fea (diff)
downloadsamba-6c8d802391e0aaf375108bcd1270565983d735a8.tar.gz
samba-6c8d802391e0aaf375108bcd1270565983d735a8.tar.bz2
samba-6c8d802391e0aaf375108bcd1270565983d735a8.zip
s3-libsmb: move smb encryption structs into own header.
Guenther
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/client.h27
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/include/smb_crypt.h62
3 files changed, 63 insertions, 28 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index 03d4c85583..9f8f46c4ab 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -127,33 +127,6 @@ struct rpc_pipe_client {
struct netlogon_creds_CredentialState *dc;
};
-/* Transport encryption state. */
-enum smb_trans_enc_type {
- SMB_TRANS_ENC_NTLM
-#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
- , SMB_TRANS_ENC_GSS
-#endif
-};
-
-#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
-struct smb_tran_enc_state_gss {
- gss_ctx_id_t gss_ctx;
- gss_cred_id_t creds;
-};
-#endif
-
-struct smb_trans_enc_state {
- enum smb_trans_enc_type smb_enc_type;
- uint16 enc_ctx_num;
- bool enc_on;
- union {
- struct ntlmssp_state *ntlmssp_state;
-#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
- struct smb_tran_enc_state_gss *gss_state;
-#endif
- } s;
-};
-
struct cli_state_seqnum {
struct cli_state_seqnum *prev, *next;
uint16_t mid;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 233866e2af..caa2d29046 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2551,7 +2551,7 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str);
NTSTATUS nt_status_squash(NTSTATUS nt_status);
/* The following definitions come from libsmb/ntlmssp.c */
-
+struct ntlmssp_state;
NTSTATUS ntlmssp_set_username(struct ntlmssp_state *ntlmssp_state, const char *user) ;
NTSTATUS ntlmssp_set_hashes(struct ntlmssp_state *ntlmssp_state,
const uint8_t lm_hash[16],
diff --git a/source3/include/smb_crypt.h b/source3/include/smb_crypt.h
new file mode 100644
index 0000000000..a5930d186d
--- /dev/null
+++ b/source3/include/smb_crypt.h
@@ -0,0 +1,62 @@
+/*
+ Unix SMB/CIFS implementation.
+ SMB Transport encryption 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/>.
+*/
+
+#ifndef _HEADER_SMB_CRYPT_H
+#define _HEADER_SMB_CRYPT_H
+
+#if HAVE_GSSAPI_GSSAPI_H
+#include <gssapi/gssapi.h>
+#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
+#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
+#endif
+
+#if HAVE_COM_ERR_H
+#include <com_err.h>
+#endif
+
+/* Transport encryption state. */
+enum smb_trans_enc_type {
+ SMB_TRANS_ENC_NTLM
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
+ , SMB_TRANS_ENC_GSS
+#endif
+};
+
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
+struct smb_tran_enc_state_gss {
+ gss_ctx_id_t gss_ctx;
+ gss_cred_id_t creds;
+};
+#endif
+
+struct smb_trans_enc_state {
+ enum smb_trans_enc_type smb_enc_type;
+ uint16 enc_ctx_num;
+ bool enc_on;
+ union {
+ struct ntlmssp_state *ntlmssp_state;
+#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
+ struct smb_tran_enc_state_gss *gss_state;
+#endif
+ } s;
+};
+
+#endif /* _HEADER_SMB_CRYPT_H */