diff for duplicates of <20190729204627.GH169027@gmail.com> diff --git a/a/1.txt b/N1/1.txt index e82fede..2a528b8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote: > > > > + if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { > -> This should be "= FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER" instead. That's +> This should be "== FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER" instead. That's > because you use the identifier part of the union: > > > + /* Calculate the key identifier and return it to userspace. */ @@ -19,7 +19,7 @@ On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote: Well, I did it this way because the next patch changes the code to: - if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { + if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { ... } else { ... @@ -42,7 +42,7 @@ But I guess to be more clear I'll just make it handle the default case again. } > -> > + if (policy->version = FSCRYPT_POLICY_V1) { +> > + if (policy->version == FSCRYPT_POLICY_V1) { > > + /* > > + * The original encryption policy version provided no way of > > + * verifying that the correct master key was supplied, which was @@ -71,3 +71,7 @@ Bob's key is never looked up because the inode already has a key cached. This also applies to regular files and symlinks. - Eric + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N1/content_digest index 91b4efe..67d52c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020190728211730.GK6088@mit.edu\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH v7 10/16] fscrypt: v2 encryption policy support\0" - "Date\0Mon, 29 Jul 2019 20:46:28 +0000\0" + "Date\0Mon, 29 Jul 2019 13:46:28 -0700\0" "To\0Theodore Y. Ts'o <tytso@mit.edu>\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -25,7 +25,7 @@ "> > \n" "> > +\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" "> \n" - "> This should be \"= FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER\" instead. That's\n" + "> This should be \"== FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER\" instead. That's\n" "> because you use the identifier part of the union:\n" "> \n" "> > +\t\t/* Calculate the key identifier and return it to userspace. */\n" @@ -38,7 +38,7 @@ "\n" "Well, I did it this way because the next patch changes the code to:\n" "\n" - "\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" + "\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" "\t\t...\n" "\t} else {\n" "\t\t...\n" @@ -61,7 +61,7 @@ "\t}\n" "\n" "> \n" - "> > +\tif (policy->version = FSCRYPT_POLICY_V1) {\n" + "> > +\tif (policy->version == FSCRYPT_POLICY_V1) {\n" "> > +\t\t/*\n" "> > +\t\t * The original encryption policy version provided no way of\n" "> > +\t\t * verifying that the correct master key was supplied, which was\n" @@ -89,6 +89,10 @@ "\n" "This also applies to regular files and symlinks.\n" "\n" - - Eric + "- Eric\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -25ba397bfb6dd097505c6092e72053afb37539eb8ed9b00c70e76bc77fe44e48 +e32548516126384f80f52437fcfa54ec65ccd441cd940c4f16bd7579a0d7251c
diff --git a/a/1.txt b/N2/1.txt index e82fede..6140cb9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,7 +6,7 @@ On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote: > > > > + if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { > -> This should be "= FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER" instead. That's +> This should be "== FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER" instead. That's > because you use the identifier part of the union: > > > + /* Calculate the key identifier and return it to userspace. */ @@ -19,7 +19,7 @@ On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote: Well, I did it this way because the next patch changes the code to: - if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { + if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { ... } else { ... @@ -42,7 +42,7 @@ But I guess to be more clear I'll just make it handle the default case again. } > -> > + if (policy->version = FSCRYPT_POLICY_V1) { +> > + if (policy->version == FSCRYPT_POLICY_V1) { > > + /* > > + * The original encryption policy version provided no way of > > + * verifying that the correct master key was supplied, which was diff --git a/a/content_digest b/N2/content_digest index 91b4efe..c01f2a6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,18 +3,18 @@ "ref\020190728211730.GK6088@mit.edu\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH v7 10/16] fscrypt: v2 encryption policy support\0" - "Date\0Mon, 29 Jul 2019 20:46:28 +0000\0" + "Date\0Mon, 29 Jul 2019 13:46:28 -0700\0" "To\0Theodore Y. Ts'o <tytso@mit.edu>\0" - "Cc\0Satya Tangirala <satyat@google.com>" - linux-api@vger.kernel.org + "Cc\0linux-fscrypt@vger.kernel.org" + linux-fsdevel@vger.kernel.org + linux-ext4@vger.kernel.org linux-f2fs-devel@lists.sourceforge.net - linux-fscrypt@vger.kernel.org - keyrings@vger.kernel.org linux-mtd@lists.infradead.org + linux-api@vger.kernel.org linux-crypto@vger.kernel.org - linux-fsdevel@vger.kernel.org - linux-ext4@vger.kernel.org - " Paul Crowley <paulcrowley@google.com>\0" + keyrings@vger.kernel.org + Paul Crowley <paulcrowley@google.com> + " Satya Tangirala <satyat@google.com>\0" "\00:1\0" "b\0" "On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote:\n" @@ -25,7 +25,7 @@ "> > \n" "> > +\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" "> \n" - "> This should be \"= FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER\" instead. That's\n" + "> This should be \"== FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER\" instead. That's\n" "> because you use the identifier part of the union:\n" "> \n" "> > +\t\t/* Calculate the key identifier and return it to userspace. */\n" @@ -38,7 +38,7 @@ "\n" "Well, I did it this way because the next patch changes the code to:\n" "\n" - "\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" + "\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" "\t\t...\n" "\t} else {\n" "\t\t...\n" @@ -61,7 +61,7 @@ "\t}\n" "\n" "> \n" - "> > +\tif (policy->version = FSCRYPT_POLICY_V1) {\n" + "> > +\tif (policy->version == FSCRYPT_POLICY_V1) {\n" "> > +\t\t/*\n" "> > +\t\t * The original encryption policy version provided no way of\n" "> > +\t\t * verifying that the correct master key was supplied, which was\n" @@ -91,4 +91,4 @@ "\n" - Eric -25ba397bfb6dd097505c6092e72053afb37539eb8ed9b00c70e76bc77fe44e48 +f0697dfa7db076fb63875ccafca5cee2351f0c9223348caf08d1f23d34ae94bd
diff --git a/a/1.txt b/N3/1.txt index e82fede..f1123dd 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -6,7 +6,7 @@ On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote: > > > > + if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { > -> This should be "= FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER" instead. That's +> This should be "== FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER" instead. That's > because you use the identifier part of the union: > > > + /* Calculate the key identifier and return it to userspace. */ @@ -19,7 +19,7 @@ On Sun, Jul 28, 2019 at 05:17:30PM -0400, Theodore Y. Ts'o wrote: Well, I did it this way because the next patch changes the code to: - if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { + if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) { ... } else { ... @@ -42,7 +42,7 @@ But I guess to be more clear I'll just make it handle the default case again. } > -> > + if (policy->version = FSCRYPT_POLICY_V1) { +> > + if (policy->version == FSCRYPT_POLICY_V1) { > > + /* > > + * The original encryption policy version provided no way of > > + * verifying that the correct master key was supplied, which was @@ -71,3 +71,9 @@ Bob's key is never looked up because the inode already has a key cached. This also applies to regular files and symlinks. - Eric + + +_______________________________________________ +Linux-f2fs-devel mailing list +Linux-f2fs-devel@lists.sourceforge.net +https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel diff --git a/a/content_digest b/N3/content_digest index 91b4efe..34d0bf0 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,8 +2,8 @@ "ref\020190726224141.14044-11-ebiggers@kernel.org\0" "ref\020190728211730.GK6088@mit.edu\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" - "Subject\0Re: [PATCH v7 10/16] fscrypt: v2 encryption policy support\0" - "Date\0Mon, 29 Jul 2019 20:46:28 +0000\0" + "Subject\0Re: [f2fs-dev] [PATCH v7 10/16] fscrypt: v2 encryption policy support\0" + "Date\0Mon, 29 Jul 2019 13:46:28 -0700\0" "To\0Theodore Y. Ts'o <tytso@mit.edu>\0" "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org @@ -25,7 +25,7 @@ "> > \n" "> > +\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" "> \n" - "> This should be \"= FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER\" instead. That's\n" + "> This should be \"== FSCRYPT_KEY_SPEC_TYPE_INDENTIFIER\" instead. That's\n" "> because you use the identifier part of the union:\n" "> \n" "> > +\t\t/* Calculate the key identifier and return it to userspace. */\n" @@ -38,7 +38,7 @@ "\n" "Well, I did it this way because the next patch changes the code to:\n" "\n" - "\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" + "\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n" "\t\t...\n" "\t} else {\n" "\t\t...\n" @@ -61,7 +61,7 @@ "\t}\n" "\n" "> \n" - "> > +\tif (policy->version = FSCRYPT_POLICY_V1) {\n" + "> > +\tif (policy->version == FSCRYPT_POLICY_V1) {\n" "> > +\t\t/*\n" "> > +\t\t * The original encryption policy version provided no way of\n" "> > +\t\t * verifying that the correct master key was supplied, which was\n" @@ -89,6 +89,12 @@ "\n" "This also applies to regular files and symlinks.\n" "\n" - - Eric + "- Eric\n" + "\n" + "\n" + "_______________________________________________\n" + "Linux-f2fs-devel mailing list\n" + "Linux-f2fs-devel@lists.sourceforge.net\n" + https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel -25ba397bfb6dd097505c6092e72053afb37539eb8ed9b00c70e76bc77fe44e48 +d5085f1ff64efe10010a38397dc804d5f1a90045fa689ebf74162b4bcb8bd014
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.