From: Luca Coelho <luca@coelho.fi>
To: backports@vger.kernel.org
Cc: Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 05/10] backport: remove pkcs7_verify.c patch hunk
Date: Sun, 18 Feb 2018 15:24:54 +0200 [thread overview]
Message-ID: <20180218132459.11011-6-luca@coelho.fi> (raw)
In-Reply-To: <20180218132459.11011-1-luca@coelho.fi>
From: Luca Coelho <luciano.coelho@intel.com>
The change that used to be patched into the pkcs7_verify.c file is now
part of newer kernels, so we don't need to patch it anymore. Remove
this hunk from verify.patch accordingly.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
patches/verify.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/patches/verify.patch b/patches/verify.patch
index 0fda8411e43a..442f2f622351 100644
--- a/patches/verify.patch
+++ b/patches/verify.patch
@@ -62,14 +62,3 @@
struct x509_certificate {
struct x509_certificate *next;
struct x509_certificate *signer; /* Certificate that signed this one */
---- a/compat/verification/pkcs7_verify.c
-+++ b/compat/verification/pkcs7_verify.c
-@@ -150,7 +150,7 @@
- pr_devel("Sig %u: Found cert serial match X.509[%u]\n",
- sinfo->index, certix);
-
-- if (x509->pub->pkey_algo != sinfo->sig->pkey_algo) {
-+ if (strcmp(x509->pub->pkey_algo, sinfo->sig->pkey_algo)) {
- pr_warn("Sig %u: X.509 algo and PKCS#7 sig algo don't match\n",
- sinfo->index);
- continue;
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2018-02-18 13:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-18 13:24 [PATCH 00/10] backport: updates for v4.16 Luca Coelho
2018-02-18 13:24 ` [PATCH 01/10] compat: only define thermal backports if CONFIG_THERMAL is enabled Luca Coelho
2018-02-18 13:24 ` [PATCH 02/10] backport: add pcie_find_root_port() Luca Coelho
2018-02-18 13:24 ` [PATCH 03/10] backport: include lib/bucket_locks.c Luca Coelho
2018-02-18 13:24 ` [PATCH 04/10] backport: update genl_dump_check_consistent() backport Luca Coelho
2018-02-18 13:24 ` Luca Coelho [this message]
2018-02-18 13:24 ` [PATCH 06/10] backport: add new build_bug.h file Luca Coelho
2018-02-18 13:24 ` [PATCH 07/10] backports: fix typo "TIMKEEPING" and fix gfp.h Luca Coelho
2018-02-18 13:24 ` [PATCH 08/10] backport: remove stddef.h inclusions Luca Coelho
2018-02-18 13:24 ` [PATCH 09/10] backport: increase max stack frame size compiler check to 1280 Luca Coelho
2018-02-18 13:24 ` [PATCH 10/10] backport: implement alloc_percpu_gfp() for < 3.18 Luca Coelho
2018-02-18 16:10 ` Hauke Mehrtens
2018-02-18 17:58 ` Luciano Coelho
2018-02-28 18:32 ` Hauke Mehrtens
2018-02-28 18:48 ` Luca Coelho
2018-02-18 16:11 ` [PATCH 00/10] backport: updates for v4.16 Hauke Mehrtens
2018-02-19 8:08 ` Luciano Coelho
2018-02-23 11:35 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180218132459.11011-6-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=backports@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).