Merge ~joalif/ubuntu/+source/cifs-utils:lp1886551-focal into ubuntu/+source/cifs-utils:ubuntu/focal-devel

[Ioanna Alifieraki]

[Andreas Hasenack (ahasenack)]

First pass, still looking.

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

The rest is +1. I suggest to update the "[other info]" section in the sru bug to explain why you chose to also add other changes not strictly related to "smbinfo keys" support. I would say that it's a standalone utility, and backporting just the exactly required patches could introduce the risk of adding bugs in the process. For the case of focal, adding the compression commands is to keep it in parity with that is being introduced in bionic. But the SRU team might object to this approach and request that only the "keys" command be backported in both ubuntu releases.

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

I forgot to ask to run update-maintainer, to update d/control. I'm doing that and pushing with my change.

[Andreas Hasenack (ahasenack)]

Tagging and uploading a4a3b86d0ac5999250933029d4592480c7d09c74, which is the d/control maintainer update on top of joalif's last pushed commit:

commit a4a3b86d0ac5999250933029d4592480c7d09c74 (HEAD -> lp1886551-focal, tag: upload/2%6.9-1ubuntu0.1, tag: pkg/upload/2%6.9-1ubuntu0.1, ahasenack/lp1886551-focal)
Author: Andreas Hasenack <email address hidden>
Date: Mon Sep 14 17:43:48 2020 -0300

    update-metadata

diff --git a/debian/control b/debian/control
index 37f6ebc..0a46b22 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: cifs-utils
 Section: otherosfs
 Priority: optional
-Maintainer: Debian Samba Maintainers <email address hidden>
+Maintainer: Ubuntu Developers <email address hidden>
+XSBC-Original-Maintainer: Debian Samba Maintainers <email address hidden>
 Uploaders: Steve Langasek <email address hidden>, Noèl Köthe <email address hidden>, Jelmer Vernooij <email address hidden>, Mathieu Parent <email address hidden>
 Build-Depends:
        libkeyutils-dev,

commit 5bf18abca871698f384a3cbb3d5460fb0d8af010 (joalif/lp1886551-focal)
Author: Ioanna Alifieraki <email address hidden>
Date: Mon Sep 14 14:41:36 2020 +0100

    debian/changelog fix version

....
...

$ git push pkg upload/2%6.9-1ubuntu0.1
Enumerating objects: 49, done.
Counting objects: 100% (49/49), done.
Delta compression using up to 4 threads
Compressing objects: 100% (42/42), done.
Writing objects: 100% (43/43), 9.14 KiB | 2.29 MiB/s, done.
Total 43 (delta 28), reused 5 (delta 1)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/cifs-utils
 * [new tag] upload/2%6.9-1ubuntu0.1 -> upload/2%6.9-1ubuntu0.1

$ dput ubuntu ../cifs-utils_6.9-1ubuntu0.1_source.changes
Checking signature on .changes
gpg: ../cifs-utils_6.9-1ubuntu0.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../cifs-utils_6.9-1ubuntu0.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading cifs-utils_6.9-1ubuntu0.1.dsc: done.
  Uploading cifs-utils_6.9-1ubuntu0.1.debian.tar.xz: done.
  Uploading cifs-utils_6.9-1ubuntu0.1_source.buildinfo: done.
  Uploading cifs-utils_6.9-1ubuntu0.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 97ac746..bf9b606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cifs-utils (2:6.9-1ubuntu0.1) focal; urgency=medium
+
+  * Add 'keys' command to smbinfo (LP: #1886551):
+    - d/p/0002-smbinfo-Improve-help-usage-and-add-h-option.patch
+    - d/p/0003-smbinfo-add-GETCOMPRESSION-support.patch
+    - d/p/0004-smbinfo-print-the-security-information-needed-to-dec.patch
+    - d/p/0005-smbinfo-Add-SETCOMPRESSION-support.patch
+    - d/p/0006-smbinfo.rst-document-new-keys-command.patch
+
+ -- Ioanna Alifieraki <[e-mail]>  Mon, 14 Sep 2020 12:55:41 +0100
+
 cifs-utils (2:6.9-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]
diff --git a/debian/patches/0002-smbinfo-Improve-help-usage-and-add-h-option.patch b/debian/patches/0002-smbinfo-Improve-help-usage-and-add-h-option.patch
new file mode 100644
index 0000000..0d5231c
--- /dev/null
+++ b/debian/patches/0002-smbinfo-Improve-help-usage-and-add-h-option.patch
@@ -0,0 +1,108 @@
+From 12c2f088fa3d666fc5aa48a700e740523d8d2023 Mon Sep 17 00:00:00 2001
+From: Kenneth D'souza <[e-mail]>
+Origin: Upstream, https://git.samba.org/?p=cifs-utils.git;a=commit;h=12c2f088fa3d666fc5aa48a700e740523d8d2023
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1886551
+Date: Wed, 17 Apr 2019 15:36:46 +0530
+Subject: [PATCH] smbinfo: Improve help usage and add -h option.
+
+Call usage only for -h case. This avoids cluttering the screen with long
+help output.
+As we are adding more options to the utility, the end error is just hidden.
+Call short_usage wherever necessary.
+
+Signed-off-by: Kenneth D'souza <[e-mail]>
+---
+ smbinfo.c   | 27 ++++++++++++++++++++++-----
+ smbinfo.rst |  5 ++++-
+ 2 files changed, 26 insertions(+), 6 deletions(-)
+
+diff --git a/smbinfo.c b/smbinfo.c
+index 4bc503a..6e258c2 100644
+--- a/smbinfo.c
++++ b/smbinfo.c
+@@ -64,6 +64,8 @@ usage(char *name)
+ {
+ 	fprintf(stderr, "Usage: %s [-V] <command> <file>\n"
+ 		"-V for verbose output\n"
++		"-h display this help text\n"
++		"-v print smbinfo version\n"
+ 		"Commands are\n"
+ 		"  fileaccessinfo:\n"
+ 		"      Prints FileAccessInfo for a cifs file.\n"
+@@ -97,6 +99,14 @@ usage(char *name)
+ 	exit(1);
+ }
+ 
++static void
++short_usage(char *name)
++{
++	fprintf(stderr, "Usage: %s [-v] [-V] <command> <file>\n"
++		"Try 'smbinfo -h' for more information.\n", name);
++	exit(1);
++}
++
+ static void
+ win_to_timeval(uint64_t smb2_time, struct timeval *tv)
+ {
+@@ -1075,7 +1085,11 @@ int main(int argc, char *argv[])
+ 	int c;
+ 	int f;
+ 
+-	while ((c = getopt_long(argc, argv, "vV", NULL, NULL)) != -1) {
++	if (argc < 2) {
++		short_usage(argv[0]);
++	}
++
++	while ((c = getopt_long(argc, argv, "vVh", NULL, NULL)) != -1) {
+ 		switch (c) {
+ 		case 'v':
+ 			printf("smbinfo version %s\n", VERSION);
+@@ -1083,15 +1097,18 @@ int main(int argc, char *argv[])
+ 		case 'V':
+ 			verbose = 1;
+ 			break;
+-		default:
++		case 'h':
+ 			usage(argv[0]);
++			break;
++		default:
++			short_usage(argv[0]);
+ 		}
+ 	}
+ 
+-	if (optind >= argc - 1)
+-		usage(argv[0]);
++	if (optind >= argc -1)
++		short_usage(argv[0]);
+ 
+-	if ((f = open(argv[optind + 1], O_RDONLY)) < 0) {
++	if ((f = open(argv[optind + 1 ], O_RDONLY)) < 0) {
+ 		fprintf(stderr, "Failed to open %s\n", argv[optind + 1]);
+ 		exit(1);
+ 	}
+diff --git a/smbinfo.rst b/smbinfo.rst
+index 0c96050..be4c829 100644
+--- a/smbinfo.rst
++++ b/smbinfo.rst
+@@ -11,7 +11,7 @@ Userspace helper to display SMB-specific file information for the Linux SMB clie
+ SYNOPSIS
+ ********
+ 
+-  smbinfo [-v] [-V] {command} {file system object}
++  smbinfo [-v] [-h] [-V] {command} {file system object}
+ 
+ ***********
+ DESCRIPTION
+@@ -38,6 +38,9 @@ OPTIONS
+ -V
+   Verbose output.
+ 
++-h
++  Print help explaining the command line options.
++
+ *******
+ COMMAND
+ *******
+-- 
+2.17.1
+
diff --git a/debian/patches/0003-smbinfo-add-GETCOMPRESSION-support.patch b/debian/patches/0003-smbinfo-add-GETCOMPRESSION-support.patch
new file mode 100644
index 0000000..e16aba5
--- /dev/null
+++ b/debian/patches/0003-smbinfo-add-GETCOMPRESSION-support.patch
@@ -0,0 +1,102 @@
+From 1e4fca25948d52fc29410963663f3af72275bcb6 Mon Sep 17 00:00:00 2001
+From: Ronnie Sahlberg <[e-mail]>
+Origin: Upstream, https://git.samba.org/?p=cifs-utils.git;a=commit;h=1e4fca25948d52fc29410963663f3af72275bcb6
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1886551
+Date: Thu, 11 Apr 2019 12:23:06 +1000
+Subject: [PATCH] smbinfo: add GETCOMPRESSION support
+
+Signed-off-by: Ronnie Sahlberg <[e-mail]>
+---
+ smbinfo.c   | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ smbinfo.rst |  2 ++
+ 2 files changed, 50 insertions(+)
+
+diff --git a/smbinfo.c b/smbinfo.c
+index 6e258c2..b4d497b 100644
+--- a/smbinfo.c
++++ b/smbinfo.c
+@@ -89,6 +89,8 @@ usage(char *name)
+ 		"      Prints FileStandardInfo for a cifs file.\n"
+ 		"  fsctl-getobjid:\n"
+ 		"      Prints the objectid of the file and GUID of the underlying volume.\n"
++		"  getcompression:\n"
++		"      Prints the compression setting for the file.\n"
+ 		"  list-snapshots:\n"
+ 		"      List the previous versions of the volume that backs this file.\n"
+ 		"  quota:\n"
+@@ -252,6 +254,50 @@ fsctlgetobjid(int f)
+ 	free(qi);
+ }
+ 
++static void
++print_getcompression(uint8_t *sd)
++{
++	uint16_t u16;
++
++	memcpy(&u16, &sd[0], 2);
++	u16 = le16toh(u16);
++
++	printf("Compression: ");
++	switch (u16) {
++	case 0:
++		printf("(0) NONE\n");
++		break;
++	case 2:
++		printf("(2) LZNT1\n");
++		break;
++	default:
++		printf("(%d) UNKNOWN\n", u16);
++		break;
++	}
++}
++
++static void
++getcompression(int f)
++{
++	struct smb_query_info *qi;
++
++	qi = malloc(sizeof(struct smb_query_info) + 2);
++	memset(qi, 0, sizeof(qi) + 2);
++	qi->info_type = 0x9003c;
++	qi->file_info_class = 0;
++	qi->additional_information = 0;
++	qi->input_buffer_length = 2;
++	qi->flags = PASSTHRU_FSCTL;
++
++	if (ioctl(f, CIFS_QUERY_INFO, qi) < 0) {
++		fprintf(stderr, "ioctl failed with %s\n", strerror(errno));
++		exit(1);
++	}
++	print_getcompression((uint8_t *)(&qi[1]));
++
++	free(qi);
++}
++
+ static void
+ print_fileaccessinfo(uint8_t *sd, int type)
+ {
+@@ -1135,6 +1181,8 @@ int main(int argc, char *argv[])
+ 		filestandardinfo(f);
+ 	else if (!strcmp(argv[optind], "fsctl-getobjid"))
+ 		fsctlgetobjid(f);
++	else if (!strcmp(argv[optind], "getcompression"))
++		getcompression(f);
+ 	else if (!strcmp(argv[optind], "list-snapshots"))
+ 		list_snapshots(f);
+ 	else if (!strcmp(argv[optind], "quota"))
+diff --git a/smbinfo.rst b/smbinfo.rst
+index be4c829..500ce0e 100644
+--- a/smbinfo.rst
++++ b/smbinfo.rst
+@@ -67,6 +67,8 @@ COMMAND
+ 
+ `fsctl-getobjid`: Prints the ObjectID
+ 
++`getcompression`: Prints the compression setting for the file.
++
+ `list-snapshots`: Lists the previous versions of the volume that backs this file
+ 
+ `quota`: Print the quota for the volume in the form
+-- 
+2.17.1
+
diff --git a/debian/patches/0004-smbinfo-print-the-security-information-needed-to-dec.patch b/debian/patches/0004-smbinfo-print-the-security-information-needed-to-dec.patch
new file mode 100644
index 0000000..909cf22
--- /dev/null
+++ b/debian/patches/0004-smbinfo-print-the-security-information-needed-to-dec.patch
@@ -0,0 +1,108 @@
+From 6df98da5cd3fbb33f6f535c6784f037bbadadb84 Mon Sep 17 00:00:00 2001
+From: Steve French <[e-mail]>
+Origin: Upstream, https://git.samba.org/?p=cifs-utils.git;a=commit;h=6df98da5cd3fbb33f6f535c6784f037bbadadb84
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1886551
+Date: Thu, 19 Sep 2019 04:21:16 -0500
+Subject: [PATCH] smbinfo: print the security information needed to decrypt
+ wireshark trace
+
+CCM encryption
+Session Id:   e2 3e ea ae 00 00 00 00
+Session Key:  65 7e 0e d5 3c 06 5a 06 50 a3 ef 96 c1 64 3d 1f
+Server Encryption Key:  5e 42 a7 b5 57 75 d6 56 4a 5d 33 97 e6 45 07 76
+Server Decryption Key:  1f 64 db a3 0f 24 e3 4d b6 31 00 ab 9a af 22 47
+
+Signed-off-by: Steve French <[e-mail]>
+---
+ smbinfo.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 52 insertions(+), 1 deletion(-)
+
+diff --git a/smbinfo.c b/smbinfo.c
+index b4d497b..2aa5eee 100644
+--- a/smbinfo.c
++++ b/smbinfo.c
+@@ -54,7 +54,17 @@ struct smb_query_info {
+ 	/* char buffer[]; */
+ } __packed;
+ 
++#define SMB3_SIGN_KEY_SIZE 16
++struct smb3_key_debug_info {
++	uint64_t Suid;
++	uint16_t cipher_type;
++	uint8_t auth_key[16]; /* SMB2_NTLMV2_SESSKEY_SIZE */
++	uint8_t	smb3encryptionkey[SMB3_SIGN_KEY_SIZE];
++	uint8_t	smb3decryptionkey[SMB3_SIGN_KEY_SIZE];
++} __attribute__((packed));
++
+ #define CIFS_QUERY_INFO _IOWR(CIFS_IOCTL_MAGIC, 7, struct smb_query_info)
++#define CIFS_DUMP_KEY _IOWR(CIFS_IOCTL_MAGIC, 8, struct smb3_key_debug_info)
+ #define INPUT_BUFFER_LENGTH 16384
+ 
+ int verbose;
+@@ -96,7 +106,9 @@ usage(char *name)
+ 		"  quota:\n"
+ 		"      Prints the quota for a cifs file.\n"
+ 		"  secdesc:\n"
+-		"      Prints the security descriptor for a cifs file.\n",
++		"      Prints the security descriptor for a cifs file.\n"
++		"  keys:\n"
++		"      Prints the decryption information needed to view encrypted network traces.\n",
+ 		name);
+ 	exit(1);
+ }
+@@ -1071,6 +1083,43 @@ static void print_snapshots(struct smb_snapshot_array *psnap)
+ 	printf("\n");
+ }
+ 
++static void
++dump_keys(int f)
++{
++	struct smb3_key_debug_info keys_info;
++	uint8_t *psess_id;
++
++	if (ioctl(f, CIFS_DUMP_KEY, &keys_info) < 0) {
++		fprintf(stderr, "Querying keys information failed with %s\n", strerror(errno));
++		exit(1);
++	}
++
++	if (keys_info.cipher_type == 1)
++		printf("CCM encryption");
++	else if (keys_info.cipher_type == 2)
++		printf("GCM encryption");
++	else if (keys_info.cipher_type == 0)
++		printf("SMB3.0 CCM encryption");
++	else
++		printf("unknown encryption type");
++
++	printf("\nSession Id:  ");
++	psess_id = (uint8_t *)&keys_info.Suid;
++	for (int i = 0; i < 8; i++)
++		printf(" %02x", psess_id[i]);
++
++	printf("\nSession Key: ");
++	for (int i = 0; i < 16; i++)
++		printf(" %02x", keys_info.auth_key[i]);
++	printf("\nServer Encryption Key: ");
++	for (int i = 0; i < SMB3_SIGN_KEY_SIZE; i++)
++		printf(" %02x", keys_info.smb3encryptionkey[i]);
++	printf("\nServer Decryption Key: ");
++	for (int i = 0; i < SMB3_SIGN_KEY_SIZE; i++)
++		printf(" %02x", keys_info.smb3decryptionkey[i]);
++	printf("\n");
++}
++
+ #define CIFS_ENUMERATE_SNAPSHOTS _IOR(CIFS_IOCTL_MAGIC, 6, struct smb_snapshot_array)
+ 
+ #define MIN_SNAPSHOT_ARRAY_SIZE 16 /* See MS-SMB2 section 3.3.5.15.1 */
+@@ -1189,6 +1238,8 @@ int main(int argc, char *argv[])
+ 		quota(f);
+ 	else if (!strcmp(argv[optind], "secdesc"))
+ 		secdesc(f);
++	else if (!strcmp(argv[optind], "keys"))
++		dump_keys(f);
+ 	else {
+ 		fprintf(stderr, "Unknown command %s\n", argv[optind]);
+ 		exit(1);
+-- 
+2.17.1
+
diff --git a/debian/patches/0005-smbinfo-Add-SETCOMPRESSION-support.patch b/debian/patches/0005-smbinfo-Add-SETCOMPRESSION-support.patch
new file mode 100644
index 0000000..7068b53
--- /dev/null
+++ b/debian/patches/0005-smbinfo-Add-SETCOMPRESSION-support.patch
@@ -0,0 +1,119 @@
+From 07c5812c062ac584511f244f91fcdfd5d08c8b68 Mon Sep 17 00:00:00 2001
+From: Ronnie Sahlberg <[e-mail]>
+Origin: Upstream, https://git.samba.org/?p=cifs-utils.git;a=commit;h=07c5812c062ac584511f244f91fcdfd5d08c8b68
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1886551
+Date: Fri, 4 Oct 2019 09:29:02 +1000
+Subject: [PATCH] smbinfo: Add SETCOMPRESSION support
+
+Signed-off-by: Ronnie Sahlberg <[e-mail]>
+---
+ smbinfo.c   | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
+ smbinfo.rst |  2 ++
+ 2 files changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/smbinfo.c b/smbinfo.c
+index 2aa5eee..636f1bd 100644
+--- a/smbinfo.c
++++ b/smbinfo.c
+@@ -101,6 +101,8 @@ usage(char *name)
+ 		"      Prints the objectid of the file and GUID of the underlying volume.\n"
+ 		"  getcompression:\n"
+ 		"      Prints the compression setting for the file.\n"
++		"  setcompression <no|default|lznt1>:\n"
++		"      Sets the compression level for the file.\n"
+ 		"  list-snapshots:\n"
+ 		"      List the previous versions of the volume that backs this file.\n"
+ 		"  quota:\n"
+@@ -310,6 +312,30 @@ getcompression(int f)
+ 	free(qi);
+ }
+ 
++static void
++setcompression(int f, uint16_t level)
++{
++	struct smb_query_info *qi;
++
++	qi = malloc(sizeof(struct smb_query_info) + 2);
++	memset(qi, 0, sizeof(qi) + 2);
++	qi->info_type = 0x9c040;
++	qi->file_info_class = 0;
++	qi->additional_information = 0;
++	qi->output_buffer_length = 2;
++	qi->flags = PASSTHRU_FSCTL;
++
++	level = htole16(level);
++	memcpy(&qi[1], &level, 2);
++
++	if (ioctl(f, CIFS_QUERY_INFO, qi) < 0) {
++		fprintf(stderr, "ioctl failed with %s\n", strerror(errno));
++		exit(1);
++	}
++
++	free(qi);
++}
++
+ static void
+ print_fileaccessinfo(uint8_t *sd, int type)
+ {
+@@ -1175,17 +1201,35 @@ list_snapshots(int f)
+ 	free(buf);
+ }
+ 
++static int
++parse_compression(const char *arg)
++{
++	if (!strcmp(arg, "no"))
++		return 0;
++	else if (!strcmp(arg, "default"))
++		return 1;
++	else if (!strcmp(arg, "lznt1"))
++		return 2;
++
++	fprintf(stderr, "compression must be no|default|lznt1\n");
++	exit(10);
++}
++
+ int main(int argc, char *argv[])
+ {
+ 	int c;
+ 	int f;
++	int compression = 1;
+ 
+ 	if (argc < 2) {
+ 		short_usage(argv[0]);
+ 	}
+ 
+-	while ((c = getopt_long(argc, argv, "vVh", NULL, NULL)) != -1) {
++	while ((c = getopt_long(argc, argv, "c:vVh", NULL, NULL)) != -1) {
+ 		switch (c) {
++		case 'c':
++			compression = parse_compression(optarg);
++			break;
+ 		case 'v':
+ 			printf("smbinfo version %s\n", VERSION);
+ 			return 0;
+@@ -1232,6 +1276,8 @@ int main(int argc, char *argv[])
+ 		fsctlgetobjid(f);
+ 	else if (!strcmp(argv[optind], "getcompression"))
+ 		getcompression(f);
++	else if (!strcmp(argv[optind], "setcompression"))
++		setcompression(f, compression);
+ 	else if (!strcmp(argv[optind], "list-snapshots"))
+ 		list_snapshots(f);
+ 	else if (!strcmp(argv[optind], "quota"))
+diff --git a/smbinfo.rst b/smbinfo.rst
+index 500ce0e..c8f76e6 100644
+--- a/smbinfo.rst
++++ b/smbinfo.rst
+@@ -69,6 +69,8 @@ COMMAND
+ 
+ `getcompression`: Prints the compression setting for the file.
+ 
++`setcompression -c <no|default|lznt1>`: Sets the compression setting for the file.
++
+ `list-snapshots`: Lists the previous versions of the volume that backs this file
+ 
+ `quota`: Print the quota for the volume in the form
+-- 
+2.17.1
+
diff --git a/debian/patches/0006-smbinfo.rst-document-new-keys-command.patch b/debian/patches/0006-smbinfo.rst-document-new-keys-command.patch
new file mode 100644
index 0000000..cfe48d5
--- /dev/null
+++ b/debian/patches/0006-smbinfo.rst-document-new-keys-command.patch
@@ -0,0 +1,30 @@
+From 74a1ced5f706ea6a9cab885693c7755657b81a2a Mon Sep 17 00:00:00 2001
+From: Aurelien Aptel <[e-mail]>
+Origin: Upstream, https://git.samba.org/?p=cifs-utils.git;a=commit;h=74a1ced5f706ea6a9cab885693c7755657b81a2a
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1886551
+Date: Mon, 14 Oct 2019 19:06:25 +0200
+Subject: [PATCH] smbinfo.rst: document new `keys` command
+
+Signed-off-by: Aurelien Aptel <[e-mail]>
+---
+ smbinfo.rst | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/smbinfo.rst b/smbinfo.rst
+index c8f76e6..7413849 100644
+--- a/smbinfo.rst
++++ b/smbinfo.rst
+@@ -90,6 +90,10 @@ COMMAND
+ - File types
+ - File flags
+ 
++`keys`: Dump session id, encryption keys and decryption keys so that
++the SMB3 traffic of this mount can be decryped e.g. via wireshark
++(requires root).
++
+ *****
+ NOTES
+ *****
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 994cf2f..2cbd9c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,6 @@
 0001-Fix-fPIE-casing.patch
+0002-smbinfo-Improve-help-usage-and-add-h-option.patch
+0003-smbinfo-add-GETCOMPRESSION-support.patch
+0004-smbinfo-print-the-security-information-needed-to-dec.patch
+0005-smbinfo-Add-SETCOMPRESSION-support.patch
+0006-smbinfo.rst-document-new-keys-command.patch