Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82c04ff8 authored by Peter Foley's avatar Peter Foley Committed by Linus Torvalds
Browse files

init/Kconfig: move the trusted keyring config option to general setup 



The SYSTEM_TRUSTED_KEYRING config option is not in any menu, causing it
to show up in the toplevel of the kernel configuration.  Fix this by
moving it under the General Setup menu.

Signed-off-by: default avatarPeter Foley <pefoley2@pefoley.com>
Cc: David Howells <dhowells@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 83da7510

init/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -1646,6 +1646,18 @@ config MMAP_ALLOW_UNINITIALIZED 


	  See Documentation/nommu-mmap.txt for more information.



config SYSTEM_TRUSTED_KEYRING

	bool "Provide system-wide ring of trusted keys"

	depends on KEYS

	help

	  Provide a system keyring to which trusted keys can be added.  Keys in

	  the keyring are considered to be trusted.  Keys may be added at will

	  by the kernel from compiled-in data and from hardware key stores, but

	  userspace may only add extra keys if those keys can be verified by

	  keys already in the keyring.



	  Keys in this keyring are used by module signature checking.



config PROFILING

	bool "Profiling support"

	help
@@ -1681,18 +1693,6 @@ config BASE_SMALL 
	default 0 if BASE_FULL

	default 1 if !BASE_FULL



config SYSTEM_TRUSTED_KEYRING

	bool "Provide system-wide ring of trusted keys"

	depends on KEYS

	help

	  Provide a system keyring to which trusted keys can be added.  Keys in

	  the keyring are considered to be trusted.  Keys may be added at will

	  by the kernel from compiled-in data and from hardware key stores, but

	  userspace may only add extra keys if those keys can be verified by

	  keys already in the keyring.



	  Keys in this keyring are used by module signature checking.



menuconfig MODULES

	bool "Enable loadable module support"

	option modules