From 45c3a14529612e82dc5f6646ac9a7ee6c6516490 Mon Sep 17 00:00:00 2001 From: Steve French Date: Sun, 22 Feb 2015 00:59:36 -0600 Subject: [PATCH] Maximal SMB dialect changed from SMB3.10 to SMB3.11 (0x0310 to 0x0311) so updated MS-SMB2 spec Tested against latest Windows 10 beta in MSDN subscriber downloads Signed-off-by: Steve French --- lib/param/param_table.c | 2 +- libcli/smb/smb2_constants.h | 14 +++++++------- libcli/smb/smbXcli_base.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 18b0628..5b3e698 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -41,7 +41,7 @@ static const struct enum_list enum_protocol[] = { {PROTOCOL_DEFAULT, "default"}, /* the caller decides what this means */ {PROTOCOL_SMB2_10, "SMB2"}, /* for now keep PROTOCOL_SMB2_10 */ {PROTOCOL_SMB3_00, "SMB3"}, /* for now keep PROTOCOL_SMB3_00 */ - {PROTOCOL_SMB3_10, "SMB3_10"}, + {PROTOCOL_SMB3_10, "SMB3_11"}, {PROTOCOL_SMB3_02, "SMB3_02"}, {PROTOCOL_SMB3_00, "SMB3_00"}, {PROTOCOL_SMB2_24, "SMB2_24"}, diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h index 1a6c5ad..7afdca3 100644 --- a/libcli/smb/smb2_constants.h +++ b/libcli/smb/smb2_constants.h @@ -97,7 +97,7 @@ #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 /* SMB2 negotiate security_mode */ @@ -123,20 +123,20 @@ SMB2_CAP_DIRECTORY_LEASING | \ SMB2_CAP_ENCRYPTION) -/* Types of SMB2 Negotiate Contexts - only in dialect >= 0x310 */ +/* Types of SMB2 Negotiate Contexts - only in dialect >= 0x311 */ #define SMB2_PREAUTH_INTEGRITY_CAPABILITIES 0x0001 #define SMB2_ENCRYPTION_CAPABILITIES 0x0002 -/* Values for the SMB2_PREAUTH_INTEGRITY_CAPABILITIES Context (>= 0x310) */ +/* Values for the SMB2_PREAUTH_INTEGRITY_CAPABILITIES Context (>= 0x311) */ #define SMB2_PREAUTH_INTEGRITY_SHA512 0x0001 -/* Values for the SMB2_ENCRYPTION_CAPABILITIES Context (>= 0x310) */ +/* Values for the SMB2_ENCRYPTION_CAPABILITIES Context (>= 0x311) */ #define SMB2_ENCRYPTION_AES128_CCM 0x0001 /* only in dialect >= 0x224 */ -#define SMB2_ENCRYPTION_AES128_GCM 0x0002 /* only in dialect >= 0x310 */ +#define SMB2_ENCRYPTION_AES128_GCM 0x0002 /* only in dialect >= 0x311 */ /* SMB2 session (request) flags */ #define SMB2_SESSION_FLAG_BINDING 0x01 -/* SMB2_SESSION_FLAG_ENCRYPT_DATA 0x04 only in dialect >= 0x310 */ +/* SMB2_SESSION_FLAG_ENCRYPT_DATA 0x04 only in dialect >= 0x311 */ /* SMB2 session (response) flags */ #define SMB2_SESSION_FLAG_IS_GUEST 0x0001 @@ -144,7 +144,7 @@ #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 */ +#define SMB2_SHAREFLAG_CLUSTER_RECONNECT 0x0001 /* only in dialect >= 0x311 */ /* SMB2 sharetype flags */ #define SMB2_SHARE_TYPE_DISK 0x1 diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index 8aa6020..732932d 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -3787,7 +3787,7 @@ static const struct { {PROTOCOL_SMB2_24, SMB2_DIALECT_REVISION_224}, {PROTOCOL_SMB3_00, SMB3_DIALECT_REVISION_300}, {PROTOCOL_SMB3_02, SMB3_DIALECT_REVISION_302}, - {PROTOCOL_SMB3_10, SMB3_DIALECT_REVISION_310}, + {PROTOCOL_SMB3_10, SMB3_DIALECT_REVISION_311}, }; struct smbXcli_negprot_state { -- 2.1.0