diff for duplicates of <1521755378.3848.295.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 841f13d..91f75f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -84,7 +84,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > } > > error: -> + pr_devel("<=%s() = %d\n", __func__, ret); +> + pr_devel("<==%s() = %d\n", __func__, ret); > + return ret; > +} > + @@ -120,7 +120,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + 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 a6dcaa659aa8..456b803972b5 100644 @@ -141,7 +141,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + * 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 3744ece..62ca12c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020180316203837.10174-3-bauerman@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 02/12] PKCS#7: Introduce pkcs7_get_message_sig() and verify_pkcs7_message_sig()\0" - "Date\0Thu, 22 Mar 2018 21:49:38 +0000\0" + "Date\0Thu, 22 Mar 2018 17:49:38 -0400\0" "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -108,7 +108,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" @@ -144,7 +144,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 a6dcaa659aa8..456b803972b5 100644\n" @@ -165,7 +165,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" @@ -213,4 +213,4 @@ "> extern int verify_pefile_signature(const void *pebuf, unsigned pelen,\n" > -e1eda017a9d64eea0cfa73351cf4bb18dff8e8a3b96d144496dcbeafcaab407c +82c8d4bcfbf512b60af716deb221c33b126bc105610e8f4f2b648cffcf6c9dea
diff --git a/a/1.txt b/N2/1.txt index 841f13d..e68f3c6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,9 +10,9 @@ On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote: > takes. The title "PKCS#7: refactor verify_pkcs7_signature()" might be more -appropriate. The patch description would then explain why it needs to -be refactored. In this case, verify_pkcs7_signature() verifies the -signature using keys on the builtin and secondary keyrings. IMA- +appropriate. The patch description would then explain why it needs to +be refactored. In this case, verify_pkcs7_signature() verifies the +signature using keys on the builtin and secondary keyrings. IMA- appraisal needs to verify the signature using keys on its keyring. The patch itself looks good! @@ -84,7 +84,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > } > > error: -> + pr_devel("<=%s() = %d\n", __func__, ret); +> + pr_devel("<==%s() = %d\n", __func__, ret); > + return ret; > +} > + @@ -120,7 +120,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + 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 a6dcaa659aa8..456b803972b5 100644 @@ -141,7 +141,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + * 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 3744ece..ae9da04 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020180316203837.10174-3-bauerman@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 02/12] PKCS#7: Introduce pkcs7_get_message_sig() and verify_pkcs7_message_sig()\0" - "Date\0Thu, 22 Mar 2018 21:49:38 +0000\0" + "Date\0Thu, 22 Mar 2018 17:49:38 -0400\0" "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -34,9 +34,9 @@ "> takes.\n" "\n" "The title \"PKCS#7: refactor verify_pkcs7_signature()\" might be more\n" - "appropriate. \302\240The patch description would then explain why it needs to\n" - "be refactored. \302\240In this case, verify_pkcs7_signature() verifies the\n" - "signature using keys on the builtin and secondary keyrings. \302\240IMA-\n" + "appropriate. The patch description would then explain why it needs to\n" + "be refactored. In this case, verify_pkcs7_signature() verifies the\n" + "signature using keys on the builtin and secondary keyrings. IMA-\n" "appraisal needs to verify the signature using keys on its keyring.\n" "\n" "The patch itself looks good!\n" @@ -108,7 +108,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" @@ -144,7 +144,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 a6dcaa659aa8..456b803972b5 100644\n" @@ -165,7 +165,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" @@ -213,4 +213,4 @@ "> extern int verify_pefile_signature(const void *pebuf, unsigned pelen,\n" > -e1eda017a9d64eea0cfa73351cf4bb18dff8e8a3b96d144496dcbeafcaab407c +9060a58d0282caf1a0fa3788d160edd6f8d58c6a7827fb5c64c87ed91c36c7ee
diff --git a/a/1.txt b/N3/1.txt index 841f13d..ec5ef1f 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -10,9 +10,9 @@ On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote: > takes. The title "PKCS#7: refactor verify_pkcs7_signature()" might be more -appropriate. The patch description would then explain why it needs to -be refactored. In this case, verify_pkcs7_signature() verifies the -signature using keys on the builtin and secondary keyrings. IMA- +appropriate. ?The patch description would then explain why it needs to +be refactored. ?In this case, verify_pkcs7_signature() verifies the +signature using keys on the builtin and secondary keyrings. ?IMA- appraisal needs to verify the signature using keys on its keyring. The patch itself looks good! @@ -84,7 +84,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > } > > error: -> + pr_devel("<=%s() = %d\n", __func__, ret); +> + pr_devel("<==%s() = %d\n", __func__, ret); > + return ret; > +} > + @@ -120,7 +120,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + 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 a6dcaa659aa8..456b803972b5 100644 @@ -141,7 +141,7 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + * 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; @@ -187,4 +187,9 @@ Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > > #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION > extern int verify_pefile_signature(const void *pebuf, unsigned pelen, -> +> + +-- +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/N3/content_digest index 3744ece..5fc5ff9 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,25 +1,9 @@ "ref\020180316203837.10174-1-bauerman@linux.vnet.ibm.com\0" "ref\020180316203837.10174-3-bauerman@linux.vnet.ibm.com\0" - "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Subject\0Re: [PATCH v6 02/12] PKCS#7: Introduce pkcs7_get_message_sig() and verify_pkcs7_message_sig()\0" - "Date\0Thu, 22 Mar 2018 21:49:38 +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 02/12] PKCS#7: Introduce pkcs7_get_message_sig() and verify_pkcs7_message_sig()\0" + "Date\0Thu, 22 Mar 2018 17:49:38 -0400\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Thiago,\n" @@ -34,9 +18,9 @@ "> takes.\n" "\n" "The title \"PKCS#7: refactor verify_pkcs7_signature()\" might be more\n" - "appropriate. \302\240The patch description would then explain why it needs to\n" - "be refactored. \302\240In this case, verify_pkcs7_signature() verifies the\n" - "signature using keys on the builtin and secondary keyrings. \302\240IMA-\n" + "appropriate. ?The patch description would then explain why it needs to\n" + "be refactored. ?In this case, verify_pkcs7_signature() verifies the\n" + "signature using keys on the builtin and secondary keyrings. ?IMA-\n" "appraisal needs to verify the signature using keys on its keyring.\n" "\n" "The patch itself looks good!\n" @@ -108,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" @@ -144,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/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c\n" "> index a6dcaa659aa8..456b803972b5 100644\n" @@ -165,7 +149,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" @@ -211,6 +195,11 @@ "> \n" "> #ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION\n" "> extern int verify_pefile_signature(const void *pebuf, unsigned pelen,\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 -e1eda017a9d64eea0cfa73351cf4bb18dff8e8a3b96d144496dcbeafcaab407c +2fea04f5c434ce92214d3e83428deb85bc7afa16fe283c8ca6f996f28d232f40
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.