diff for duplicates of <20190628021934.4260-3-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index dbc8e73..ac5f3d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,7 +66,7 @@ index c05c29ae4d5d..4ba82e52e4b4 100644 } error: -+ pr_devel("<=%s() = %d\n", __func__, ret); ++ pr_devel("<==%s() = %d\n", __func__, ret); + return ret; +} + @@ -102,7 +102,7 @@ index c05c29ae4d5d..4ba82e52e4b4 100644 + view_content, ctx); + pkcs7_free_message(pkcs7); - pr_devel("<=%s() = %d\n", __func__, ret); + pr_devel("<==%s() = %d\n", __func__, ret); return ret; diff --git a/include/linux/verification.h b/include/linux/verification.h index 018fb5f13d44..5e1d41f2b336 100644 diff --git a/a/content_digest b/N1/content_digest index da1e438..8ffad94 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190628021934.4260-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v12 02/11] PKCS#7: Refactor verify_pkcs7_signature()\0" - "Date\0Fri, 28 Jun 2019 02:19:25 +0000\0" + "Date\0Thu, 27 Jun 2019 23:19:25 -0300\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -92,7 +92,7 @@ " \t}\n" " \n" " error:\n" - "+\tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + "+\tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" "+\treturn ret;\n" "+}\n" "+\n" @@ -128,7 +128,7 @@ "+\t\t\t\t view_content, ctx);\n" "+\n" " \tpkcs7_free_message(pkcs7);\n" - " \tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + " \tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" " \treturn ret;\n" "diff --git a/include/linux/verification.h b/include/linux/verification.h\n" "index 018fb5f13d44..5e1d41f2b336 100644\n" @@ -159,4 +159,4 @@ " #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION\n" extern int verify_pefile_signature(const void *pebuf, unsigned pelen, -d37451b8d73be3fc43cf9a762536129f5b2737d746e8de1839cc57e875c31f2c +6d7199e91067d35c843d64023d7014646612bbde087d5c8be8f34639aaf16968
diff --git a/a/1.txt b/N2/1.txt index dbc8e73..ac5f3d3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -66,7 +66,7 @@ index c05c29ae4d5d..4ba82e52e4b4 100644 } error: -+ pr_devel("<=%s() = %d\n", __func__, ret); ++ pr_devel("<==%s() = %d\n", __func__, ret); + return ret; +} + @@ -102,7 +102,7 @@ index c05c29ae4d5d..4ba82e52e4b4 100644 + view_content, ctx); + pkcs7_free_message(pkcs7); - pr_devel("<=%s() = %d\n", __func__, ret); + pr_devel("<==%s() = %d\n", __func__, ret); return ret; diff --git a/include/linux/verification.h b/include/linux/verification.h index 018fb5f13d44..5e1d41f2b336 100644 diff --git a/a/content_digest b/N2/content_digest index da1e438..553d389 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020190628021934.4260-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v12 02/11] PKCS#7: Refactor verify_pkcs7_signature()\0" - "Date\0Fri, 28 Jun 2019 02:19:25 +0000\0" + "Date\0Thu, 27 Jun 2019 23:19:25 -0300\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 verify a PKCS#7 signature which has already been parsed.\n" @@ -92,7 +92,7 @@ " \t}\n" " \n" " error:\n" - "+\tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + "+\tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" "+\treturn ret;\n" "+}\n" "+\n" @@ -128,7 +128,7 @@ "+\t\t\t\t view_content, ctx);\n" "+\n" " \tpkcs7_free_message(pkcs7);\n" - " \tpr_devel(\"<=%s() = %d\\n\", __func__, ret);\n" + " \tpr_devel(\"<==%s() = %d\\n\", __func__, ret);\n" " \treturn ret;\n" "diff --git a/include/linux/verification.h b/include/linux/verification.h\n" "index 018fb5f13d44..5e1d41f2b336 100644\n" @@ -159,4 +159,4 @@ " #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION\n" extern int verify_pefile_signature(const void *pebuf, unsigned pelen, -d37451b8d73be3fc43cf9a762536129f5b2737d746e8de1839cc57e875c31f2c +c757ee1ad90807b78aac945195df11eea0ce7a7c320f8be04b21cc7e2179b9d2
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.