diff mbox

[05/10] backport: remove pkcs7_verify.c patch hunk

Message ID 20180218132459.11011-6-luca@coelho.fi (mailing list archive)
State Accepted
Headers show

Commit Message

Luca Coelho Feb. 18, 2018, 1:24 p.m. UTC 
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 mbox

Patch

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;