Changeset 745 for trunk/server/source3/libsmb/smb_seal.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libsmb/smb_seal.c (modified) (9 diffs)

trunk/server/source3/libsmb/smb_seal.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "../libcli/auth/ntlmssp.h"
+#include "smb_crypt.h"
+#include "libsmb/libsmb.h"
 
 /******************************************************************************
@@ -60 +63 @@
 ******************************************************************************/
 
-NTSTATUS common_ntlm_decrypt_buffer(NTLMSSP_STATE *ntlmssp_state, char *buf)
+NTSTATUS common_ntlm_decrypt_buffer(struct ntlmssp_state *ntlmssp_state, char *buf)
 {
         NTSTATUS status;
@@ -108 +111 @@
 ******************************************************************************/
 
-NTSTATUS common_ntlm_encrypt_buffer(NTLMSSP_STATE *ntlmssp_state,
+NTSTATUS common_ntlm_encrypt_buffer(struct ntlmssp_state *ntlmssp_state,
                                 uint16 enc_ctx_num,
                                 char *buf,
@@ -117 +120 @@
         size_t data_len = smb_len(buf) - 4; /* Ignore the 0xFF SMB bytes. */
         DATA_BLOB sig;
-
+        TALLOC_CTX *frame;
         *ppbuf_out = NULL;
 
@@ -124 +127 @@
         }
 
+        frame = talloc_stackframe();
         /* 
          * We know smb_len can't return a value > 128k, so no int overflow
@@ -140 +144 @@
 
         status = ntlmssp_seal_packet(ntlmssp_state,
+                                     frame,
                 (unsigned char *)buf_out + 8 + NTLMSSP_SIG_SIZE, /* 4 byte len + 0xFF 'S' <enc> <ctx> */
                 data_len,
@@ -147 +152 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                data_blob_free(&sig);
+                talloc_free(frame);
                 SAFE_FREE(buf_out);
                 return status;
@@ -154 +159 @@
         /* First 16 data bytes are signature for SSPI compatibility. */
         memcpy(buf_out + 8, sig.data, NTLMSSP_SIG_SIZE);
-        data_blob_free(&sig);
+        talloc_free(frame);
         *ppbuf_out = buf_out;
         return NT_STATUS_OK;
@@ -369 +374 @@
         if (es->smb_enc_type == SMB_TRANS_ENC_NTLM) {
                 if (es->s.ntlmssp_state) {
-                        ntlmssp_end(&es->s.ntlmssp_state);
+                        TALLOC_FREE(es->s.ntlmssp_state);
                 }
         }