diff for duplicates of <1556193350.3894.92.camel@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d12c2e2..a58c5e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ Mimi > size_t sig_len, modlen = info->len; > + int ret; > -> pr_devel("=>%s(,%zu)\n", __func__, modlen); +> pr_devel("==>%s(,%zu)\n", __func__, modlen); > > @@ -82,8 +83,15 @@ int mod_verify_sig(const void *mod, struct load_info *info) > return -EBADMSG; @@ -48,7 +48,7 @@ Mimi > + VERIFY_USE_SECONDARY_KEYRING, > + VERIFYING_MODULE_SIGNATURE, > + NULL, NULL); -> + if (ret = -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { +> + if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) { > + ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, > + VERIFY_USE_PLATFORM_KEYRING, > + VERIFYING_MODULE_SIGNATURE, diff --git a/a/content_digest b/N1/content_digest index f6e00f1..c54b534 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01556116431-7129-1-git-send-email-robeholmes@gmail.com\0" "From\0Mimi Zohar <zohar@linux.ibm.com>\0" "Subject\0Re: [PATCH v2] KEYS: Make use of platform keyring for module signature verify\0" - "Date\0Thu, 25 Apr 2019 11:55:50 +0000\0" + "Date\0Thu, 25 Apr 2019 07:55:50 -0400\0" "To\0Robert Holmes <robeholmes@gmail.com>" jeyu@kernel.org " linux-kernel@vger.kernel.org\0" @@ -46,7 +46,7 @@ "> \tsize_t sig_len, modlen = info->len;\n" "> +\tint ret;\n" "> \n" - "> \tpr_devel(\"=>%s(,%zu)\\n\", __func__, modlen);\n" + "> \tpr_devel(\"==>%s(,%zu)\\n\", __func__, modlen);\n" "> \n" "> @@ -82,8 +83,15 @@ int mod_verify_sig(const void *mod, struct load_info *info)\n" "> \t\treturn -EBADMSG;\n" @@ -60,7 +60,7 @@ "> +\t\t\t\t VERIFY_USE_SECONDARY_KEYRING,\n" "> +\t\t\t\t VERIFYING_MODULE_SIGNATURE,\n" "> +\t\t\t\t NULL, NULL);\n" - "> +\tif (ret = -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) {\n" + "> +\tif (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) {\n" "> +\t\tret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,\n" "> +\t\t\t\t\t VERIFY_USE_PLATFORM_KEYRING,\n" "> +\t\t\t\t\t VERIFYING_MODULE_SIGNATURE,\n" @@ -69,4 +69,4 @@ "> +\treturn ret;\n" > } -da489ac608826e6d474a51b113b88dd7f0ec0d5462e10f92869e93655f2ada66 +9b6d2f4b462b522818b1272bf8c11b655cbf82ed944ef6c8f2de9253dcbf322c
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.