From: Volker Lendecke <vl@samba.org>
Date: Tue, 12 Feb 2008 10:54:37 +0000 (+0100)
Subject: Add explicit buf arg to cli_encrypt_message and cli_calculate_sign_mac
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=db6ae9ed2326e6cd68475375d049084cf1d5a98c

Add explicit buf arg to cli_encrypt_message and cli_calculate_sign_mac
---

diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index d88a5d62423..9c27d30166d 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -757,7 +757,7 @@ static NTSTATUS cli_session_setup_ntlmssp(struct cli_state *cli, const char *use
 			
 			/* 'resign' the last message, so we get the right sequence numbers
 			   for checking the first reply from the server */
-			cli_calculate_sign_mac(cli);
+			cli_calculate_sign_mac(cli, cli->outbuf);
 			
 			if (!cli_check_sign_mac(cli)) {
 				nt_status = NT_STATUS_ACCESS_DENIED;
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 3b7669f33ef..2fd304f1350 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -343,10 +343,11 @@ bool cli_send_smb(struct cli_state *cli)
 	if (cli->fd == -1)
 		return false;
 
-	cli_calculate_sign_mac(cli);
+	cli_calculate_sign_mac(cli, cli->outbuf);
 
 	if (enc_on) {
-		NTSTATUS status = cli_encrypt_message(cli, &buf_out);
+		NTSTATUS status = cli_encrypt_message(cli, cli->outbuf,
+						      &buf_out);
 		if (!NT_STATUS_IS_OK(status)) {
 			close(cli->fd);
 			cli->fd = -1;
diff --git a/source/libsmb/smb_seal.c b/source/libsmb/smb_seal.c
index b5befbf7cdc..a81ae9afd55 100644
--- a/source/libsmb/smb_seal.c
+++ b/source/libsmb/smb_seal.c
@@ -483,15 +483,15 @@ NTSTATUS cli_decrypt_message(struct cli_state *cli)
  Encrypt an outgoing buffer. Return the encrypted pointer in buf_out.
 ******************************************************************************/
 
-NTSTATUS cli_encrypt_message(struct cli_state *cli, char **buf_out)
+NTSTATUS cli_encrypt_message(struct cli_state *cli, char *buf, char **buf_out)
 {
 	/* Ignore non-session messages. */
-	if(CVAL(cli->outbuf,0)) {
+	if (CVAL(buf,0)) {
 		return NT_STATUS_OK;
 	}
 
 	/* If we supported multiple encrytion contexts
 	 * here we'd look up based on tid.
 	 */
-	return common_encrypt_buffer(cli->trans_enc_state, cli->outbuf, buf_out);
+	return common_encrypt_buffer(cli->trans_enc_state, buf, buf_out);
 }
diff --git a/source/libsmb/smb_signing.c b/source/libsmb/smb_signing.c
index f03c21bd0e0..eeaf28c3d1d 100644
--- a/source/libsmb/smb_signing.c
+++ b/source/libsmb/smb_signing.c
@@ -573,9 +573,9 @@ void cli_free_signing_context(struct cli_state *cli)
  * Sign a packet with the current mechanism
  */
  
-void cli_calculate_sign_mac(struct cli_state *cli)
+void cli_calculate_sign_mac(struct cli_state *cli, char *buf)
 {
-	cli->sign_info.sign_outgoing_message(cli->outbuf, &cli->sign_info);
+	cli->sign_info.sign_outgoing_message(buf, &cli->sign_info);
 }
 
 /**