summaryrefslogtreecommitdiffstats
path: root/security/integrity/Makefile
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2018-12-13 01:37:56 +0530
committerMimi Zohar <zohar@linux.ibm.com>2018-12-12 22:04:33 -0500
commit15ea0e1e3e185040bed6119f815096f2e4326242 (patch)
treecc0ecb830489dc77ffcec87b2500ac9aa540b31f /security/integrity/Makefile
parent0bc9ae395b3f3b6557f0c5f0a0b0cd2fd5c00a04 (diff)
downloadlinux-stable-15ea0e1e3e185040bed6119f815096f2e4326242.tar.gz
linux-stable-15ea0e1e3e185040bed6119f815096f2e4326242.tar.bz2
linux-stable-15ea0e1e3e185040bed6119f815096f2e4326242.zip
efi: Import certificates from UEFI Secure Boot
Secure Boot stores a list of allowed certificates in the 'db' variable. This patch imports those certificates into the platform keyring. The shim UEFI bootloader has a similar certificate list stored in the 'MokListRT' variable. We import those as well. Secure Boot also maintains a list of disallowed certificates in the 'dbx' variable. We load those certificates into the system blacklist keyring and forbid any kernel signed with those from loading. [zohar@linux.ibm.com: dropped Josh's original patch description] Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Nayna Jain <nayna@linux.ibm.com> Acked-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Diffstat (limited to 'security/integrity/Makefile')
-rw-r--r--security/integrity/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/security/integrity/Makefile b/security/integrity/Makefile
index 6ee9058866cd..86df9aba8c0f 100644
--- a/security/integrity/Makefile
+++ b/security/integrity/Makefile
@@ -10,7 +10,10 @@ integrity-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o
integrity-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o
integrity-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o
integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o \
- platform_certs/efi_parser.o
+ platform_certs/efi_parser.o \
+ platform_certs/load_uefi.o
+obj-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/load_uefi.o
+$(obj)/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar
subdir-$(CONFIG_IMA) += ima
obj-$(CONFIG_IMA) += ima/