summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stormont <astormont@racktopsystems.com>2021-07-06 11:05:01 +0100
committerAndrew Stormont <astormont@racktopsystems.com>2021-07-06 21:38:20 +0100
commitb3d11974d0ef0679e47da102fafb125bb1d94470 (patch)
treedb1aee838f9c96af0a6fbf4ca4d1c9feba8b4a11
parent74e12c43fe52f2c30f36e65a4d0fb0e8dfd7068a (diff)
downloadillumos-joyent-b3d11974d0ef0679e47da102fafb125bb1d94470.tar.gz
13929 SMB encryption does not work with macOS 11.4
Reviewed by: Alexander Stetsenko <alex.stetsenko@gmail.com> Reviewed by: Andy Fiddaman <andy@omnios.org> Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com> Reviewed by: Matt Barden <mbarden@tintri.com> Approved by: Garrett D'Amore <garrett@damore.org>
-rw-r--r--usr/src/uts/common/fs/smbsrv/smb2_negotiate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/smbsrv/smb2_negotiate.c b/usr/src/uts/common/fs/smbsrv/smb2_negotiate.c
index 0ac7e6c74e..321a566648 100644
--- a/usr/src/uts/common/fs/smbsrv/smb2_negotiate.c
+++ b/usr/src/uts/common/fs/smbsrv/smb2_negotiate.c
@@ -487,13 +487,13 @@ smb31_decode_neg_ctxs(smb_request_t *sr, smb2_neg_ctxs_t *neg_ctxs)
switch (cipher) {
case SMB3_CIPHER_AES128_GCM:
if (encrypt_gcm_enabled) {
- s->smb31_enc_cipherid = cipher;
+ s->smb31_enc_cipherid = SMB3_CIPHER_AES128_GCM;
break;
}
/* FALLTHROUGH */
case SMB3_CIPHER_AES128_CCM:
if (encrypt_ccm_enabled) {
- s->smb31_enc_cipherid = cipher;
+ s->smb31_enc_cipherid = SMB3_CIPHER_AES128_CCM;
break;
}
/* FALLTHROUGH */