diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-09-22 21:09:00 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-11-24 19:02:31 +0100 |
commit | 9ebdee281712dd6c89e406aa0e374e12c4dd8eb4 (patch) | |
tree | 244935ca18588a3464f0302c8bd315c4f4e906d1 /source3/libsmb/clisigning.c | |
parent | bda3d491b416f780f63841e9f3a92b9a94c2aadc (diff) | |
download | samba-9ebdee281712dd6c89e406aa0e374e12c4dd8eb4.tar.gz samba-9ebdee281712dd6c89e406aa0e374e12c4dd8eb4.tar.bz2 samba-9ebdee281712dd6c89e406aa0e374e12c4dd8eb4.zip |
s3:libsmb: implement cli_state based functions on top of smbXcli_conn/smbXcli_req
metze
Diffstat (limited to 'source3/libsmb/clisigning.c')
-rw-r--r-- | source3/libsmb/clisigning.c | 54 |
1 files changed, 8 insertions, 46 deletions
diff --git a/source3/libsmb/clisigning.c b/source3/libsmb/clisigning.c index 2ce96c62fc..7dab9d3817 100644 --- a/source3/libsmb/clisigning.c +++ b/source3/libsmb/clisigning.c @@ -21,63 +21,25 @@ #include "includes.h" #include "libsmb/libsmb.h" -#include "../libcli/smb/smb_signing.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) { - bool ok; - - ok = smb_signing_activate(cli->signing_state, - user_session_key, - response); - if (!ok) { - return false; - } - - return true; -} - -void cli_calculate_sign_mac(struct cli_state *cli, char *buf, uint32_t *seqnum) -{ - *seqnum = smb_signing_next_seqnum(cli->signing_state, false); - smb_signing_sign_pdu(cli->signing_state, (uint8_t *)buf, *seqnum); + 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) { - bool ok; - - ok = smb_signing_check_pdu(cli->signing_state, - (const uint8_t *)buf, - seqnum); - - if (!ok) { - return false; - } - - return true; -} - -bool cli_set_signing_negotiated(struct cli_state *cli, - bool allowed, bool mandatory) -{ - return smb_signing_set_negotiated(cli->signing_state, - allowed, mandatory); + return smb1cli_conn_check_signing(cli->conn, + (const uint8_t *)buf, + seqnum); } bool client_is_signing_on(struct cli_state *cli) { - return smb_signing_is_active(cli->signing_state); -} - -bool client_is_signing_allowed(struct cli_state *cli) -{ - return smb_signing_is_allowed(cli->signing_state); -} - -bool client_is_signing_mandatory(struct cli_state *cli) -{ - return smb_signing_is_mandatory(cli->signing_state); + return smb1cli_conn_signing_is_active(cli->conn); } |