sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3-libsmb: move smb encryption structs into own header.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2011-03-02 14:00:23 +01:00
parent e1f84330ba
commit 6c8d802391
7 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source3/include/client.h
View File

@ -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;

2
source3/include/proto.h
View File

@ -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],

62
source3/include/smb_crypt.h Normal file
View File

@ -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 */

1
source3/libsmb/async_smb.c
View File

@ -20,6 +20,7 @@
#include "includes.h"
#include "../lib/async_req/async_sock.h"
#include "async_smb.h"
#include "smb_crypt.h"
/*
* Read an smb packet asynchronously, discard keepalives

1
source3/libsmb/clifsinfo.c
View File

@ -22,6 +22,7 @@
#include "../libcli/auth/spnego.h"
#include "../libcli/auth/ntlmssp.h"
#include "async_smb.h"
#include "smb_crypt.h"
/****************************************************************************
Get UNIX extensions version info.

1
source3/libsmb/smb_seal.c
View File

@ -19,6 +19,7 @@
#include "includes.h"
#include "../libcli/auth/ntlmssp.h"
#include "smb_crypt.h"
/******************************************************************************
Pull out the encryption context for this packet. 0 means global context.

1
source3/smbd/seal.c
View File

@ -22,6 +22,7 @@
#include "../libcli/auth/spnego.h"
#include "../libcli/auth/ntlmssp.h"
#include "ntlmssp_wrap.h"
#include "smb_crypt.h"
/******************************************************************************
Server side encryption.