Changeset 988 for vendor/current/libcli/smb

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/libcli/smb

Files:

• read_smb.c (added)
• read_smb.h (added)
• smb1cli_close.c (added)
• smb1cli_create.c (added)
• smb1cli_echo.c (added)
• smb1cli_read.c (added)
• smb1cli_trans.c (added)
• smb1cli_write.c (added)
• smb2_constants.h (modified) (9 diffs)
• smb2_create_blob.c (modified) (3 diffs)
• smb2_create_blob.h (modified) (1 diff)
• smb2_create_ctx.h (added)
• smb2_lease.c (added)
• smb2_lease.h (added)
• smb2_negotiate_context.c (added)
• smb2_negotiate_context.h (added)
• smb2_signing.c (added)
• smb2_signing.h (added)
• smb2cli_close.c (added)
• smb2cli_create.c (added)
• smb2cli_echo.c (added)
• smb2cli_flush.c (added)
• smb2cli_ioctl.c (added)
• smb2cli_query_directory.c (added)
• smb2cli_query_info.c (added)
• smb2cli_read.c (added)
• smb2cli_session.c (added)
• smb2cli_set_info.c (added)
• smb2cli_tcon.c (added)
• smb2cli_write.c (added)
• smbXcli_base.c (added)
• smbXcli_base.h (added)
• smb_common.h (modified) (1 diff)
• smb_constants.h (added)
• smb_seal.c (added)
• smb_seal.h (added)
• smb_signing.c (added)
• smb_signing.h (added)
• smb_unix_ext.h (added)
• smb_util.h (added)
• tstream_smbXcli_np.c (added)
• tstream_smbXcli_np.h (added)
• util.c (added)
• wscript (added)
• wscript_build (deleted)

vendor/current/libcli/smb/smb2_constants.h

@@ -22 +22 @@
 #ifndef __LIBCLI_SMB2_SMB2_CONSTANTS_H__
 #define __LIBCLI_SMB2_SMB2_CONSTANTS_H__
+
+/* offsets into SMB2_TRANSFORM header elements */
+#define SMB2_TF_PROTOCOL_ID     0x00 /*  4 bytes */
+#define SMB2_TF_SIGNATURE       0x04 /* 16 bytes */
+#define SMB2_TF_NONCE           0x14 /* 16 bytes */
+#define SMB2_TF_MSG_SIZE        0x24 /*  4 bytes */
+#define SMB2_TF_RESERVED        0x28 /*  2 bytes */
+#define SMB2_TF_FLAGS           0x2A /*  2 bytes */
+#define SMB2_TF_SESSION_ID      0x2C /*  8 bytes */
+
+#define SMB2_TF_HDR_SIZE        0x34 /* 52 bytes */
+
+#define SMB2_TF_MAGIC 0x424D53FD /* 0xFD 'S' 'M' 'B' */
+
+#define SMB2_TF_FLAGS_ENCRYPTED     0x0001
 
 /* offsets into header elements for a sync SMB2 request */
@@ -29 +44 @@
 #define SMB2_HDR_EPOCH          SMB2_HDR_CREDIT_CHARGE /* TODO: remove this */
 #define SMB2_HDR_STATUS         0x08
+#define SMB2_HDR_CHANNEL_SEQUENCE SMB2_HDR_STATUS /* in requests */
 #define SMB2_HDR_OPCODE         0x0c
 #define SMB2_HDR_CREDIT         0x0e
@@ -48 +64 @@
 #define SMB2_HDR_FLAG_CHAINED   0x04
 #define SMB2_HDR_FLAG_SIGNED    0x08
+#define SMB2_HDR_FLAG_PRIORITY_MASK 0x70
 #define SMB2_HDR_FLAG_DFS       0x10000000
+#define SMB2_HDR_FLAG_REPLAY_OPERATION 0x20000000
+
+#define SMB2_PRIORITY_MASK_TO_VALUE(__m) (((__m) & SMB2_HDR_FLAG_PRIORITY_MASK) >> 4)
+#define SMB2_PRIORITY_VALUE_TO_MASK(__v) (((__v) << 4) & SMB2_HDR_FLAG_PRIORITY_MASK)
 
 /* SMB2 opcodes */
-#define SMB2_OP_NEGPROT   0x00
-#define SMB2_OP_SESSSETUP 0x01
-#define SMB2_OP_LOGOFF    0x02
-#define SMB2_OP_TCON      0x03
-#define SMB2_OP_TDIS      0x04
-#define SMB2_OP_CREATE    0x05
-#define SMB2_OP_CLOSE     0x06
-#define SMB2_OP_FLUSH     0x07
-#define SMB2_OP_READ      0x08
-#define SMB2_OP_WRITE     0x09
-#define SMB2_OP_LOCK      0x0a
-#define SMB2_OP_IOCTL     0x0b
-#define SMB2_OP_CANCEL    0x0c
-#define SMB2_OP_KEEPALIVE 0x0d
-#define SMB2_OP_FIND      0x0e
-#define SMB2_OP_NOTIFY    0x0f
-#define SMB2_OP_GETINFO   0x10
-#define SMB2_OP_SETINFO   0x11
-#define SMB2_OP_BREAK     0x12
+#define SMB2_OP_NEGPROT         0x00
+#define SMB2_OP_SESSSETUP       0x01
+#define SMB2_OP_LOGOFF          0x02
+#define SMB2_OP_TCON            0x03
+#define SMB2_OP_TDIS            0x04
+#define SMB2_OP_CREATE          0x05
+#define SMB2_OP_CLOSE           0x06
+#define SMB2_OP_FLUSH           0x07
+#define SMB2_OP_READ            0x08
+#define SMB2_OP_WRITE           0x09
+#define SMB2_OP_LOCK            0x0a
+#define SMB2_OP_IOCTL           0x0b
+#define SMB2_OP_CANCEL          0x0c
+#define SMB2_OP_KEEPALIVE       0x0d
+#define SMB2_OP_QUERY_DIRECTORY 0x0e
+#define SMB2_OP_NOTIFY          0x0f
+#define SMB2_OP_GETINFO         0x10
+#define SMB2_OP_SETINFO         0x11
+#define SMB2_OP_BREAK           0x12
 
 #define SMB2_MAGIC 0x424D53FE /* 0xFE 'S' 'M' 'B' */
@@ -77 +98 @@
 #define SMB2_DIALECT_REVISION_202       0x0202
 #define SMB2_DIALECT_REVISION_210       0x0210
+#define SMB2_DIALECT_REVISION_222       0x0222
+#define SMB2_DIALECT_REVISION_224       0x0224
+#define SMB3_DIALECT_REVISION_300       0x0300
+#define SMB3_DIALECT_REVISION_302       0x0302
+#define SMB3_DIALECT_REVISION_310       0x0310
+#define SMB3_DIALECT_REVISION_311       0x0311
 #define SMB2_DIALECT_REVISION_2FF       0x02FF
 
@@ -83 +110 @@
 #define SMB2_NEGOTIATE_SIGNING_REQUIRED  0x02
 
-/* SMB2 capabilities - only 1 so far. I'm sure more will be added */
-#define SMB2_CAP_DFS                     0x00000001
-#define SMB2_CAP_LEASING                 0x00000002 /* only in dialect 0x210 */
-#define SMB2_CAP_LARGE_MTU               0x00000004 /* only in dialect 0x210 */
+/* SMB2 global capabilities */
+#define SMB2_CAP_DFS                    0x00000001
+#define SMB2_CAP_LEASING                0x00000002 /* only in dialect >= 0x210 */
+#define SMB2_CAP_LARGE_MTU              0x00000004 /* only in dialect >= 0x210 */
+#define SMB2_CAP_MULTI_CHANNEL          0x00000008 /* only in dialect >= 0x222 */
+#define SMB2_CAP_PERSISTENT_HANDLES     0x00000010 /* only in dialect >= 0x222 */
+#define SMB2_CAP_DIRECTORY_LEASING      0x00000020 /* only in dialect >= 0x222 */
+#define SMB2_CAP_ENCRYPTION             0x00000040 /* only in dialect >= 0x222 */
+
 /* so we can spot new caps as added */
-#define SMB2_CAP_ALL                     SMB2_CAP_DFS
-
-/* SMB2 session flags */
+#define SMB2_CAP_ALL (\
+                SMB2_CAP_DFS | \
+                SMB2_CAP_LEASING | \
+                SMB2_CAP_LARGE_MTU | \
+                SMB2_CAP_MULTI_CHANNEL | \
+                SMB2_CAP_PERSISTENT_HANDLES | \
+                SMB2_CAP_DIRECTORY_LEASING | \
+                SMB2_CAP_ENCRYPTION)
+
+/* Types of SMB2 Negotiate Contexts - only in dialect >= 0x310 */
+#define SMB2_PREAUTH_INTEGRITY_CAPABILITIES 0x0001
+#define SMB2_ENCRYPTION_CAPABILITIES        0x0002
+
+/* Values for the SMB2_PREAUTH_INTEGRITY_CAPABILITIES Context (>= 0x310) */
+#define SMB2_PREAUTH_INTEGRITY_SHA512       0x0001
+
+/* Values for the SMB2_ENCRYPTION_CAPABILITIES Context (>= 0x310) */
+#define SMB2_ENCRYPTION_AES128_CCM         0x0001 /* only in dialect >= 0x224 */
+#define SMB2_ENCRYPTION_AES128_GCM         0x0002 /* only in dialect >= 0x310 */
+#define SMB2_NONCE_HIGH_MAX(nonce_len_bytes) ((uint64_t)(\
+        ((nonce_len_bytes) >= 16) ? UINT64_MAX : \
+        ((nonce_len_bytes) <= 8) ? 0 : \
+        (((uint64_t)1 << (((nonce_len_bytes) - 8)*8)) - 1) \
+        ))
+
+/* SMB2 session (request) flags */
+#define SMB2_SESSION_FLAG_BINDING       0x01
+/*      SMB2_SESSION_FLAG_ENCRYPT_DATA  0x04       only in dialect >= 0x310 */
+
+/* SMB2 session (response) flags */
 #define SMB2_SESSION_FLAG_IS_GUEST       0x0001
 #define SMB2_SESSION_FLAG_IS_NULL        0x0002
+#define SMB2_SESSION_FLAG_ENCRYPT_DATA   0x0004 /* in dialect >= 0x224 */
+
+/* SMB2 tree connect (request) flags */
+#define SMB2_SHAREFLAG_CLUSTER_RECONNECT 0x0001 /* only in dialect >= 0x310 */
 
 /* SMB2 sharetype flags */
@@ -110 +173 @@
 #define SMB2_SHAREFLAG_ALLOW_NAMESPACE_CACHING           0x0400
 #define SMB2_SHAREFLAG_ACCESS_BASED_DIRECTORY_ENUM       0x0800
-#define SMB2_SHAREFLAG_ALL                               0x0F33
-
-/* SMB2 share capafilities */
-#define SMB2_SHARE_CAP_DFS              0x8
+#define SMB2_SHAREFLAG_FORCE_LEVELII_OPLOCKS             0x1000
+#define SMB2_SHAREFLAG_ENABLE_HASH_V1                    0x2000
+#define SMB2_SHAREFLAG_ENABLE_HASH_V2                    0x4000
+#define SMB2_SHAREFLAG_ENCRYPT_DATA                      0x8000
+#define SMB2_SHAREFLAG_ALL                               0xFF33
+
+/* SMB2 share capabilities */
+#define SMB2_SHARE_CAP_DFS                      0x8
+#define SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY  0x10 /* in dialect >= 0x222 */
+#define SMB2_SHARE_CAP_SCALEOUT                 0x20 /* in dialect >= 0x222 */
+#define SMB2_SHARE_CAP_CLUSTER                  0x40 /* in dialect >= 0x222 */
+#define SMB2_SHARE_CAP_ASYMMETRIC               0x80 /* in dialect >= 0x302 */
 
 /* SMB2 create security flags */
@@ -136 +207 @@
 /* SMB2 lease bits */
 #define SMB2_LEASE_NONE                                  0x00
-#define SMB2_LEASE_READ                                  0x01
-#define SMB2_LEASE_HANDLE                                0x02
-#define SMB2_LEASE_WRITE                                 0x04
+
+/* SMB2 lease flags */
+#define SMB2_LEASE_FLAG_BREAK_IN_PROGRESS                0x00000002
+#define SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET             0x00000004
 
 /* SMB2 lease break flags */
@@ -159 +231 @@
 #define SMB2_CREATE_TAG_QFID "QFid"
 #define SMB2_CREATE_TAG_RQLS "RqLs"
+#define SMB2_CREATE_TAG_DH2Q "DH2Q"
+#define SMB2_CREATE_TAG_DH2C "DH2C"
+#define SMB2_CREATE_TAG_AAPL "AAPL"
+#define SMB2_CREATE_TAG_APP_INSTANCE_ID "\x45\xBC\xA6\x6A\xEF\xA7\xF7\x4A\x90\x08\xFA\x46\x2E\x14\x4D\x74"
+#define SVHDX_OPEN_DEVICE_CONTEXT "\x9C\xCB\xCF\x9E\x04\xC1\xE6\x43\x98\x0E\x15\x8D\xA1\xF6\xEC\x83"
+
+/* SMB2 notify flags */
+#define SMB2_WATCH_TREE 0x0001
 
 /* SMB2 Create ignore some more create_options */
@@ -188 +268 @@
 #define SMB2_CLOSE_FLAGS_FULL_INFORMATION (0x01)
 
+#define SMB2_READFLAG_READ_UNBUFFERED   0x01
+
+#define SMB2_WRITEFLAG_WRITE_THROUGH    0x00000001
+#define SMB2_WRITEFLAG_WRITE_UNBUFFERED 0x00000002
+
+/* 2.2.31 SMB2 IOCTL Request */
+#define SMB2_IOCTL_FLAG_IS_FSCTL                0x00000001
+
+/*
+ * Flags for durable handle v2 requests
+ */
+#define SMB2_DHANDLE_FLAG_PERSISTENT 0x00000002
+
 #endif

vendor/current/libcli/smb/smb2_create_blob.c

@@ -42 +42 @@
                 uint32_t next;
                 uint32_t name_offset, name_length;
-                uint32_t reserved, data_offset;
+                uint32_t data_offset;
                 uint32_t data_length;
                 char *tag;
@@ -54 +54 @@
                 name_offset = SVAL(data, 4);
                 name_length = SVAL(data, 6);
+#if 0
                 reserved    = SVAL(data, 8);
+#endif
                 data_offset = SVAL(data, 10);
                 data_length = IVAL(data, 12);
@@ -197 +199 @@
                 NT_STATUS_HAVE_NO_MEMORY(b->blobs[b->num_blobs].data.data);
         } else {
-                b->blobs[b->num_blobs].data = data_blob(NULL, 0);
+                b->blobs[b->num_blobs].data = data_blob_null;
         }
 

vendor/current/libcli/smb/smb2_create_blob.h

@@ -34 +34 @@
 };
 
+struct smb_create_returns {
+        uint8_t oplock_level;
+        uint32_t create_action;
+        NTTIME creation_time;
+        NTTIME last_access_time;
+        NTTIME last_write_time;
+        NTTIME change_time;
+        uint64_t allocation_size;
+        uint64_t end_of_file;
+        uint32_t file_attributes;
+};
+
 /*
   parse a set of SMB2 create blobs

vendor/current/libcli/smb/smb_common.h

@@ -23 +23 @@
 #define __LIBCLI_SMB_SMB_COMMON_H__
 
-#include "../libcli/smb/smb2_constants.h"
-#include "../libcli/smb/smb2_create_blob.h"
+#include "libcli/smb/smb_constants.h"
+#include "libcli/smb/smb2_constants.h"
+#include "libcli/smb/smb2_create_blob.h"
+#include "libcli/smb/smb2_lease.h"
+#include "libcli/smb/smb2_signing.h"
+#include "libcli/smb/smb_util.h"
+#include "libcli/smb/smb_unix_ext.h"
 
 #endif