diff for duplicates of <1546960680.19931.114.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d892221..065bd4d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,9 +64,9 @@ On Tue, 2019-01-08 at 16:12 +0800, Kairui Song wrote: > /* Allow the builtin keyring to be added to the secondary */ > return 0; > -> + if (type = &key_type_keyring && -> + dest_keyring = secondary_trusted_keys && -> + payload = &platform_keys->payload) +> + if (type == &key_type_keyring && +> + dest_keyring == secondary_trusted_keys && +> + payload == &platform_keys->payload) > + /* Allow the platform keyring to be added to the secondary */ > + return 0; > + diff --git a/a/content_digest b/N1/content_digest index 105bf46..2f543af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020190108081247.2266-2-kasong@redhat.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [RFC PATCH 1/1] KEYS, integrity: Link .platform keyring to .secondary_trusted_keys\0" - "Date\0Tue, 08 Jan 2019 15:18:00 +0000\0" + "Date\0Tue, 08 Jan 2019 10:18:00 -0500\0" "To\0Kairui Song <kasong@redhat.com>" " linux-kernel@vger.kernel.org\0" "Cc\0dhowells@redhat.com" @@ -85,9 +85,9 @@ "> \t\t/* Allow the builtin keyring to be added to the secondary */\n" "> \t\treturn 0;\n" "> \n" - "> +\tif (type = &key_type_keyring &&\n" - "> +\t dest_keyring = secondary_trusted_keys &&\n" - "> +\t payload = &platform_keys->payload)\n" + "> +\tif (type == &key_type_keyring &&\n" + "> +\t dest_keyring == secondary_trusted_keys &&\n" + "> +\t payload == &platform_keys->payload)\n" "> +\t\t/* Allow the platform keyring to be added to the secondary */\n" "> +\t\treturn 0;\n" "> +\n" @@ -157,4 +157,4 @@ "> +}\n" > +#endif -2b70cfceeb3cd68134b5d9f978240410b39117e9fe7f2f32bb578167443406a2 +3b4e624861064c9d688c0d9af45955c003b7eee7171e81ff5423cf5853013eb1
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.