diff options
| author |   Steve French <stfrench@microsoft.com> | 2019-06-07 08:59:40 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-07-07 22:37:42 -0500 |
| commit | 9ac63ec7760957658700890038d804ec6c26ed34 (patch) | |
| tree | f46b7152ba34c84c7277a701fd1b24b40f61a234 /fs/cifs/smb2pdu.c | |
| parent | fs: cifs: Drop unlikely before IS_ERR(_OR_NULL) (diff) | |
| download | linux-dev-9ac63ec7760957658700890038d804ec6c26ed34.tar.xz linux-dev-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.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index ab8dc73d2282..ab3300a39071 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -489,10 +489,10 @@ static void build_encrypt_ctxt(struct smb2_encryption_neg_context *pneg_ctxt) { pneg_ctxt->ContextType = SMB2_ENCRYPTION_CAPABILITIES; - pneg_ctxt->DataLength = cpu_to_le16(4); /* Cipher Count + le16 cipher */ - pneg_ctxt->CipherCount = cpu_to_le16(1); -/* pneg_ctxt->Ciphers[0] = SMB2_ENCRYPTION_AES128_GCM;*/ /* not supported yet */ - pneg_ctxt->Ciphers[0] = SMB2_ENCRYPTION_AES128_CCM; + pneg_ctxt->DataLength = cpu_to_le16(6); /* Cipher Count + two ciphers */ + pneg_ctxt->CipherCount = cpu_to_le16(2); + pneg_ctxt->Ciphers[0] = SMB2_ENCRYPTION_AES128_GCM; + pneg_ctxt->Ciphers[1] = SMB2_ENCRYPTION_AES128_CCM; } static void |