[PATCH 68/74] patches: adjust verify.patch to v6.5-rc7
Johannes Berg <[email protected]> Fri, 24 May 2024 19:08:20 +0200
| Newsgroups | org.kernel.vger.backports |
|---|---|
| Message-ID | <20240524190907.1624959d1b73.I7b6f91abd199b394924149eacbad7120598ef7d6@changeid> |
From: Gregory Greenman <[email protected]> Patch e5221fa6a355 ("KEYS: asymmetric: Move sm2 code into x509_public_key") made some changes to inlude order in x509_public_key.c. Adjust verify.patch. Signed-off-by: Gregory Greenman <[email protected]> Signed-off-by: Johannes Berg <[email protected]> --- patches/verify.patch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/patches/verify.patch b/patches/verify.patch index 370fd5f72530..85318b3f26ea 100644 --- a/patches/verify.patch +++ b/patches/verify.patch @@ -11,14 +11,17 @@ if (ret == -ENOMEM) --- a/compat/verification/x509_public_key.c +++ b/compat/verification/x509_public_key.c -@@ -9,11 +9,8 @@ +@@ -8,14 +8,11 @@ + #define pr_fmt(fmt) "X.509: "fmt + #include <crypto/hash.h> + #include <crypto/sm2.h> +-#include <keys/asymmetric-parser.h> +-#include <keys/asymmetric-subtype.h> + #include <keys/system_keyring.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/slab.h> --#include <keys/asymmetric-subtype.h> --#include <keys/asymmetric-parser.h> - #include <keys/system_keyring.h> - #include <crypto/hash.h> + #include <linux/string.h> -#include "asymmetric_keys.h" #include "x509_parser.h" -- 2.45.1