diff for duplicates of <20181116200712.14154-3-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 3f86c07..0f188b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,7 +71,7 @@ index 81728717523d..dd8c5ef941ce 100644 } error: -+ pr_devel("<=%s() = %d\n", __func__, ret); ++ pr_devel("<==%s() = %d\n", __func__, ret); + return ret; +} + @@ -107,7 +107,7 @@ index 81728717523d..dd8c5ef941ce 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/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c index f0d56e1a8b7e..8df9693f659f 100644 @@ -128,7 +128,7 @@ index f0d56e1a8b7e..8df9693f659f 100644 + * This function doesn't support messages with more than one signature, + * so don't return anything in that case. + */ -+ if (pkcs7->signed_infos = NULL || pkcs7->signed_infos->next != NULL) ++ if (pkcs7->signed_infos == NULL || pkcs7->signed_infos->next != NULL) + return NULL; + + return pkcs7->signed_infos->sig; diff --git a/a/content_digest b/N1/content_digest index 8d02384..62988cd 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 02/14] PKCS#7: Refactor verify_pkcs7_signature() and add pkcs7_get_message_sig()\0" - "Date\0Fri, 16 Nov 2018 20:07:00 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:00 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -97,7 +97,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" @@ -133,7 +133,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/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c\n" "index f0d56e1a8b7e..8df9693f659f 100644\n" @@ -154,7 +154,7 @@ "+\t * This function doesn't support messages with more than one signature,\n" "+\t * so don't return anything in that case.\n" "+\t */\n" - "+\tif (pkcs7->signed_infos = NULL || pkcs7->signed_infos->next != NULL)\n" + "+\tif (pkcs7->signed_infos == NULL || pkcs7->signed_infos->next != NULL)\n" "+\t\treturn NULL;\n" "+\n" "+\treturn pkcs7->signed_infos->sig;\n" @@ -201,4 +201,4 @@ " #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION\n" extern int verify_pefile_signature(const void *pebuf, unsigned pelen, -4c78a872d577e75d9aba637d93c982e002353849ab517d6beeffaa4d43dd75c4 +e0169402b9c70e7177e95f4322a9213754b07bf22c8366e01ee0e584042493b1
diff --git a/a/1.txt b/N2/1.txt index 3f86c07..0f188b5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -71,7 +71,7 @@ index 81728717523d..dd8c5ef941ce 100644 } error: -+ pr_devel("<=%s() = %d\n", __func__, ret); ++ pr_devel("<==%s() = %d\n", __func__, ret); + return ret; +} + @@ -107,7 +107,7 @@ index 81728717523d..dd8c5ef941ce 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/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c index f0d56e1a8b7e..8df9693f659f 100644 @@ -128,7 +128,7 @@ index f0d56e1a8b7e..8df9693f659f 100644 + * This function doesn't support messages with more than one signature, + * so don't return anything in that case. + */ -+ if (pkcs7->signed_infos = NULL || pkcs7->signed_infos->next != NULL) ++ if (pkcs7->signed_infos == NULL || pkcs7->signed_infos->next != NULL) + return NULL; + + return pkcs7->signed_infos->sig; diff --git a/a/content_digest b/N2/content_digest index 8d02384..df6bb46 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 02/14] PKCS#7: Refactor verify_pkcs7_signature() and add pkcs7_get_message_sig()\0" - "Date\0Fri, 16 Nov 2018 20:07:00 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:00 -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 verify a PKCS#7 which has already been parsed. For this\n" @@ -97,7 +97,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" @@ -133,7 +133,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/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c\n" "index f0d56e1a8b7e..8df9693f659f 100644\n" @@ -154,7 +154,7 @@ "+\t * This function doesn't support messages with more than one signature,\n" "+\t * so don't return anything in that case.\n" "+\t */\n" - "+\tif (pkcs7->signed_infos = NULL || pkcs7->signed_infos->next != NULL)\n" + "+\tif (pkcs7->signed_infos == NULL || pkcs7->signed_infos->next != NULL)\n" "+\t\treturn NULL;\n" "+\n" "+\treturn pkcs7->signed_infos->sig;\n" @@ -201,4 +201,4 @@ " #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION\n" extern int verify_pefile_signature(const void *pebuf, unsigned pelen, -4c78a872d577e75d9aba637d93c982e002353849ab517d6beeffaa4d43dd75c4 +15d36219a141cb9058d296472f19d527bb352d85846ba62488428ec112591ddc
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.