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 <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/patches/verify.patch b/patches/verify.patch
index 0fda8411e43af936673fe638be82aac7dbedcb88..442f2f622351de8497dcdf488123a0618c631511 100644 (file)
--- 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;