aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module_signing.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-04-06 15:14:24 (GMT)
committerDavid Howells <dhowells@redhat.com>2016-04-06 15:14:24 (GMT)
commite68503bd6836ba765dc8e0ee77ea675fedc07e41 (patch)
tree31ebec81d2f52adc89796dd063468235bfd1cc0e /kernel/module_signing.c
parentad3043fda39db0361d9601685356db4512e914be (diff)
downloadkernel_replicant_linux-e68503bd6836ba765dc8e0ee77ea675fedc07e41.zip
kernel_replicant_linux-e68503bd6836ba765dc8e0ee77ea675fedc07e41.tar.gz
kernel_replicant_linux-e68503bd6836ba765dc8e0ee77ea675fedc07e41.tar.bz2
KEYS: Generalise system_verify_data() to provide access to internal content
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/module_signing.c')
-rw-r--r--kernel/module_signing.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index 64b9dea..593aace 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -80,6 +80,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);
}