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

trunk/server/source3/smbd/seal.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
+#include "../libcli/auth/ntlmssp.h"
+#include "ntlmssp_wrap.h"
+#include "smb_crypt.h"
+#include "../lib/util/asn1.h"
+#include "auth.h"
+#include "libsmb/libsmb.h"
 
 /******************************************************************************
@@ -32 +39 @@
 struct smb_srv_trans_enc_ctx {
         struct smb_trans_enc_state *es;
-        AUTH_NTLMSSP_STATE *auth_ntlmssp_state; /* Must be kept in sync with pointer in ec->ntlmssp_state. */
+        struct auth_ntlmssp_state *auth_ntlmssp_state; /* Must be kept in sync with pointer in ec->ntlmssp_state. */
 };
 
@@ -54 +61 @@
 
         /* Ignore non-session messages or non 0xFF'E' messages. */
-        if(CVAL(inbuf,0) || !(inbuf[4] == 0xFF && inbuf[5] == 'E')) {
+        if(CVAL(inbuf,0)
+           || (smb_len(inbuf) < 8)
+           || !(inbuf[4] == 0xFF && inbuf[5] == 'E')) {
                 return false;
         }
@@ -85 +94 @@
          * functions after any auth_ntlmssp_start/auth_ntlmssp_end.
          */
-        ec->es->s.ntlmssp_state = ec->auth_ntlmssp_state->ntlmssp_state;
+        ec->es->s.ntlmssp_state = auth_ntlmssp_get_ntlmssp_state(ec->auth_ntlmssp_state);
         return status;
 }
@@ -101 +110 @@
 
         if (ec->auth_ntlmssp_state) {
-                auth_ntlmssp_end(&ec->auth_ntlmssp_state);
+                TALLOC_FREE(ec->auth_ntlmssp_state);
                 /* The auth_ntlmssp_end killed this already. */
                 ec->es->s.ntlmssp_state = NULL;
@@ -421 +430 @@
 
         /* Wrap in SPNEGO. */
-        response = spnego_gen_auth_response(&auth_reply, status, OID_KERBEROS5);
+        response = spnego_gen_auth_response(talloc_tos(), &auth_reply, status, OID_KERBEROS5);
         data_blob_free(&auth_reply);
 
@@ -459 +468 @@
 
         if (spnego_wrap) {
-                response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
+                response = spnego_gen_auth_response(talloc_tos(), &chal, status, OID_NTLMSSP);
                 data_blob_free(&chal);
         } else {
@@ -496 +505 @@
         blob = data_blob_const(*ppdata, *p_data_size);
 
-        status = parse_spnego_mechanisms(blob, &secblob, &kerb_mech);
+        status = parse_spnego_mechanisms(talloc_tos(), blob, &secblob, &kerb_mech);
         if (!NT_STATUS_IS_OK(status)) {
                 return nt_status_squash(status);
@@ -506 +515 @@
 
         if (kerb_mech) {
-                SAFE_FREE(kerb_mech);
+                TALLOC_FREE(kerb_mech);
 
 #if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
@@ -564 +573 @@
 
         blob = data_blob_const(*ppdata, *p_data_size);
-        if (!spnego_parse_auth(blob, &auth)) {
+        if (!spnego_parse_auth(talloc_tos(), blob, &auth)) {
                 srv_free_encryption_context(&partial_srv_trans_enc_ctx);
                 return NT_STATUS_INVALID_PARAMETER;
@@ -581 +590 @@
          */
 
-        response = spnego_gen_auth_response(&auth_reply, status, NULL);
+        response = spnego_gen_auth_response(talloc_tos(), &auth_reply, status, NULL);
         data_blob_free(&auth_reply);
 
@@ -710 +719 @@
 
         if (ec->es->smb_enc_type == SMB_TRANS_ENC_NTLM) {
-                if ((ec->es->s.ntlmssp_state->neg_flags & (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) !=
-                                (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) {
+                if (!auth_ntlmssp_negotiated_sign((ec->auth_ntlmssp_state))) {
+                        return NT_STATUS_INVALID_PARAMETER;
+                }
+
+                if (!auth_ntlmssp_negotiated_seal((ec->auth_ntlmssp_state))) {
                         return NT_STATUS_INVALID_PARAMETER;
                 }