svn commit: samba r1686 - in branches/SAMBA_4_0/source: include libcli/raw

abartlet at samba.org abartlet at samba.org
Tue Aug 10 04:38:03 GMT 2004


Author: abartlet
Date: 2004-08-10 04:38:03 +0000 (Tue, 10 Aug 2004)
New Revision: 1686
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1686&nolog=1
Log:
Don't use a void* for the context inside the SMB signing code.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/cli_context.h
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c

Changeset:
Modified: branches/SAMBA_4_0/source/include/cli_context.h
===================================================================
--- branches/SAMBA_4_0/source/include/cli_context.h	2004-08-10 04:28:00 UTC (rev 1685)
+++ branches/SAMBA_4_0/source/include/cli_context.h	2004-08-10 04:38:03 UTC (rev 1686)
@@ -29,6 +29,11 @@
 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 @@
 		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;

Modified: branches/SAMBA_4_0/source/libcli/raw/smb_signing.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/smb_signing.c	2004-08-10 04:28:00 UTC (rev 1685)
+++ branches/SAMBA_4_0/source/libcli/raw/smb_signing.c	2004-08-10 04:38:03 UTC (rev 1686)
@@ -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
 ************************************************************/



More information about the samba-cvs mailing list