diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 1 | ||||
| -rw-r--r-- | source3/libsmb/cliconnect.c | 14 | ||||
| -rw-r--r-- | source3/libsmb/clireadwrite.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/clisigning.c | 45 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 8 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 |
6 files changed, 9 insertions, 64 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 090863797a..88872adb0a 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -613,7 +613,6 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \ libsmb/clioplock.o libsmb/clirap2.o \ libsmb/async_smb.o \ - libsmb/clisigning.o \ ../libcli/smb/smb_seal.o \ ../libcli/smb/read_smb.o \ ../libcli/smb/smbXcli_base.o \ diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 5b4c140440..6e40037892 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1086,8 +1086,8 @@ static void cli_session_setup_nt1_done(struct tevent_req *subreq) if (tevent_req_nterror(req, status)) { return; } - if (cli_simple_set_signing(cli, state->session_key, state->response) - && !cli_check_sign_mac(cli, (char *)in, 1)) { + if (smb1cli_conn_activate_signing(cli->conn, state->session_key, state->response) + && !smb1cli_conn_check_signing(cli->conn, (uint8_t *)in, 1)) { tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED); return; } @@ -1526,9 +1526,9 @@ static void cli_session_setup_kerberos_done(struct tevent_req *subreq) return; } } else { - if (cli_simple_set_signing(state->cli, state->session_key_krb5, + if (smb1cli_conn_activate_signing(state->cli->conn, state->session_key_krb5, data_blob_null) - && !cli_check_sign_mac(state->cli, inbuf, 1)) { + && !smb1cli_conn_check_signing(state->cli->conn, (uint8_t *)inbuf, 1)) { tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED); return; } @@ -1733,10 +1733,10 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq) return; } } else { - if (cli_simple_set_signing( - state->cli, state->ntlmssp_state->session_key, + if (smb1cli_conn_activate_signing( + state->cli->conn, state->ntlmssp_state->session_key, data_blob_null) - && !cli_check_sign_mac(state->cli, inbuf, 1)) { + && !smb1cli_conn_check_signing(state->cli->conn, (uint8_t *)inbuf, 1)) { tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED); return; } diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index 758521f7bc..f2e1dbf0ac 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -44,7 +44,7 @@ static size_t cli_read_max_bufsize(struct cli_state *cli) if (cli->server_posix_capabilities & CIFS_UNIX_LARGE_READ_CAP) { useable_space = 0xFFFFFF - data_offset; - if (client_is_signing_on(cli)) { + if (smb1cli_conn_signing_is_active(cli->conn)) { return min_space; } @@ -97,7 +97,7 @@ static size_t cli_write_max_bufsize(struct cli_state *cli, return min_space; } - if (client_is_signing_on(cli)) { + if (smb1cli_conn_signing_is_active(cli->conn)) { return min_space; } diff --git a/source3/libsmb/clisigning.c b/source3/libsmb/clisigning.c deleted file mode 100644 index 7dab9d3817..0000000000 --- a/source3/libsmb/clisigning.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB Signing Code - Copyright (C) Jeremy Allison 2003. - Copyright (C) Andrew Bartlett <abartlet@samba.org> 2002-2003 - Copyright (C) Stefan Metzmacher 2009 - - 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/>. -*/ - -#include "includes.h" -#include "libsmb/libsmb.h" -#include "../libcli/smb/smbXcli_base.h" - -bool cli_simple_set_signing(struct cli_state *cli, - const DATA_BLOB user_session_key, - const DATA_BLOB response) -{ - return smb1cli_conn_activate_signing(cli->conn, - user_session_key, - response); -} - -bool cli_check_sign_mac(struct cli_state *cli, const char *buf, uint32_t seqnum) -{ - return smb1cli_conn_check_signing(cli->conn, - (const uint8_t *)buf, - seqnum); -} - -bool client_is_signing_on(struct cli_state *cli) -{ - return smb1cli_conn_signing_is_active(cli->conn); -} diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index 3f25958825..37d23990d5 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -837,14 +837,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/clisigning.c */ - -bool cli_simple_set_signing(struct cli_state *cli, - const DATA_BLOB user_session_key, - const DATA_BLOB response); -bool cli_check_sign_mac(struct cli_state *cli, const char *buf, uint32_t seqnum); -bool client_is_signing_on(struct cli_state *cli); - /* The following definitions come from libsmb/reparse_symlink.c */ bool symlink_reparse_buffer_marshall( diff --git a/source3/wscript_build b/source3/wscript_build index b070c56208..13ecefde73 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -130,7 +130,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c libsmb/clioplock.c libsmb/clirap2.c libsmb/async_smb.c - libsmb/clisigning.c libsmb/smb2cli_tcon.c libsmb/cli_np_tstream.c libsmb/reparse_symlink.c |