diff for duplicates of <20180907211015.234722958@linuxfoundation.org> diff --git a/a/1.txt b/N1/1.txt index f9bb1b3..03235f3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,8 +11,8 @@ should use the secondary keyring with a symbol. Signed-off-by: Yannik Sembritzki <yannik@sembritzki.me> Signed-off-by: David Howells <dhowells@redhat.com> -Cc: keyrings@vger.kernel.org -Cc: linux-security-module@vger.kernel.org +Cc: keyrings at vger.kernel.org +Cc: linux-security-module at vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -36,8 +36,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (!trusted_keys) { trusted_keys = builtin_trusted_keys; -- } else if (trusted_keys = (void *)1UL) { -+ } else if (trusted_keys = VERIFY_USE_SECONDARY_KEYRING) { +- } else if (trusted_keys == (void *)1UL) { ++ } else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) { #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING trusted_keys = secondary_trusted_keys; #else diff --git a/a/content_digest b/N1/content_digest index 5fac4bf..06a0b57 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020180907211012.965501324@linuxfoundation.org\0" - "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" + "From\0gregkh@linuxfoundation.org (Greg Kroah-Hartman)\0" "Subject\0[PATCH 4.9 41/63] Replace magic for trusting the secondary keyring with #define\0" - "Date\0Fri, 07 Sep 2018 21:10:12 +0000\0" + "Date\0Fri, 7 Sep 2018 23:10:12 +0200\0" "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" @@ -18,8 +18,8 @@ "\n" "Signed-off-by: Yannik Sembritzki <yannik@sembritzki.me>\n" "Signed-off-by: David Howells <dhowells@redhat.com>\n" - "Cc: keyrings@vger.kernel.org\n" - "Cc: linux-security-module@vger.kernel.org\n" + "Cc: keyrings at vger.kernel.org\n" + "Cc: linux-security-module at vger.kernel.org\n" "Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>\n" "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "\n" @@ -43,8 +43,8 @@ " \n" " \tif (!trusted_keys) {\n" " \t\ttrusted_keys = builtin_trusted_keys;\n" - "-\t} else if (trusted_keys = (void *)1UL) {\n" - "+\t} else if (trusted_keys = VERIFY_USE_SECONDARY_KEYRING) {\n" + "-\t} else if (trusted_keys == (void *)1UL) {\n" + "+\t} else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) {\n" " #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING\n" " \t\ttrusted_keys = secondary_trusted_keys;\n" " #else\n" @@ -75,4 +75,4 @@ " */\n" enum key_being_used_for { -c6de2ebc6c5900b73cb21914238d18f86e12124de84ad059dda084b6d05de4e5 +6a9cecc57a631f8c0cf2810c8ee059705be4fb74dccae120bb4ffe406277e8f0
diff --git a/a/1.txt b/N2/1.txt index f9bb1b3..19c5060 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -36,8 +36,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (!trusted_keys) { trusted_keys = builtin_trusted_keys; -- } else if (trusted_keys = (void *)1UL) { -+ } else if (trusted_keys = VERIFY_USE_SECONDARY_KEYRING) { +- } else if (trusted_keys == (void *)1UL) { ++ } else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) { #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING trusted_keys = secondary_trusted_keys; #else diff --git a/a/content_digest b/N2/content_digest index 5fac4bf..5576b4c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,15 @@ "ref\020180907211012.965501324@linuxfoundation.org\0" "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0" "Subject\0[PATCH 4.9 41/63] Replace magic for trusting the secondary keyring with #define\0" - "Date\0Fri, 07 Sep 2018 21:10:12 +0000\0" - "To\0linux-security-module@vger.kernel.org\0" + "Date\0Fri, 7 Sep 2018 23:10:12 +0200\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" + stable@vger.kernel.org + Yannik Sembritzki <yannik@sembritzki.me> + David Howells <dhowells@redhat.com> + keyrings@vger.kernel.org + linux-security-module@vger.kernel.org + " Linus Torvalds <torvalds@linux-foundation.org>\0" "\00:1\0" "b\0" "4.9-stable review patch. If anyone has any objections, please let me know.\n" @@ -43,8 +50,8 @@ " \n" " \tif (!trusted_keys) {\n" " \t\ttrusted_keys = builtin_trusted_keys;\n" - "-\t} else if (trusted_keys = (void *)1UL) {\n" - "+\t} else if (trusted_keys = VERIFY_USE_SECONDARY_KEYRING) {\n" + "-\t} else if (trusted_keys == (void *)1UL) {\n" + "+\t} else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) {\n" " #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING\n" " \t\ttrusted_keys = secondary_trusted_keys;\n" " #else\n" @@ -75,4 +82,4 @@ " */\n" enum key_being_used_for { -c6de2ebc6c5900b73cb21914238d18f86e12124de84ad059dda084b6d05de4e5 +f2a54a458470ef99be28776e1bde1b32322db24e21788490ea9fa582f35cd619
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.