summaryrefslogtreecommitdiff
path: root/patches/verify.patch
diff options
context:
space:
mode:
authorLuca Coelho <luciano.coelho@intel.com>2018-02-18 15:24:54 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-02-23 12:34:00 +0100
commit2b5ecd3a3d876c3d40622caa7d2d6a21e17c6581 (patch)
tree7e04fe96b2920b9456400b2eb770bb54ce1c18ab /patches/verify.patch
parent14482e0de6b99c90b6d72398515ffaa7eb208be4 (diff)
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>
Diffstat (limited to 'patches/verify.patch')
-rw-r--r--patches/verify.patch11
1 files changed, 0 insertions, 11 deletions
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;