diff for duplicates of <20180207011012.5928-3-ebiggers3@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8fd4cb1..cd76bb1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,15 +37,15 @@ index 2f6a768b91d7..97c77f66b20d 100644 for (sinfo = pkcs7->signed_infos; sinfo; sinfo = sinfo->next) { ret = pkcs7_verify_one(pkcs7, sinfo); -- if (sinfo->blacklisted && actual_ret = -ENOPKG) +- if (sinfo->blacklisted && actual_ret == -ENOPKG) - actual_ret = -EKEYREJECTED; + if (sinfo->blacklisted) { -+ if (actual_ret = -ENOPKG) ++ if (actual_ret == -ENOPKG) + actual_ret = -EKEYREJECTED; + continue; + } if (ret < 0) { - if (ret = -ENOPKG) { + if (ret == -ENOPKG) { sinfo->unsupported_crypto = true; -- 2.16.0.rc1.238.g530d649a79-goog diff --git a/a/content_digest b/N1/content_digest index c3ac2af..9d13a3f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020180207011012.5928-1-ebiggers3@gmail.com\0" "From\0Eric Biggers <ebiggers3@gmail.com>\0" "Subject\0[PATCH 2/9] PKCS#7: fix certificate blacklisting\0" - "Date\0Wed, 07 Feb 2018 01:10:05 +0000\0" + "Date\0Tue, 6 Feb 2018 17:10:05 -0800\0" "To\0David Howells <dhowells@redhat.com>" " keyrings@vger.kernel.org\0" "Cc\0linux-crypto@vger.kernel.org" @@ -49,17 +49,17 @@ " \n" " \tfor (sinfo = pkcs7->signed_infos; sinfo; sinfo = sinfo->next) {\n" " \t\tret = pkcs7_verify_one(pkcs7, sinfo);\n" - "-\t\tif (sinfo->blacklisted && actual_ret = -ENOPKG)\n" + "-\t\tif (sinfo->blacklisted && actual_ret == -ENOPKG)\n" "-\t\t\tactual_ret = -EKEYREJECTED;\n" "+\t\tif (sinfo->blacklisted) {\n" - "+\t\t\tif (actual_ret = -ENOPKG)\n" + "+\t\t\tif (actual_ret == -ENOPKG)\n" "+\t\t\t\tactual_ret = -EKEYREJECTED;\n" "+\t\t\tcontinue;\n" "+\t\t}\n" " \t\tif (ret < 0) {\n" - " \t\t\tif (ret = -ENOPKG) {\n" + " \t\t\tif (ret == -ENOPKG) {\n" " \t\t\t\tsinfo->unsupported_crypto = true;\n" "-- \n" 2.16.0.rc1.238.g530d649a79-goog -660f67475cad77ca71e396a1c3c7cec0b3f1f4aa433f6bf840a2489e7707f7ee +8508eb354baaec1b2c9fe6774a798de4d8a84fe38ebab2afac0621e42b246357
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.