Commit 8b4dd44f authored by Steve French's avatar Steve French
Browse files

smb3: display debug information better for encryption 



Fix /proc/fs/cifs/DebugData to use the same case for "encryption"
(ie "Encryption" with init capital letter was used in one place).
In addition, if gcm256 encryption (intead of gcm128) is used on
a connection to a server, note that in the DebugData as well.

It now displays (when gcm256 negotiated):
 Security type: RawNTLMSSP  SessionId: 0x86125800bc000b0d encrypted(gcm256)

Acked-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 72a7804a

fs/cifs/cifs_debug.c

+6 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon) 
	if ((tcon->seal) ||

	    (tcon->ses->session_flags & SMB2_SESSION_FLAG_ENCRYPT_DATA) ||

	    (tcon->share_flags & SHI1005_FLAGS_ENCRYPT_DATA))

		seq_printf(m, " Encrypted");

		seq_puts(m, " encrypted");

	if (tcon->nocase)

		seq_printf(m, " nocase");

	if (tcon->unix_ext)
@@ -415,8 +415,12 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 


			/* dump session id helpful for use with network trace */

			seq_printf(m, " SessionId: 0x%llx", ses->Suid);

			if (ses->session_flags & SMB2_SESSION_FLAG_ENCRYPT_DATA)

			if (ses->session_flags & SMB2_SESSION_FLAG_ENCRYPT_DATA) {

				seq_puts(m, " encrypted");

				/* can help in debugging to show encryption type */

				if (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM)

					seq_puts(m, "(gcm256)");

			}

			if (ses->sign)

				seq_puts(m, " signed");