diff options
Diffstat (limited to 'certs')
| -rw-r--r-- | certs/system_certificates.S | 16 | ||||
| -rw-r--r-- | certs/system_keyring.c | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/certs/system_certificates.S b/certs/system_certificates.S index 3918ff7235ed..8f29058adf93 100644 --- a/certs/system_certificates.S +++ b/certs/system_certificates.S @@ -5,8 +5,8 @@ __INITRODATA .align 8 - .globl VMLINUX_SYMBOL(system_certificate_list) -VMLINUX_SYMBOL(system_certificate_list): + .globl system_certificate_list +system_certificate_list: __cert_list_start: #ifdef CONFIG_MODULE_SIG .incbin "certs/signing_key.x509" @@ -15,21 +15,21 @@ __cert_list_start: __cert_list_end: #ifdef CONFIG_SYSTEM_EXTRA_CERTIFICATE - .globl VMLINUX_SYMBOL(system_extra_cert) + .globl system_extra_cert .size system_extra_cert, CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE -VMLINUX_SYMBOL(system_extra_cert): +system_extra_cert: .fill CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE, 1, 0 .align 4 - .globl VMLINUX_SYMBOL(system_extra_cert_used) -VMLINUX_SYMBOL(system_extra_cert_used): + .globl system_extra_cert_used +system_extra_cert_used: .int 0 #endif /* CONFIG_SYSTEM_EXTRA_CERTIFICATE */ .align 8 - .globl VMLINUX_SYMBOL(system_certificate_list_size) -VMLINUX_SYMBOL(system_certificate_list_size): + .globl system_certificate_list_size +system_certificate_list_size: #ifdef CONFIG_64BIT .quad __cert_list_end - __cert_list_start #else diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 6251d1b27f0c..81728717523d 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -15,6 +15,7 @@ #include <linux/cred.h> #include <linux/err.h> #include <linux/slab.h> +#include <linux/verification.h> #include <keys/asymmetric-type.h> #include <keys/system_keyring.h> #include <crypto/pkcs7.h> @@ -230,7 +231,7 @@ int verify_pkcs7_signature(const void *data, size_t len, if (!trusted_keys) { trusted_keys = builtin_trusted_keys; - } else if (trusted_keys == (void *)1UL) { + } else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) { #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING trusted_keys = secondary_trusted_keys; #else |
