diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 16:43:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 16:43:39 -0800 |
| commit | a25a2b84098eb5e001cb8086603d692aa95bf2ec (patch) | |
| tree | 02c01b36251f7b0afb1a98093e14efb17d015910 /lib/Kconfig | |
| parent | f429ee3b808118591d1f3cdf3c0d0793911a5677 (diff) | |
| parent | f1be242c95257b199d8b679bc952ca33487c9af6 (diff) | |
| download | lwn-a25a2b84098eb5e001cb8086603d692aa95bf2ec.tar.gz lwn-a25a2b84098eb5e001cb8086603d692aa95bf2ec.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
integrity: digital signature config option name change
lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts
lib: MPILIB Kconfig description update
lib: digital signature dependency fix
lib: digital signature config option name change
encrypted-keys: fix rcu and sparse messages
keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages
KEYS: Add missing smp_rmb() primitives to the keyring search code
TOMOYO: Accept \000 as a valid character.
security: update MAINTAINERS file with new git repo
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 201e1b33d721..169eb7c598e5 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -286,25 +286,24 @@ config CORDIC calculations are in fixed point. Module will be called cordic. config MPILIB - tristate "Multiprecision maths library" + tristate help Multiprecision maths library from GnuPG. It is used to implement RSA digital signature verification, which is used by IMA/EVM digital signature extension. config MPILIB_EXTRA - bool "Multiprecision maths library - additional sources" + bool depends on MPILIB help - Multiprecision maths library from GnuPG. - It is used to implement RSA digital signature verification, - which is used by IMA/EVM digital signature extension. - This code in unnecessary for RSA digital signature verification, - and can be compiled if needed. + Additional sources of multiprecision maths library from GnuPG. + This code is unnecessary for RSA digital signature verification, + but can be compiled if needed. -config DIGSIG - tristate "In-kernel signature checker" - depends on KEYS +config SIGNATURE + tristate + depends on KEYS && CRYPTO + select CRYPTO_SHA1 select MPILIB help Digital signature verification. Currently only RSA is supported. |