diff options
| author | David Howells <dhowells@redhat.com> | 2016-04-06 16:14:24 +0100 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-05-25 13:57:21 +0300 |
| commit | 4e55d7920b094ef7966b38fdfebb5dd30ca5eeec (patch) | |
| tree | 79e964d88a59a0ed4002b81e862273cf0432b730 /kernel | |
| parent | 11485a13d38000c64471bdf6338536be52b761f9 (diff) | |
KEYS: Generalise system_verify_data() to provide access to internal content
commit e68503bd6836ba765dc8e0ee77ea675fedc07e41 upstream
Generalise system_verify_data() to provide access to internal content
through a callback. This allows all the PKCS#7 stuff to be hidden inside
this function and removed from the PE file parser and the PKCS#7 test key.
If external content is not required, NULL should be passed as data to the
function. If the callback is not required, that can be set to NULL.
The function is now called verify_pkcs7_signature() to contrast with
verify_pefile_signature() and the definitions of both have been moved into
linux/verification.h along with the key_being_used_for enum.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module_signing.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c index 6528a79d998d..70cf0220efeb 100644 --- a/kernel/module_signing.c +++ b/kernel/module_signing.c @@ -73,6 +73,7 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen) return -EBADMSG; } - return system_verify_data(mod, modlen, mod + modlen, sig_len, - VERIFYING_MODULE_SIGNATURE); + return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + NULL, -ENOKEY, VERIFYING_MODULE_SIGNATURE, + NULL, NULL); } |