diff for duplicates of <20181116200712.14154-6-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 275e1ca..cdf181a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,8 @@ index 5eacba858e4b..bfa27f166184 100644 + return ERR_PTR(-EINVAL); if (!keyring[id]) { - keyring[id] @@ -56,17 +55,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, + keyring[id] = +@@ -56,17 +55,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 54a364c..ab17d2a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 05/14] integrity: Introduce integrity_keyring_from_id()\0" - "Date\0Fri, 16 Nov 2018 20:07:03 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:03 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -53,7 +53,8 @@ "+\t\treturn ERR_PTR(-EINVAL);\n" " \n" " \tif (!keyring[id]) {\n" - " \t\tkeyring[id] @@ -56,17 +55,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" + " \t\tkeyring[id] =\n" + "@@ -56,17 +55,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" @@ -114,4 +115,4 @@ " \t\t\t\t\t const char *sig, int siglen,\n" " \t\t\t\t\t const char *digest, int digestlen)" -ebc18026fa48e9fb77a3374ddb879e1a64b2a6e3235d18a8b4e67317c64a932b +91a48dc18acd5dc80de6e49951cba18f858f57d48e72c86f633cb767f267c268
diff --git a/a/1.txt b/N2/1.txt index 275e1ca..cdf181a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -26,7 +26,8 @@ index 5eacba858e4b..bfa27f166184 100644 + return ERR_PTR(-EINVAL); if (!keyring[id]) { - keyring[id] @@ -56,17 +55,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, + keyring[id] = +@@ -56,17 +55,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 54a364c..8da89fe 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,28 +1,28 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 05/14] integrity: Introduce integrity_keyring_from_id()\0" - "Date\0Fri, 16 Nov 2018 20:07:03 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:03 -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> + linux-security-module@vger.kernel.org + keyrings@vger.kernel.org + linux-crypto@vger.kernel.org + Jessica Yu <jeyu@kernel.org> + Mimi Zohar <zohar@linux.vnet.ibm.com> + linuxppc-dev@lists.ozlabs.org + David Woodhouse <dwmw2@infradead.org> Thiago Jung Bauermann <bauerman@linux.ibm.com> - " Mimi Zohar <zohar@linux.vnet.ibm.com>\0" + " 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" @@ -53,7 +53,8 @@ "+\t\treturn ERR_PTR(-EINVAL);\n" " \n" " \tif (!keyring[id]) {\n" - " \t\tkeyring[id] @@ -56,17 +55,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" + " \t\tkeyring[id] =\n" + "@@ -56,17 +55,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" @@ -114,4 +115,4 @@ " \t\t\t\t\t const char *sig, int siglen,\n" " \t\t\t\t\t const char *digest, int digestlen)" -ebc18026fa48e9fb77a3374ddb879e1a64b2a6e3235d18a8b4e67317c64a932b +f1db92d05ff93899afac00cd596bfea55103e918b84e477c8a2cab57fd7adb1e
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.