Changeset 745 for trunk/server/source3/smbd/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/smbd/signing.c (modified) (4 diffs)

trunk/server/source3/smbd/signing.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
-
+#include "smb_signing.h"
 
 /***********************************************************
@@ -29 +30 @@
 
 bool srv_check_sign_mac(struct smbd_server_connection *conn,
-                        const char *inbuf, uint32_t *seqnum)
+                        const char *inbuf, uint32_t *seqnum,
+                        bool trusted_channel)
 {
         /* Check if it's a non-session message. */
         if(CVAL(inbuf,0)) {
+                return true;
+        }
+
+        if (trusted_channel) {
+                NTSTATUS status;
+
+                if (smb_len(inbuf) < (smb_ss_field + 8 - 4)) {
+                        DEBUG(1,("smb_signing_check_pdu: Can't check signature "
+                                 "on short packet! smb_len = %u\n",
+                                 smb_len(inbuf)));
+                        return false;
+                }
+
+                status = NT_STATUS(IVAL(inbuf, smb_ss_field + 4));
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(1,("smb_signing_check_pdu: trusted channel passed %s\n",
+                                 nt_errstr(status)));
+                        return false;
+                }
+
+                *seqnum = IVAL(inbuf, smb_ss_field);
                 return true;
         }
@@ -66 +89 @@
 }
 
+struct smbd_shm_signing {
+        size_t shm_size;
+        uint8_t *shm_pointer;
+
+        /* we know the signing engine will only allocate 2 chunks */
+        uint8_t *ptr1;
+        size_t len1;
+        uint8_t *ptr2;
+        size_t len2;
+};
+
+static int smbd_shm_signing_destructor(struct smbd_shm_signing *s)
+{
+        anonymous_shared_free(s->shm_pointer);
+        return 0;
+}
+
+static void *smbd_shm_signing_alloc(TALLOC_CTX *mem_ctx, size_t len)
+{
+        struct smbd_shm_signing *s = talloc_get_type_abort(mem_ctx,
+                                     struct smbd_shm_signing);
+
+        if (s->ptr1 == NULL) {
+                s->len1 = len;
+                if (len % 8) {
+                        s->len1 += (8 - (len % 8));
+                }
+                if (s->len1 > s->shm_size) {
+                        s->len1 = 0;
+                        errno = ENOMEM;
+                        return NULL;
+                }
+                s->ptr1 = s->shm_pointer;
+                return s->ptr1;
+        }
+
+        if (s->ptr2 == NULL) {
+                s->len2 = len;
+                if (s->len2 > (s->shm_size - s->len1)) {
+                        s->len2 = 0;
+                        errno = ENOMEM;
+                        return NULL;
+                }
+                s->ptr2 = s->shm_pointer + s->len1;
+                return s->ptr2;
+        }
+
+        errno = ENOMEM;
+        return NULL;
+}
+
+static void smbd_shm_signing_free(TALLOC_CTX *mem_ctx, void *ptr)
+{
+        struct smbd_shm_signing *s = talloc_get_type_abort(mem_ctx,
+                                     struct smbd_shm_signing);
+
+        if (s->ptr2 == ptr) {
+                s->ptr2 = NULL;
+                s->len2 = 0;
+        }
+}
+
 /***********************************************************
  Called by server negprot when signing has been negotiated.
@@ -86 +171 @@
                 allowed = false;
                 break;
+        }
+
+        if (lp_async_smb_echo_handler()) {
+                struct smbd_shm_signing *s;
+
+                /* setup the signing state in shared memory */
+                s = talloc_zero(smbd_event_context(), struct smbd_shm_signing);
+                if (s == NULL) {
+                        return false;
+                }
+                s->shm_size = 4096;
+                s->shm_pointer =
+                        (uint8_t *)anonymous_shared_allocate(s->shm_size);
+                if (s->shm_pointer == NULL) {
+                        talloc_free(s);
+                        return false;
+                }
+                talloc_set_destructor(s, smbd_shm_signing_destructor);
+                conn->smb1.signing_state = smb_signing_init_ex(s,
+                                                        allowed, mandatory,
+                                                        smbd_shm_signing_alloc,
+                                                        smbd_shm_signing_free);
+                if (!conn->smb1.signing_state) {
+                        return false;
+                }
+                return true;
         }