diff for duplicates of <20180110124418.24385-2-git@andred.net> diff --git a/a/1.txt b/N1/1.txt index 895b00d..6d1dfef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ We now try to acquire the key according to the encryption policy from both key types, 'logon' as well as 'encrypted'. -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> @@ -65,7 +65,7 @@ index 5e6e846f5a24..023fa19fec48 100644 down_read(&keyring_key->sem); - if (keyring_key->type != &key_type_logon) { -+ if (keyring_key->type = &key_type_logon) { ++ if (keyring_key->type == &key_type_logon) { + const struct user_key_payload *ukp; + + ukp = user_key_payload_locked(keyring_key); @@ -79,7 +79,7 @@ index 5e6e846f5a24..023fa19fec48 100644 + goto out; + } + master_key = (struct fscrypt_key *)ukp->data; -+ } else if (keyring_key->type = &key_type_encrypted) { ++ } else if (keyring_key->type == &key_type_encrypted) { + const struct encrypted_key_payload *ekp; + + ekp = keyring_key->payload.data[0]; @@ -122,12 +122,7 @@ index 5e6e846f5a24..023fa19fec48 100644 + inode->i_sb->s_cop->key_prefix, + keysize); if (res2) { - if (res2 = -ENOKEY) + if (res2 == -ENOKEY) res = -ENOKEY; -- 2.15.1 - --- -To unsubscribe from this list: send the line "unsubscribe keyrings" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 1d4d5ae..5d30f10 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -20,7 +20,7 @@ "encryption policy from both key types, 'logon'\n" "as well as 'encrypted'.\n" "\n" - "Signed-off-by: Andr\304\202\302\251 Draszik <git@andred.net>\n" + "Signed-off-by: Andr\303\251 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" @@ -83,7 +83,7 @@ " \tdown_read(&keyring_key->sem);\n" " \n" "-\tif (keyring_key->type != &key_type_logon) {\n" - "+\tif (keyring_key->type = &key_type_logon) {\n" + "+\tif (keyring_key->type == &key_type_logon) {\n" "+\t\tconst struct user_key_payload *ukp;\n" "+\n" "+\t\tukp = user_key_payload_locked(keyring_key);\n" @@ -97,7 +97,7 @@ "+\t\t\tgoto out;\n" "+\t\t}\n" "+\t\tmaster_key = (struct fscrypt_key *)ukp->data;\n" - "+\t} else if (keyring_key->type = &key_type_encrypted) {\n" + "+\t} else if (keyring_key->type == &key_type_encrypted) {\n" "+\t\tconst struct encrypted_key_payload *ekp;\n" "+\n" "+\t\tekp = keyring_key->payload.data[0];\n" @@ -140,14 +140,9 @@ "+\t\t\t\t\t\tinode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tkeysize);\n" " \t\tif (res2) {\n" - " \t\t\tif (res2 = -ENOKEY)\n" + " \t\t\tif (res2 == -ENOKEY)\n" " \t\t\t\tres = -ENOKEY;\n" "-- \n" - "2.15.1\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + 2.15.1 -8924e15158ab4d3e24f2b5c53a717e82990d041d59d14ad9e30be9881df1f587 +00029a4bd5bc6ab77e3ace99d26a7ab2f44844efbe56951e865a3830a202aae5
diff --git a/a/1.txt b/N2/1.txt index 895b00d..b69cae3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ We now try to acquire the key according to the encryption policy from both key types, 'logon' as well as 'encrypted'. -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> @@ -65,7 +65,7 @@ index 5e6e846f5a24..023fa19fec48 100644 down_read(&keyring_key->sem); - if (keyring_key->type != &key_type_logon) { -+ if (keyring_key->type = &key_type_logon) { ++ if (keyring_key->type == &key_type_logon) { + const struct user_key_payload *ukp; + + ukp = user_key_payload_locked(keyring_key); @@ -79,7 +79,7 @@ index 5e6e846f5a24..023fa19fec48 100644 + goto out; + } + master_key = (struct fscrypt_key *)ukp->data; -+ } else if (keyring_key->type = &key_type_encrypted) { ++ } else if (keyring_key->type == &key_type_encrypted) { + const struct encrypted_key_payload *ekp; + + ekp = keyring_key->payload.data[0]; @@ -122,12 +122,7 @@ index 5e6e846f5a24..023fa19fec48 100644 + inode->i_sb->s_cop->key_prefix, + keysize); if (res2) { - if (res2 = -ENOKEY) + if (res2 == -ENOKEY) res = -ENOKEY; -- 2.15.1 - --- -To unsubscribe from this list: send the line "unsubscribe keyrings" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 1d4d5ae..16f1734 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -20,7 +20,7 @@ "encryption policy from both key types, 'logon'\n" "as well as 'encrypted'.\n" "\n" - "Signed-off-by: Andr\304\202\302\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" @@ -83,7 +83,7 @@ " \tdown_read(&keyring_key->sem);\n" " \n" "-\tif (keyring_key->type != &key_type_logon) {\n" - "+\tif (keyring_key->type = &key_type_logon) {\n" + "+\tif (keyring_key->type == &key_type_logon) {\n" "+\t\tconst struct user_key_payload *ukp;\n" "+\n" "+\t\tukp = user_key_payload_locked(keyring_key);\n" @@ -97,7 +97,7 @@ "+\t\t\tgoto out;\n" "+\t\t}\n" "+\t\tmaster_key = (struct fscrypt_key *)ukp->data;\n" - "+\t} else if (keyring_key->type = &key_type_encrypted) {\n" + "+\t} else if (keyring_key->type == &key_type_encrypted) {\n" "+\t\tconst struct encrypted_key_payload *ekp;\n" "+\n" "+\t\tekp = keyring_key->payload.data[0];\n" @@ -140,14 +140,9 @@ "+\t\t\t\t\t\tinode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tkeysize);\n" " \t\tif (res2) {\n" - " \t\t\tif (res2 = -ENOKEY)\n" + " \t\t\tif (res2 == -ENOKEY)\n" " \t\t\t\tres = -ENOKEY;\n" "-- \n" - "2.15.1\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + 2.15.1 -8924e15158ab4d3e24f2b5c53a717e82990d041d59d14ad9e30be9881df1f587 +25368c783cd7bdab4b5ab8fd66182b4c4ba64869100401c32e394846fbe77214
diff --git a/a/1.txt b/N3/1.txt index 895b00d..c87847e 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -2,7 +2,7 @@ We now try to acquire the key according to the encryption policy from both key types, 'logon' as well as 'encrypted'. -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> @@ -10,10 +10,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 --- fs/crypto/keyinfo.c | 58 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 20 deletions(-) @@ -65,7 +65,7 @@ index 5e6e846f5a24..023fa19fec48 100644 down_read(&keyring_key->sem); - if (keyring_key->type != &key_type_logon) { -+ if (keyring_key->type = &key_type_logon) { ++ if (keyring_key->type == &key_type_logon) { + const struct user_key_payload *ukp; + + ukp = user_key_payload_locked(keyring_key); @@ -79,7 +79,7 @@ index 5e6e846f5a24..023fa19fec48 100644 + goto out; + } + master_key = (struct fscrypt_key *)ukp->data; -+ } else if (keyring_key->type = &key_type_encrypted) { ++ } else if (keyring_key->type == &key_type_encrypted) { + const struct encrypted_key_payload *ekp; + + ekp = keyring_key->payload.data[0]; @@ -122,12 +122,12 @@ index 5e6e846f5a24..023fa19fec48 100644 + inode->i_sb->s_cop->key_prefix, + keysize); if (res2) { - if (res2 = -ENOKEY) + if (res2 == -ENOKEY) res = -ENOKEY; -- 2.15.1 -- -To unsubscribe from this list: send the line "unsubscribe keyrings" in -the body of a message to majordomo@vger.kernel.org +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 1d4d5ae..d957dca 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,26 +1,15 @@ "ref\020180110124418.24385-1-git@andred.net\0" - "From\0Andr\303\251 Draszik <git@andred.net>\0" + "From\0git@andred.net (Andr\303\251 Draszik)\0" "Subject\0[PATCH 2/3] fscrypt: add support for the encrypted key type\0" "Date\0Wed, 10 Jan 2018 12:44:17 +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" "We now try to acquire the key according to the\n" "encryption policy from both key types, 'logon'\n" "as well as 'encrypted'.\n" "\n" - "Signed-off-by: Andr\304\202\302\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" @@ -28,10 +17,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" " fs/crypto/keyinfo.c | 58 +++++++++++++++++++++++++++++++++++------------------\n" " 1 file changed, 38 insertions(+), 20 deletions(-)\n" @@ -83,7 +72,7 @@ " \tdown_read(&keyring_key->sem);\n" " \n" "-\tif (keyring_key->type != &key_type_logon) {\n" - "+\tif (keyring_key->type = &key_type_logon) {\n" + "+\tif (keyring_key->type == &key_type_logon) {\n" "+\t\tconst struct user_key_payload *ukp;\n" "+\n" "+\t\tukp = user_key_payload_locked(keyring_key);\n" @@ -97,7 +86,7 @@ "+\t\t\tgoto out;\n" "+\t\t}\n" "+\t\tmaster_key = (struct fscrypt_key *)ukp->data;\n" - "+\t} else if (keyring_key->type = &key_type_encrypted) {\n" + "+\t} else if (keyring_key->type == &key_type_encrypted) {\n" "+\t\tconst struct encrypted_key_payload *ekp;\n" "+\n" "+\t\tekp = keyring_key->payload.data[0];\n" @@ -140,14 +129,14 @@ "+\t\t\t\t\t\tinode->i_sb->s_cop->key_prefix,\n" "+\t\t\t\t\t\tkeysize);\n" " \t\tif (res2) {\n" - " \t\t\tif (res2 = -ENOKEY)\n" + " \t\t\tif (res2 == -ENOKEY)\n" " \t\t\t\tres = -ENOKEY;\n" "-- \n" "2.15.1\n" "\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "the body of a message to majordomo@vger.kernel.org\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 -8924e15158ab4d3e24f2b5c53a717e82990d041d59d14ad9e30be9881df1f587 +3ded970664a27645487a2f3f26c64b55c14a1b931acdb3a093c2a544755fb89a
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.