Changeset 745 for trunk/server/source3/libsmb/smb_signing.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_signing.c (modified) (5 diffs)

trunk/server/source3/libsmb/smb_signing.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "../lib/crypto/md5.h"
+#include "smb_signing.h"
 
 /* Used by the SMB signing functions. */
@@ -44 +46 @@
         /* the next expected seqnum */
         uint32_t seqnum;
+
+        TALLOC_CTX *mem_ctx;
+        void *(*alloc_fn)(TALLOC_CTX *mem_ctx, size_t len);
+        void (*free_fn)(TALLOC_CTX *mem_ctx, void *ptr);
 };
 
@@ -50 +56 @@
         si->active = false;
         si->bsrspyl = false;
-        data_blob_free(&si->mac_key);
         si->seqnum = 0;
+
+        if (si->free_fn) {
+                si->free_fn(si->mem_ctx, si->mac_key.data);
+        } else {
+                talloc_free(si->mac_key.data);
+        }
+        si->mac_key.data = NULL;
+        si->mac_key.length = 0;
+}
+
+struct smb_signing_state *smb_signing_init_ex(TALLOC_CTX *mem_ctx,
+                                              bool allowed,
+                                              bool mandatory,
+                                              void *(*alloc_fn)(TALLOC_CTX *, size_t),
+                                              void (*free_fn)(TALLOC_CTX *, void *))
+{
+        struct smb_signing_state *si;
+
+        if (alloc_fn) {
+                void *p = alloc_fn(mem_ctx, sizeof(struct smb_signing_state));
+                if (p == NULL) {
+                        return NULL;
+                }
+                memset(p, 0, sizeof(struct smb_signing_state));
+                si = (struct smb_signing_state *)p;
+                si->mem_ctx = mem_ctx;
+                si->alloc_fn = alloc_fn;
+                si->free_fn = free_fn;
+        } else {
+                si = talloc_zero(mem_ctx, struct smb_signing_state);
+                if (si == NULL) {
+                        return NULL;
+                }
+        }
+
+        if (mandatory) {
+                allowed = true;
+        }
+
+        si->allowed = allowed;
+        si->mandatory = mandatory;
+
+        return si;
 }
 
@@ -58 +106 @@
                                            bool mandatory)
 {
-        struct smb_signing_state *si;
-
-        si = talloc_zero(mem_ctx, struct smb_signing_state);
-        if (si == NULL) {
-                return NULL;
-        }
-
-        if (mandatory) {
-                allowed = true;
-        }
-
-        si->allowed = allowed;
-        si->mandatory = mandatory;
-
-        return si;
+        return smb_signing_init_ex(mem_ctx, allowed, mandatory, NULL, NULL);
 }
 
@@ -313 +347 @@
 
         len = response.length + user_session_key.length;
-        si->mac_key = data_blob_talloc(si, NULL, len);
+        if (si->alloc_fn) {
+                si->mac_key.data = (uint8_t *)si->alloc_fn(si->mem_ctx, len);
+                if (si->mac_key.data == NULL) {
+                        return false;
+                }
+        } else {
+                si->mac_key.data = (uint8_t *)talloc_size(si, len);
+                if (si->mac_key.data == NULL) {
+                        return false;
+                }
+        }
+        si->mac_key.length = len;
 
         ofs = 0;