summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-08-10 04:38:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:48 -0500
commit6ffaf57fe715419bf3aa677027548161b642d17e (patch)
treee7edd4868328e81bc82d8d8e4f2f3b530a56db48
parent06cf56bc1dd75bc3fd47ec7c100c42a8aa4b23ba (diff)
downloadsamba-6ffaf57fe715419bf3aa677027548161b642d17e.tar.gz
samba-6ffaf57fe715419bf3aa677027548161b642d17e.tar.bz2
samba-6ffaf57fe715419bf3aa677027548161b642d17e.zip
r1686: Don't use a void* for the context inside the SMB signing code.
Andrew Bartlett (This used to be commit 64fcd8ecebabdd09fed6b65e3c436bffc1da9de7)
-rw-r--r--source4/include/cli_context.h7
-rw-r--r--source4/libcli/raw/smb_signing.c5
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h
index 1f179ff452..2e1bc11d8c 100644
--- a/source4/include/cli_context.h
+++ b/source4/include/cli_context.h
@@ -29,6 +29,11 @@ struct smbcli_request; /* forward declare */
struct smbcli_session; /* forward declare */
struct smbcli_transport; /* forward declare */
+struct smb_basic_signing_context {
+ DATA_BLOB mac_key;
+ uint32_t next_seq_num;
+};
+
/* context that will be and has been negotiated between the client and server */
struct smbcli_negotiate {
/*
@@ -52,7 +57,7 @@ struct smbcli_negotiate {
void (*sign_outgoing_message)(struct smbcli_request *req);
BOOL (*check_incoming_message)(struct smbcli_request *req);
void (*free_signing_context)(struct smbcli_transport *transport);
- void *signing_context;
+ struct smb_basic_signing_context *signing_context;
BOOL negotiated_smb_signing;
BOOL allow_smb_signing;
BOOL doing_signing;
diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index ddde58fd88..ffbecb85fc 100644
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -22,11 +22,6 @@
#include "includes.h"
-struct smb_basic_signing_context {
- DATA_BLOB mac_key;
- uint32_t next_seq_num;
-};
-
/***********************************************************
SMB signing - Common code before we set a new signing implementation
************************************************************/