diff for duplicates of <1547567218.4156.289.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index f253a96..e8e24a3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ Consider using IS_ENABLED() or IS_BUILTIN(). Mimi -> + if (ret == -ENOKEY) { +> + if (ret = -ENOKEY) { > + ret = verify_pefile_signature(kernel, kernel_len, > + VERIFY_USE_PLATFORM_KEYRING, > + VERIFYING_KEXEC_PE_SIGNATURE); @@ -30,9 +30,3 @@ Mimi > + return ret; > } > #endif - - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec diff --git a/a/content_digest b/N1/content_digest index f6fcd17..54d99e7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,21 +2,21 @@ "ref\020190115094542.17129-3-kasong@redhat.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [RFC PATCH v2 2/2] kexec, KEYS: Make use of platform keyring for signature verify\0" - "Date\0Tue, 15 Jan 2019 10:46:58 -0500\0" + "Date\0Tue, 15 Jan 2019 15:46:58 +0000\0" "To\0Kairui Song <kasong@redhat.com>" " linux-kernel@vger.kernel.org\0" - "Cc\0jwboyer@fedoraproject.org" + "Cc\0dhowells@redhat.com" + dwmw2@infradead.org + jwboyer@fedoraproject.org + keyrings@vger.kernel.org + jmorris@namei.org + serge@hallyn.com + bauerman@linux.ibm.com ebiggers@google.com - dyoung@redhat.com nayna@linux.ibm.com - kexec@lists.infradead.org - jmorris@namei.org - dhowells@redhat.com - keyrings@vger.kernel.org + dyoung@redhat.com linux-integrity@vger.kernel.org - dwmw2@infradead.org - bauerman@linux.ibm.com - " serge@hallyn.com\0" + " kexec@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2019-01-15 at 17:45 +0800, Kairui Song wrote:\n" @@ -42,7 +42,7 @@ "\n" "Mimi\n" "\n" - "> +\tif (ret == -ENOKEY) {\n" + "> +\tif (ret = -ENOKEY) {\n" "> +\t\tret = verify_pefile_signature(kernel, kernel_len,\n" "> +\t\t\t\tVERIFY_USE_PLATFORM_KEYRING,\n" "> +\t\t\t\tVERIFYING_KEXEC_PE_SIGNATURE);\n" @@ -50,12 +50,6 @@ "> +#endif\n" "> +\treturn ret;\n" "> }\n" - "> #endif\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + > #endif -5aeeaeebb2f69be374857fd832407b6f38def7f62b50bb0eaf8e659425252ba1 +826f2b9557d76ef7fd0f410d051ad2a0e09c5cec7531a717e9da9831d35e499c
diff --git a/a/1.txt b/N2/1.txt index f253a96..368ebe3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -30,9 +30,3 @@ Mimi > + return ret; > } > #endif - - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec diff --git a/a/content_digest b/N2/content_digest index f6fcd17..0bbaa91 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,18 +5,18 @@ "Date\0Tue, 15 Jan 2019 10:46:58 -0500\0" "To\0Kairui Song <kasong@redhat.com>" " linux-kernel@vger.kernel.org\0" - "Cc\0jwboyer@fedoraproject.org" + "Cc\0dhowells@redhat.com" + dwmw2@infradead.org + jwboyer@fedoraproject.org + keyrings@vger.kernel.org + jmorris@namei.org + serge@hallyn.com + bauerman@linux.ibm.com ebiggers@google.com - dyoung@redhat.com nayna@linux.ibm.com - kexec@lists.infradead.org - jmorris@namei.org - dhowells@redhat.com - keyrings@vger.kernel.org + dyoung@redhat.com linux-integrity@vger.kernel.org - dwmw2@infradead.org - bauerman@linux.ibm.com - " serge@hallyn.com\0" + " kexec@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2019-01-15 at 17:45 +0800, Kairui Song wrote:\n" @@ -50,12 +50,6 @@ "> +#endif\n" "> +\treturn ret;\n" "> }\n" - "> #endif\n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + > #endif -5aeeaeebb2f69be374857fd832407b6f38def7f62b50bb0eaf8e659425252ba1 +5f241237c3ca728c2dcb0d2f9bf739c174cfc6b6317ef1ff15645a83109f487d
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.