diff for duplicates of <20181213020907.13601-6-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index a674b55..4a81430 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,8 @@ index 71c3200521d6..bbfa3085d1b5 100644 + return ERR_PTR(-EINVAL); if (!keyring[id]) { - keyring[id] @@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, + keyring[id] = +@@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, int err = PTR_ERR(keyring[id]); pr_err("no %s keyring: %d\n", keyring_name[id], err); keyring[id] = NULL; diff --git a/a/content_digest b/N1/content_digest index 885a81d..cb9cfcd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181213020907.13601-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v9 05/14] integrity: Introduce integrity_keyring_from_id()\0" - "Date\0Thu, 13 Dec 2018 02:08:58 +0000\0" + "Date\0Thu, 13 Dec 2018 00:08:58 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -52,7 +52,8 @@ "+\t\treturn ERR_PTR(-EINVAL);\n" " \n" " \tif (!keyring[id]) {\n" - " \t\tkeyring[id] @@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" + " \t\tkeyring[id] =\n" + "@@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" " \t\t\tint err = PTR_ERR(keyring[id]);\n" " \t\t\tpr_err(\"no %s keyring: %d\\n\", keyring_name[id], err);\n" " \t\t\tkeyring[id] = NULL;\n" @@ -113,4 +114,4 @@ " \t\t\t\t\t const char *sig, int siglen,\n" " \t\t\t\t\t const char *digest, int digestlen)" -c9ed4f6f8756899be2900627c2fbebb76e12310ccc0fa0f1555a80f84d200b15 +2217a75c4f37b23f25c443b7db39b4e0df6b6381fc5101028149a858cdd0ac12
diff --git a/a/1.txt b/N2/1.txt index a674b55..4a81430 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -26,7 +26,8 @@ index 71c3200521d6..bbfa3085d1b5 100644 + return ERR_PTR(-EINVAL); if (!keyring[id]) { - keyring[id] @@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, + keyring[id] = +@@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, int err = PTR_ERR(keyring[id]); pr_err("no %s keyring: %d\n", keyring_name[id], err); keyring[id] = NULL; diff --git a/a/content_digest b/N2/content_digest index 885a81d..025690b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020181213020907.13601-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v9 05/14] integrity: Introduce integrity_keyring_from_id()\0" - "Date\0Thu, 13 Dec 2018 02:08:58 +0000\0" + "Date\0Thu, 13 Dec 2018 00:08:58 -0200\0" "To\0linux-integrity@vger.kernel.org\0" - "Cc\0linux-security-module@vger.kernel.org" - keyrings@vger.kernel.org - linux-crypto@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0Herbert Xu <herbert@gondor.apana.org.au>" linux-doc@vger.kernel.org + Dmitry Kasatkin <dmitry.kasatkin@gmail.com> + David S. Miller <davem@davemloft.net> + Jonathan Corbet <corbet@lwn.net> linux-kernel@vger.kernel.org Mimi Zohar <zohar@linux.ibm.com> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> James Morris <jmorris@namei.org> - Serge E. Hallyn <serge@hallyn.com> David Howells <dhowells@redhat.com> - David Woodhouse <dwmw2@infradead.org> - Jessica Yu <jeyu@kernel.org> - Herbert Xu <herbert@gondor.apana.org.au> - David S. Miller <davem@davemloft.net> - Jonathan Corbet <corbet@lwn.net> AKASHI Takahiro <takahiro.akashi@linaro.org> - " Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" + linux-security-module@vger.kernel.org + keyrings@vger.kernel.org + linux-crypto@vger.kernel.org + Jessica Yu <jeyu@kernel.org> + linuxppc-dev@lists.ozlabs.org + David Woodhouse <dwmw2@infradead.org> + Thiago Jung Bauermann <bauerman@linux.ibm.com> + " Serge E. Hallyn <serge@hallyn.com>\0" "\00:1\0" "b\0" "IMA will need to obtain the keyring used to verify file signatures so that\n" @@ -52,7 +52,8 @@ "+\t\treturn ERR_PTR(-EINVAL);\n" " \n" " \tif (!keyring[id]) {\n" - " \t\tkeyring[id] @@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" + " \t\tkeyring[id] =\n" + "@@ -57,17 +56,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" " \t\t\tint err = PTR_ERR(keyring[id]);\n" " \t\t\tpr_err(\"no %s keyring: %d\\n\", keyring_name[id], err);\n" " \t\t\tkeyring[id] = NULL;\n" @@ -113,4 +114,4 @@ " \t\t\t\t\t const char *sig, int siglen,\n" " \t\t\t\t\t const char *digest, int digestlen)" -c9ed4f6f8756899be2900627c2fbebb76e12310ccc0fa0f1555a80f84d200b15 +fc12d7dc3b27244ea0f33c8da5c81ac6ee14ff0f1b4ecb615168ffd1a96880fe
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.