diff for duplicates of <1547767245.3931.56.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 1add9cd..638044c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ signature. > components. For example, kexec_file_load could use this .platform > keyring to verify the kernel image's image. -The above statement is too generic. Please replace "and makes it +The above statement is too generic.  Please replace "and makes it useable for other components" with " keyring, making it accessible for verifying a PE signed kernel image". @@ -86,17 +86,11 @@ Reviewed/Tested-by: Mimi Zohar <zohar@linux.ibm.com> > } > > +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING -> + if (id == INTEGRITY_KEYRING_PLATFORM) { +> + if (id = INTEGRITY_KEYRING_PLATFORM) { > + set_platform_trusted_keys(keyring[id]); > + } > +#endif > + > return err; > } -> - - -_______________________________________________ -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 02fb4d6..3824350 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,21 +2,21 @@ "ref\020190116101654.7288-2-kasong@redhat.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v3 1/2] integrity, KEYS: add a reference to platform keyring\0" - "Date\0Thu, 17 Jan 2019 18:20:45 -0500\0" + "Date\0Thu, 17 Jan 2019 23:20:45 +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 Wed, 2019-01-16 at 18:16 +0800, Kairui Song wrote:\n" @@ -43,7 +43,7 @@ "> components. For example, kexec_file_load could use this .platform\n" "> keyring to verify the kernel image's image.\n" "\n" - "The above statement is too generic. \302\240Please replace \"and makes it \n" + "The above statement is too generic. \342\224\254\303\241Please replace \"and makes it \n" "useable for other components\" with \" keyring, making it accessible for\n" "verifying a PE signed kernel image\".\n" "\n" @@ -107,19 +107,13 @@ "> \t}\n" "> \n" "> +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING\n" - "> +\tif (id == INTEGRITY_KEYRING_PLATFORM) {\n" + "> +\tif (id = INTEGRITY_KEYRING_PLATFORM) {\n" "> +\t\tset_platform_trusted_keys(keyring[id]);\n" "> +\t}\n" "> +#endif\n" "> +\n" "> \treturn err;\n" "> }\n" - "> \n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + > -a07e70041ad3dced656550ef7807132f62c58000cc077536ea8b47d4d9ef1f78 +86df72a19e1f5fe1897ebda25b6df271bf7902e5c38c9deb0f17d47ce4420f0d
diff --git a/a/1.txt b/N2/1.txt index 1add9cd..d5a8734 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -93,10 +93,4 @@ Reviewed/Tested-by: Mimi Zohar <zohar@linux.ibm.com> > + > return err; > } -> - - -_______________________________________________ -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 02fb4d6..e04f3da 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,18 +5,18 @@ "Date\0Thu, 17 Jan 2019 18:20:45 -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 Wed, 2019-01-16 at 18:16 +0800, Kairui Song wrote:\n" @@ -114,12 +114,6 @@ "> +\n" "> \treturn err;\n" "> }\n" - "> \n" - "\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + > -a07e70041ad3dced656550ef7807132f62c58000cc077536ea8b47d4d9ef1f78 +7d872d6a61cdde514b02d004302ece1e79258b6b4e1143fffd04f4cc95a5e660
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.