aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifspdu.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/cifspdu.h')
-rw-r--r--fs/cifs/cifspdu.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h
index e996ff6b26d1..11ca24a8e054 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/cifs/cifspdu.h
@@ -142,6 +142,11 @@
142 */ 142 */
143#define CIFS_SESS_KEY_SIZE (16) 143#define CIFS_SESS_KEY_SIZE (16)
144 144
145/*
146 * Size of the smb3 signing key
147 */
148#define SMB3_SIGN_KEY_SIZE (16)
149
145#define CIFS_CLIENT_CHALLENGE_SIZE (8) 150#define CIFS_CLIENT_CHALLENGE_SIZE (8)
146#define CIFS_SERVER_CHALLENGE_SIZE (8) 151#define CIFS_SERVER_CHALLENGE_SIZE (8)
147#define CIFS_HMAC_MD5_HASH_SIZE (16) 152#define CIFS_HMAC_MD5_HASH_SIZE (16)
@@ -531,7 +536,7 @@ typedef struct lanman_neg_rsp {
531#define READ_RAW_ENABLE 1 536#define READ_RAW_ENABLE 1
532#define WRITE_RAW_ENABLE 2 537#define WRITE_RAW_ENABLE 2
533#define RAW_ENABLE (READ_RAW_ENABLE | WRITE_RAW_ENABLE) 538#define RAW_ENABLE (READ_RAW_ENABLE | WRITE_RAW_ENABLE)
534 539#define SMB1_CLIENT_GUID_SIZE (16)
535typedef struct negotiate_rsp { 540typedef struct negotiate_rsp {
536 struct smb_hdr hdr; /* wct = 17 */ 541 struct smb_hdr hdr; /* wct = 17 */
537 __le16 DialectIndex; /* 0xFFFF = no dialect acceptable */ 542 __le16 DialectIndex; /* 0xFFFF = no dialect acceptable */
@@ -553,7 +558,7 @@ typedef struct negotiate_rsp {
553 /* followed by 16 bytes of server GUID */ 558 /* followed by 16 bytes of server GUID */
554 /* then security blob if cap_extended_security negotiated */ 559 /* then security blob if cap_extended_security negotiated */
555 struct { 560 struct {
556 unsigned char GUID[16]; 561 unsigned char GUID[SMB1_CLIENT_GUID_SIZE];
557 unsigned char SecurityBlob[1]; 562 unsigned char SecurityBlob[1];
558 } __attribute__((packed)) extended_response; 563 } __attribute__((packed)) extended_response;
559 } __attribute__((packed)) u; 564 } __attribute__((packed)) u;
@@ -1315,6 +1320,14 @@ typedef struct smb_com_ntransact_rsp {
1315 /* parms and data follow */ 1320 /* parms and data follow */
1316} __attribute__((packed)) NTRANSACT_RSP; 1321} __attribute__((packed)) NTRANSACT_RSP;
1317 1322
1323/* See MS-SMB 2.2.7.2.1.1 */
1324struct srv_copychunk {
1325 __le64 SourceOffset;
1326 __le64 DestinationOffset;
1327 __le32 CopyLength;
1328 __u32 Reserved;
1329} __packed;
1330
1318typedef struct smb_com_transaction_ioctl_req { 1331typedef struct smb_com_transaction_ioctl_req {
1319 struct smb_hdr hdr; /* wct = 23 */ 1332 struct smb_hdr hdr; /* wct = 23 */
1320 __u8 MaxSetupCount; 1333 __u8 MaxSetupCount;