diff for duplicates of <1521760078.3848.301.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index b3518fa..95f2cb6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,7 +48,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + /* > + * This function doesn't support messages with more than one signature. > + */ -> + if (sinfo = NULL || sinfo->next != NULL) +> + if (sinfo == NULL || sinfo->next != NULL) > + return -EBADMSG; > + > + ret = pkcs7_digest(pkcs7, sinfo); diff --git a/a/content_digest b/N1/content_digest index 8b40a89..99b8734 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020180316203837.10174-4-bauerman@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 03/12] PKCS#7: Introduce pkcs7_get_digest()\0" - "Date\0Thu, 22 Mar 2018 23:07:58 +0000\0" + "Date\0Thu, 22 Mar 2018 19:07:58 -0400\0" "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -72,7 +72,7 @@ "> +\t/*\n" "> +\t * This function doesn't support messages with more than one signature.\n" "> +\t */\n" - "> +\tif (sinfo = NULL || sinfo->next != NULL)\n" + "> +\tif (sinfo == NULL || sinfo->next != NULL)\n" "> +\t\treturn -EBADMSG;\n" "> +\n" "> +\tret = pkcs7_digest(pkcs7, sinfo);\n" @@ -102,4 +102,4 @@ "> #endif /* _CRYPTO_PKCS7_H */\n" > -6b773cf196451cb9e5ab5eec9abb35bba6751364790f0837df591040bf3b9aff +29e4687ba58e7160e7a25bc0dbde54f22706f63696b21b17f9d058f7cbd53fa4
diff --git a/a/1.txt b/N2/1.txt index b3518fa..61d157c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -48,7 +48,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + /* > + * This function doesn't support messages with more than one signature. > + */ -> + if (sinfo = NULL || sinfo->next != NULL) +> + if (sinfo == NULL || sinfo->next != NULL) > + return -EBADMSG; > + > + ret = pkcs7_digest(pkcs7, sinfo); @@ -76,4 +76,9 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + u8 *len); > + > #endif /* _CRYPTO_PKCS7_H */ -> +> + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 8b40a89..829d453 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,9 @@ "ref\020180316203837.10174-1-bauerman@linux.vnet.ibm.com\0" "ref\020180316203837.10174-4-bauerman@linux.vnet.ibm.com\0" - "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Subject\0Re: [PATCH v6 03/12] PKCS#7: Introduce pkcs7_get_digest()\0" - "Date\0Thu, 22 Mar 2018 23:07:58 +0000\0" - "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" - " linux-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 - linux-kernel@vger.kernel.org - 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> - AKASHI - " Takahiro <takahiro.akashi@linaro.org>\0" + "From\0zohar@linux.vnet.ibm.com (Mimi Zohar)\0" + "Subject\0[PATCH v6 03/12] PKCS#7: Introduce pkcs7_get_digest()\0" + "Date\0Thu, 22 Mar 2018 19:07:58 -0400\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote:\n" @@ -72,7 +56,7 @@ "> +\t/*\n" "> +\t * This function doesn't support messages with more than one signature.\n" "> +\t */\n" - "> +\tif (sinfo = NULL || sinfo->next != NULL)\n" + "> +\tif (sinfo == NULL || sinfo->next != NULL)\n" "> +\t\treturn -EBADMSG;\n" "> +\n" "> +\tret = pkcs7_digest(pkcs7, sinfo);\n" @@ -100,6 +84,11 @@ "> +\t\t\t u8 *len);\n" "> +\n" "> #endif /* _CRYPTO_PKCS7_H */\n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -6b773cf196451cb9e5ab5eec9abb35bba6751364790f0837df591040bf3b9aff +4975461dad5230f376b7273ea0b417fed55c448df01757b85b44ed5ab43f5037
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.