Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

* 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: (32 commits)
  ima: fix invalid memory reference
  ima: free duplicate measurement memory
  security: update security_file_mmap() docs
  selinux: Casting (void *) value returned by kmalloc is useless
  apparmor: fix module parameter handling
  Security: tomoyo: add .gitignore file
  tomoyo: add missing rcu_dereference()
  apparmor: add missing rcu_dereference()
  evm: prevent racing during tfm allocation
  evm: key must be set once during initialization
  mpi/mpi-mpow: NULL dereference on allocation failure
  digsig: build dependency fix
  KEYS: Give key types their own lockdep class for key->sem
  TPM: fix transmit_cmd error logic
  TPM: NSC and TIS drivers X86 dependency fix
  TPM: Export wait_for_stat for other vendor specific drivers
  TPM: Use vendor specific function for status probe
  tpm_tis: add delay after aborting command
  tpm_tis: Check return code from getting timeouts/durations
  tpm: Introduce function to poll for result of self test
  ...

Fix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI
and SIGSIG next to CONFIG_DQL addition.

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 7f6b8bca8c25..201e1b33d721 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -285,4 +285,29 @@ config CORDIC
           This option provides an implementation of the CORDIC algorithm;
           calculations are in fixed point. Module will be called cordic.
 
+config MPILIB
+        tristate "Multiprecision maths library"
+        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"
+        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.
+
+config DIGSIG
+        tristate "In-kernel signature checker"
+        depends on KEYS
+        select MPILIB
+        help
+          Digital signature verification. Currently only RSA is supported.
+          Implementation is done using GnuPG MPI library
+
 endmenu