diff for duplicates of <20180110124418.24385-1-git@andred.net> diff --git a/a/1.txt b/N1/1.txt index fc56d51..cdd6491 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -113,7 +113,8 @@ index d92cbf9687c3..b570a930583a 100644 encrypted_datalen = roundup(decrypted_datalen, blksize); @@ -734,6 +743,8 @@ static void __ekey_init(struct encrypted_key_payload *epayload, if (!strcmp(format, key_format_ecryptfs)) - epayload->decrypted_data ecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data); + epayload->decrypted_data = + ecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data); + else if (!strcmp(format, key_format_fscrypt)) + fscrypt__ekey_init(epayload); diff --git a/a/content_digest b/N1/content_digest index 2564bf0..91ab335 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -130,7 +130,8 @@ " \tencrypted_datalen = roundup(decrypted_datalen, blksize);\n" "@@ -734,6 +743,8 @@ static void __ekey_init(struct encrypted_key_payload *epayload,\n" " \t\tif (!strcmp(format, key_format_ecryptfs))\n" - " \t\t\tepayload->decrypted_data \t\t\t\tecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data);\n" + " \t\t\tepayload->decrypted_data =\n" + " \t\t\t\tecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data);\n" "+\t\telse if (!strcmp(format, key_format_fscrypt))\n" "+\t\t\tfscrypt__ekey_init(epayload);\n" " \n" @@ -252,4 +253,4 @@ "-- \n" 2.15.1 -779f7c56e6d858a976377c22cafb6beaebfab084a2c9ea4bdc982f46f2bf85b3 +040429652c234c24552b530644f4d4364d9d80cc96765b96c7b64137f4ecbe72
diff --git a/a/1.txt b/N2/1.txt index fc56d51..85f66df 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,7 +13,7 @@ and 'ecryptfs'. More details about the usage of encrypted keys with the fscrypt subsystem can be found in the file 'Documentation/security/keys/fscrypt.rst'. -Signed-off-by: André Draszik <git@andred.net> +Signed-off-by: Andre Draszik <git@andred.net> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: David Howells <dhowells@redhat.com> Cc: James Morris <james.l.morris@oracle.com> @@ -113,7 +113,8 @@ index d92cbf9687c3..b570a930583a 100644 encrypted_datalen = roundup(decrypted_datalen, blksize); @@ -734,6 +743,8 @@ static void __ekey_init(struct encrypted_key_payload *epayload, if (!strcmp(format, key_format_ecryptfs)) - epayload->decrypted_data ecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data); + epayload->decrypted_data = + ecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data); + else if (!strcmp(format, key_format_fscrypt)) + fscrypt__ekey_init(epayload); @@ -144,7 +145,7 @@ index 000000000000..7620c0fa3ff9 + * TORSEC group -- http://security.polito.it + * + * Authors: -+ * André Draszik <git@andred.net> ++ * Andre Draszik <git@andred.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -220,7 +221,7 @@ index 000000000000..c6d7da1a2113 + * TORSEC group -- http://security.polito.it + * + * Authors: -+ * André Draszik <git@andred.net> ++ * Andre Draszik <git@andred.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by diff --git a/a/content_digest b/N2/content_digest index 2564bf0..247b4c2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -30,7 +30,7 @@ "More details about the usage of encrypted keys with the fscrypt\n" "subsystem can be found in the file 'Documentation/security/keys/fscrypt.rst'.\n" "\n" - "Signed-off-by: Andr\303\251 Draszik <git@andred.net>\n" + "Signed-off-by: Andre Draszik <git@andred.net>\n" "Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>\n" "Cc: David Howells <dhowells@redhat.com>\n" "Cc: James Morris <james.l.morris@oracle.com>\n" @@ -130,7 +130,8 @@ " \tencrypted_datalen = roundup(decrypted_datalen, blksize);\n" "@@ -734,6 +743,8 @@ static void __ekey_init(struct encrypted_key_payload *epayload,\n" " \t\tif (!strcmp(format, key_format_ecryptfs))\n" - " \t\t\tepayload->decrypted_data \t\t\t\tecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data);\n" + " \t\t\tepayload->decrypted_data =\n" + " \t\t\t\tecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data);\n" "+\t\telse if (!strcmp(format, key_format_fscrypt))\n" "+\t\t\tfscrypt__ekey_init(epayload);\n" " \n" @@ -161,7 +162,7 @@ "+ * TORSEC group -- http://security.polito.it\n" "+ *\n" "+ * Authors:\n" - "+ * Andr\303\251 Draszik <git@andred.net>\n" + "+ * Andre Draszik <git@andred.net>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify\n" "+ * it under the terms of the GNU General Public License as published by\n" @@ -237,7 +238,7 @@ "+ * TORSEC group -- http://security.polito.it\n" "+ *\n" "+ * Authors:\n" - "+ * Andr\303\251 Draszik <git@andred.net>\n" + "+ * Andre Draszik <git@andred.net>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify\n" "+ * it under the terms of the GNU General Public License as published by\n" @@ -252,4 +253,4 @@ "-- \n" 2.15.1 -779f7c56e6d858a976377c22cafb6beaebfab084a2c9ea4bdc982f46f2bf85b3 +592510b4049b085a18f21a9fe09eef16ae4516f17897e92e4d1fe6a30862e47f
diff --git a/a/1.txt b/N3/1.txt index fc56d51..2090734 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -13,7 +13,7 @@ and 'ecryptfs'. More details about the usage of encrypted keys with the fscrypt subsystem can be found in the file 'Documentation/security/keys/fscrypt.rst'. -Signed-off-by: André Draszik <git@andred.net> +Signed-off-by: Andr? Draszik <git@andred.net> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: David Howells <dhowells@redhat.com> Cc: James Morris <james.l.morris@oracle.com> @@ -21,10 +21,10 @@ Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: "Theodore Y. Ts'o" <tytso@mit.edu> Cc: Jaegeuk Kim <jaegeuk@kernel.org> Cc: Kees Cook <keescook@chromium.org> -Cc: linux-integrity@vger.kernel.org -Cc: keyrings@vger.kernel.org -Cc: linux-security-module@vger.kernel.org -Cc: linux-fscrypt@vger.kernel.org +Cc: linux-integrity at vger.kernel.org +Cc: keyrings at vger.kernel.org +Cc: linux-security-module at vger.kernel.org +Cc: linux-fscrypt at vger.kernel.org --- security/keys/encrypted-keys/Makefile | 2 +- security/keys/encrypted-keys/encrypted.c | 19 +++++++- @@ -113,7 +113,8 @@ index d92cbf9687c3..b570a930583a 100644 encrypted_datalen = roundup(decrypted_datalen, blksize); @@ -734,6 +743,8 @@ static void __ekey_init(struct encrypted_key_payload *epayload, if (!strcmp(format, key_format_ecryptfs)) - epayload->decrypted_data ecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data); + epayload->decrypted_data = + ecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data); + else if (!strcmp(format, key_format_fscrypt)) + fscrypt__ekey_init(epayload); @@ -144,7 +145,7 @@ index 000000000000..7620c0fa3ff9 + * TORSEC group -- http://security.polito.it + * + * Authors: -+ * André Draszik <git@andred.net> ++ * Andr? Draszik <git@andred.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -220,7 +221,7 @@ index 000000000000..c6d7da1a2113 + * TORSEC group -- http://security.polito.it + * + * Authors: -+ * André Draszik <git@andred.net> ++ * Andr? Draszik <git@andred.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -234,3 +235,8 @@ index 000000000000..c6d7da1a2113 +int fscrypt_valid_desc(const char *desc); -- 2.15.1 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N3/content_digest index 2564bf0..9452df8 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,18 +1,7 @@ - "From\0Andr\303\251 Draszik <git@andred.net>\0" + "From\0git@andred.net (Andr\303\251 Draszik)\0" "Subject\0[PATCH 1/3] encrypted-keys: add fscrypt format support\0" "Date\0Wed, 10 Jan 2018 12:44:16 +0000\0" - "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Mimi Zohar <zohar@linux.vnet.ibm.com>" - David Howells <dhowells@redhat.com> - James Morris <james.l.morris@oracle.com> - Serge E. Hallyn <serge@hallyn.com> - Theodore Y. Ts'o <tytso@mit.edu> - Jaegeuk Kim <jaegeuk@kernel.org> - Kees Cook <keescook@chromium.org> - linux-integrity@vger.kernel.org - keyrings@vger.kernel.org - linux-security-module@vger.kernel.org - " linux-fscrypt@vger.kernel.org\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "This is heavily based on commit 79a73d188726\n" @@ -30,7 +19,7 @@ "More details about the usage of encrypted keys with the fscrypt\n" "subsystem can be found in the file 'Documentation/security/keys/fscrypt.rst'.\n" "\n" - "Signed-off-by: Andr\303\251 Draszik <git@andred.net>\n" + "Signed-off-by: Andr? Draszik <git@andred.net>\n" "Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>\n" "Cc: David Howells <dhowells@redhat.com>\n" "Cc: James Morris <james.l.morris@oracle.com>\n" @@ -38,10 +27,10 @@ "Cc: \"Theodore Y. Ts'o\" <tytso@mit.edu>\n" "Cc: Jaegeuk Kim <jaegeuk@kernel.org>\n" "Cc: Kees Cook <keescook@chromium.org>\n" - "Cc: linux-integrity@vger.kernel.org\n" - "Cc: keyrings@vger.kernel.org\n" - "Cc: linux-security-module@vger.kernel.org\n" - "Cc: linux-fscrypt@vger.kernel.org\n" + "Cc: linux-integrity at vger.kernel.org\n" + "Cc: keyrings at vger.kernel.org\n" + "Cc: linux-security-module at vger.kernel.org\n" + "Cc: linux-fscrypt at vger.kernel.org\n" "---\n" " security/keys/encrypted-keys/Makefile | 2 +-\n" " security/keys/encrypted-keys/encrypted.c | 19 +++++++-\n" @@ -130,7 +119,8 @@ " \tencrypted_datalen = roundup(decrypted_datalen, blksize);\n" "@@ -734,6 +743,8 @@ static void __ekey_init(struct encrypted_key_payload *epayload,\n" " \t\tif (!strcmp(format, key_format_ecryptfs))\n" - " \t\t\tepayload->decrypted_data \t\t\t\tecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data);\n" + " \t\t\tepayload->decrypted_data =\n" + " \t\t\t\tecryptfs_get_auth_tok_key((struct ecryptfs_auth_tok *)epayload->payload_data);\n" "+\t\telse if (!strcmp(format, key_format_fscrypt))\n" "+\t\t\tfscrypt__ekey_init(epayload);\n" " \n" @@ -161,7 +151,7 @@ "+ * TORSEC group -- http://security.polito.it\n" "+ *\n" "+ * Authors:\n" - "+ * Andr\303\251 Draszik <git@andred.net>\n" + "+ * Andr? Draszik <git@andred.net>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify\n" "+ * it under the terms of the GNU General Public License as published by\n" @@ -237,7 +227,7 @@ "+ * TORSEC group -- http://security.polito.it\n" "+ *\n" "+ * Authors:\n" - "+ * Andr\303\251 Draszik <git@andred.net>\n" + "+ * Andr? Draszik <git@andred.net>\n" "+ *\n" "+ * This program is free software; you can redistribute it and/or modify\n" "+ * it under the terms of the GNU General Public License as published by\n" @@ -250,6 +240,11 @@ "+void fscrypt__ekey_init(struct encrypted_key_payload *epayload);\n" "+int fscrypt_valid_desc(const char *desc);\n" "-- \n" - 2.15.1 + "2.15.1\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -779f7c56e6d858a976377c22cafb6beaebfab084a2c9ea4bdc982f46f2bf85b3 +620cb5db2411a6f7f67461243ec48baa602eafcb2740f540c5d24377e9fe4272
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.