aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig24
1 files changed, 12 insertions, 12 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 765018c24cf9..9d3585bb2a7a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1646,6 +1646,18 @@ config MMAP_ALLOW_UNINITIALIZED
1646 1646
1647 See Documentation/nommu-mmap.txt for more information. 1647 See Documentation/nommu-mmap.txt for more information.
1648 1648
1649config SYSTEM_TRUSTED_KEYRING
1650 bool "Provide system-wide ring of trusted keys"
1651 depends on KEYS
1652 help
1653 Provide a system keyring to which trusted keys can be added. Keys in
1654 the keyring are considered to be trusted. Keys may be added at will
1655 by the kernel from compiled-in data and from hardware key stores, but
1656 userspace may only add extra keys if those keys can be verified by
1657 keys already in the keyring.
1658
1659 Keys in this keyring are used by module signature checking.
1660
1649config PROFILING 1661config PROFILING
1650 bool "Profiling support" 1662 bool "Profiling support"
1651 help 1663 help
@@ -1681,18 +1693,6 @@ config BASE_SMALL
1681 default 0 if BASE_FULL 1693 default 0 if BASE_FULL
1682 default 1 if !BASE_FULL 1694 default 1 if !BASE_FULL
1683 1695
1684config SYSTEM_TRUSTED_KEYRING
1685 bool "Provide system-wide ring of trusted keys"
1686 depends on KEYS
1687 help
1688 Provide a system keyring to which trusted keys can be added. Keys in
1689 the keyring are considered to be trusted. Keys may be added at will
1690 by the kernel from compiled-in data and from hardware key stores, but
1691 userspace may only add extra keys if those keys can be verified by
1692 keys already in the keyring.
1693
1694 Keys in this keyring are used by module signature checking.
1695
1696menuconfig MODULES 1696menuconfig MODULES
1697 bool "Enable loadable module support" 1697 bool "Enable loadable module support"
1698 option modules 1698 option modules