diff options
| author |   Steve French <smfrench@gmail.com> | 2015-06-18 04:49:47 -0500 |
|---|---|---|
| committer |   Steve French <steve.french@primarydata.com> | 2015-06-28 21:15:48 -0500 |
| commit | ebb3a9d4ba3babd19c83b96fc88fc9b0d2f7d2d6 (patch) | |
| tree | bfe7737d98d4aa53c9f428f0a73f3e0b025368f6 /fs/cifs/smb2pdu.h | |
| parent | Add ioctl to set integrity (diff) | |
| download | linux-dev-ebb3a9d4ba3babd19c83b96fc88fc9b0d2f7d2d6.tar.xz linux-dev-ebb3a9d4ba3babd19c83b96fc88fc9b0d2f7d2d6.zip | |
Update negotiate protocol for SMB3.11 dialect
Send negotiate contexts when SMB3.11 dialect is negotiated
(ie the preauth and the encryption contexts) and
Initialize SMB3.11 preauth negotiate context salt to random bytes
Followon patch will update session setup and tree connect
Signed-off-by: Steve French <steve.french@primarydata.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/cifs/smb2pdu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index 2d91c2a7b218..451108284a2f 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -220,7 +220,7 @@ struct smb2_negotiate_req { #define SMB311_SALT_SIZE 32 /* Hash Algorithm Types */ -#define SMB2_PREAUTH_INTEGRITY_SHA512 0x0001 +#define SMB2_PREAUTH_INTEGRITY_SHA512 cpu_to_le16(0x0001) struct smb2_preauth_neg_context { __le16 ContextType; /* 1 */ @@ -240,8 +240,8 @@ struct smb2_encryption_neg_context { __le16 ContextType; /* 2 */ __le16 DataLength; __le32 Reserved; - __le16 CipherCount; /* 1 for time being, only AES-128-CCM */ - __le16 Ciphers; /* Ciphers[0] since only one used now */ + __le16 CipherCount; /* AES-128-GCM and AES-128-CCM */ + __le16 Ciphers[2]; /* Ciphers[0] since only one used now */ } __packed; struct smb2_negotiate_rsp { |