sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Pass smbd_server_connection to srv_decrypt_buffer

Browse Source
This commit is contained in:
Volker Lendecke 2011-08-05 16:58:51 +02:00
parent 08262fe964
commit d4c4705e55
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/process.c
View File

@ -465,7 +465,7 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx,
}
if (is_encrypted_packet(sconn, (uint8_t *)*buffer)) {
status = srv_decrypt_buffer(*buffer);
status = srv_decrypt_buffer(sconn, *buffer);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("receive_smb_talloc: SMB decryption failed on "
"incoming packet! Error %s\n",

3
source3/smbd/proto.h
View File

@ -48,7 +48,6 @@
/* The following definitions come from smbd/signing.c */
struct smbd_server_connection;
bool srv_check_sign_mac(struct smbd_server_connection *conn,
const char *inbuf, uint32_t *seqnum, bool trusted_channel);
void srv_calculate_sign_mac(struct smbd_server_connection *conn,
@ -940,7 +939,7 @@ void reply_getattrE(struct smb_request *req);
bool is_encrypted_packet(struct smbd_server_connection *sconn,
const uint8_t *inbuf);
void srv_free_enc_buffer(struct smbd_server_connection *sconn, char *buf);
NTSTATUS srv_decrypt_buffer(char *buf);
NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf);
NTSTATUS srv_encrypt_buffer(char *buf, char **buf_out);
NTSTATUS srv_request_encryption_setup(connection_struct *conn,
unsigned char **ppdata,

2
source3/smbd/seal.c
View File

@ -343,7 +343,7 @@ void srv_free_enc_buffer(struct smbd_server_connection *sconn, char *buf)
Decrypt an incoming buffer.
******************************************************************************/
NTSTATUS srv_decrypt_buffer(char *buf)
NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf)
{
/* Ignore non-session messages. */
if(CVAL(buf,0)) {