aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/smb2pdu.h
diff options
context:
space:
mode:
authorSteve French <stfrench@microsoft.com>2020-10-15 00:25:02 -0500
committerSteve French <stfrench@microsoft.com>2020-10-19 15:11:06 -0500
commitfd08f2dbf0c2e95f8503e2c79339fe5711f1aa1d (patch)
treec767bea2dc0e360252ae5c49215c5711cc360648 /fs/cifs/smb2pdu.h
parentsmb3.1.1: print warning if server does not support requested encryption type (diff)
downloadlinux-dev-fd08f2dbf0c2e95f8503e2c79339fe5711f1aa1d.tar.xz
linux-dev-fd08f2dbf0c2e95f8503e2c79339fe5711f1aa1d.zip
smb3.1.1: rename nonces used for GCM and CCM encryption
Now that 256 bit encryption can be negotiated, update names of the nonces to match the updated official protocol documentation (e.g. AES_GCM_NONCE instead of AES_128GCM_NONCE) since they apply to both 128 bit and 256 bit encryption. Signed-off-by: Steve French <stfrench@microsoft.com> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.h')
-rw-r--r--fs/cifs/smb2pdu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 6f65f1cec8ad..05b010e5a061 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -128,8 +128,8 @@ struct smb2_sync_pdu {
__le16 StructureSize2; /* size of wct area (varies, request specific) */
} __packed;
-#define SMB3_AES128CCM_NONCE 11
-#define SMB3_AES128GCM_NONCE 12
+#define SMB3_AES_CCM_NONCE 11
+#define SMB3_AES_GCM_NONCE 12
/* Transform flags (for 3.0 dialect this flag indicates CCM */
#define TRANSFORM_FLAG_ENCRYPTED 0x0001