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

2 files changed, 10 insertions, 11 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.
diff --git a/lib/Makefile b/lib/Makefile
index dace162c7e1c..d71aae1b01b3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -119,7 +119,7 @@ obj-$(CONFIG_CORDIC) += cordic.o
 obj-$(CONFIG_DQL) += dynamic_queue_limits.o
 
 obj-$(CONFIG_MPILIB) += mpi/
-obj-$(CONFIG_DIGSIG) += digsig.o
+obj-$(CONFIG_SIGNATURE) += digsig.o
 
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h