summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-19 19:00:57 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-19 19:01:01 -0500
commit032cd0b866426a95446a4f76c4dee0c40dadb292 (patch)
treeb6e00608eadb33a06406bc00cf13d13389709b61 /config-x86-generic
parentf540242774efe44544f586db9f2b266b8d7f3b0f (diff)
downloadkernel-032cd0b866426a95446a4f76c4dee0c40dadb292.tar.gz
kernel-032cd0b866426a95446a4f76c4dee0c40dadb292.tar.xz
kernel-032cd0b866426a95446a4f76c4dee0c40dadb292.zip
Add pekey support from David Howells and rework secure-boot patchset on top
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic5
1 files changed, 4 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index e8335a2f0..45552bd23 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -428,9 +428,12 @@ CONFIG_INTEL_MEI=m
# CONFIG_DEBUG_NMI_SELFTEST is not set
CONFIG_MPILIB=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PE_FILE_PARSER=y
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_SHA1 is not set
CONFIG_MODULE_SIG_SHA256=y
# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_BLACKLIST=y
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+
CONFIG_MODULE_SIG_UEFI=y