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

r21922: Fixed the build by rather horrid means. I really need

Browse Source 
to restructure libsmb/smb_signing.c so it isn't in
the base libs path but lives in libsmb instead (like
smb_seal.c does).
Jeremy.
(This used to be commit 1b828f051d)
This commit is contained in:
Jeremy Allison
2007-03-21 23:49:57 +00:00
committed by Gerald (Jerry) Carter
parent a38b34aa3b
commit 8c395be5e5
7 changed files with 81 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source3/libsmb/clientgen.c
View File

@ -57,7 +57,6 @@ int cli_set_port(struct cli_state *cli, int port)
static BOOL client_receive_smb(struct cli_state *cli)
{
BOOL ret;
NTSTATUS status;
int fd = cli->fd;
char *buffer = cli->inbuf;
unsigned int timeout = cli->timeout;
@ -75,14 +74,16 @@ static BOOL client_receive_smb(struct cli_state *cli)
if(CVAL(buffer,0) != SMBkeepalive)
break;
}
status = cli_decrypt_message(cli);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("SMB decryption failed on incoming packet! Error %s\n",
nt_errstr(status)));
cli->smb_rw_error = READ_BAD_DECRYPT;
close(cli->fd);
cli->fd = -1;
return False;
if (cli_encryption_on(cli)) {
NTSTATUS status = cli_decrypt_message(cli);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("SMB decryption failed on incoming packet! Error %s\n",
nt_errstr(status)));
cli->smb_rw_error = READ_BAD_DECRYPT;
close(cli->fd);
cli->fd = -1;
return False;
}
}
show_msg(buffer);
return ret;
@ -129,13 +130,15 @@ BOOL cli_receive_smb(struct cli_state *cli)
return ret;
}
if (!cli_check_sign_mac(cli)) {
DEBUG(0, ("SMB Signature verification failed on incoming packet!\n"));
cli->smb_rw_error = READ_BAD_SIG;
close(cli->fd);
cli->fd = -1;
return False;
};
if (!cli_encryption_on(cli)) {
if (!cli_check_sign_mac(cli)) {
DEBUG(0, ("SMB Signature verification failed on incoming packet!\n"));
cli->smb_rw_error = READ_BAD_SIG;
close(cli->fd);
cli->fd = -1;
return False;
}
}
return True;
}
@ -160,7 +163,6 @@ static ssize_t write_socket(int fd, const char *buf, size_t len)
BOOL cli_send_smb(struct cli_state *cli)
{
NTSTATUS status;
size_t len;
size_t nwritten=0;
ssize_t ret;
@ -171,16 +173,18 @@ BOOL cli_send_smb(struct cli_state *cli)
return False;
}
cli_calculate_sign_mac(cli);
status = cli_encrypt_message(cli, &buf_out);
if (!NT_STATUS_IS_OK(status)) {
close(cli->fd);
cli->fd = -1;
cli->smb_rw_error = WRITE_ERROR;
DEBUG(0,("Error in encrypting client message. Error %s\n",
nt_errstr(status) ));
return False;
if (cli_encryption_on(cli)) {
NTSTATUS status = cli_encrypt_message(cli, &buf_out);
if (!NT_STATUS_IS_OK(status)) {
close(cli->fd);
cli->fd = -1;
cli->smb_rw_error = WRITE_ERROR;
DEBUG(0,("Error in encrypting client message. Error %s\n",
nt_errstr(status) ));
return False;
}
} else {
cli_calculate_sign_mac(cli);
}
len = smb_len(buf_out) + 4;