s3:libsmb: get rid of cli_has_async_calls

[obnox/samba/samba-obnox.git] / source3 / libsmb / clisigning.c

diff --git a/source3/libsmb/clisigning.c b/source3/libsmb/clisigning.c
index 0d0e926e6ca3cf1adb5538f86e367000436bc9fe..7dab9d38174e40d7ecad094aeaa071a55748bd7c 100644 (file)
--- a/source3/libsmb/clisigning.c
+++ b/source3/libsmb/clisigning.c
@@ -20,68 +20,26 @@
 */
 
 #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)
 {
-       bool ok;
-
-       ok = smb_signing_activate(cli->signing_state,
-                                 user_session_key,
-                                 response);
-       if (!ok) {
-               return false;
-       }
-
-       cli->readbraw_supported = false;
-       cli->writebraw_supported = false;
-
-       return true;
-}
-
-bool cli_temp_set_signing(struct cli_state *cli)
-{
-       return smb_signing_set_bsrspyl(cli->signing_state);
-}
-
-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;
-}
-
-void cli_set_signing_negotiated(struct cli_state *cli)
-{
-       smb_signing_set_negotiated(cli->signing_state);
+       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);
 }