summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-08-30 11:32:36 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-08-30 11:32:55 -0400
commitc9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90 (patch)
treee2dc3f3af01ec47895411bd40d3e59f8b869496e /config-x86-generic
parent6db14169b396af2e6f3dd567ce536cd869614e58 (diff)
downloadkernel-c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90.tar.gz
kernel-c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90.tar.xz
kernel-c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90.zip
Rework Secure Boot support to use the secure_modules approach
- Drop pekey
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic6
1 files changed, 3 insertions, 3 deletions
diff --git a/config-x86-generic b/config-x86-generic
index f2a071e3..64f5a2fc 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -441,14 +441,14 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_XZ_DEC_X86=y
CONFIG_MPILIB=y
-CONFIG_PKCS7_MESSAGE_PARSER=y
-CONFIG_PE_FILE_PARSER=y
CONFIG_MODULE_SIG=y
CONFIG_MODULE_SIG_ALL=y
# CONFIG_MODULE_SIG_SHA1 is not set
CONFIG_MODULE_SIG_SHA256=y
# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+CONFIG_MODULE_SIG_BLACKLIST=y
+CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y
+CONFIG_EFI_SIGNATURE_LIST_PARSER=y
CONFIG_MODULE_SIG_UEFI=y