diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-04 23:57:04 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-03-21 09:19:32 +0100 |
| commit | 9436e5946ad610081f5564f6e1fb233f62698060 (patch) | |
| tree | 5aa8a63fac6d5bbd0dd35c7843fb7041faf19eb5 /patches/verify.patch | |
| parent | 50234c8b91ff22528b41668d674517009073f698 (diff) | |
patches: refresh on kernel v4.16-rc3
No manual changes needed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/verify.patch')
| -rw-r--r-- | patches/verify.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/verify.patch b/patches/verify.patch index 442f2f62..791de881 100644 --- a/patches/verify.patch +++ b/patches/verify.patch @@ -1,6 +1,6 @@ --- a/compat/verification/pkcs7_trust.c +++ b/compat/verification/pkcs7_trust.c -@@ -115,7 +115,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, +@@ -116,7 +116,7 @@ static int pkcs7_validate_trust_one(stru return -ENOKEY; matched: @@ -23,7 +23,7 @@ #include "x509_parser.h" /* -@@ -159,6 +156,7 @@ not_self_signed: +@@ -155,6 +152,7 @@ not_self_signed: return 0; } @@ -31,9 +31,9 @@ /* * Attempt to parse a data blob for a key as an X509 certificate. */ -@@ -276,3 +274,4 @@ module_exit(x509_key_exit); - +@@ -273,3 +271,4 @@ module_exit(x509_key_exit); MODULE_DESCRIPTION("X.509 certificate parser"); + MODULE_AUTHOR("Red Hat, Inc."); MODULE_LICENSE("GPL"); +#endif --- a/include/crypto/pkcs7.h |