diff options
| author | Steve French <stfrench@microsoft.com> | 2019-06-07 15:59:40 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-07-08 05:37:42 +0200 |
| commit | 9ac63ec7760957658700890038d804ec6c26ed34 (patch) | |
| tree | f46b7152ba34c84c7277a701fd1b24b40f61a234 /fs/cifs/smb2pdu.h | |
| parent | fs: cifs: Drop unlikely before IS_ERR(_OR_NULL) (diff) | |
| download | linux-9ac63ec7760957658700890038d804ec6c26ed34.tar.xz linux-9ac63ec7760957658700890038d804ec6c26ed34.zip | |
SMB3: Add SMB3.1.1 GCM to negotiated crypto algorigthms
GCM is faster. Request it during negotiate protocol.
Followon patch will add callouts to GCM crypto
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.h')
| -rw-r--r-- | fs/cifs/smb2pdu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index 858353d20c39..c09d9244b728 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -123,7 +123,7 @@ struct smb2_sync_pdu { __le16 StructureSize2; /* size of wct area (varies, request specific) */ } __packed; -#define SMB3_AES128CMM_NONCE 11 +#define SMB3_AES128CCM_NONCE 11 #define SMB3_AES128GCM_NONCE 12 struct smb2_transform_hdr { @@ -293,7 +293,7 @@ struct smb2_encryption_neg_context { __le16 DataLength; __le32 Reserved; __le16 CipherCount; /* AES-128-GCM and AES-128-CCM */ - __le16 Ciphers[1]; /* Ciphers[0] since only one used now */ + __le16 Ciphers[2]; } __packed; /* See MS-SMB2 2.2.3.1.3 */ |