From 2b5ecd3a3d876c3d40622caa7d2d6a21e17c6581 Mon Sep 17 00:00:00 2001 From: Luca Coelho Date: Sun, 18 Feb 2018 15:24:54 +0200 Subject: backport: remove pkcs7_verify.c patch hunk 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 Signed-off-by: Johannes Berg --- patches/verify.patch | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'patches') diff --git a/patches/verify.patch b/patches/verify.patch index 0fda8411..442f2f62 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; -- cgit v1.2.3