Patched in Tegra support.

1 files changed, 67 insertions, 8 deletions

diff --git a/security/Kconfig b/security/Kconfig
index e9c6ac724fe..85923b649d1 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -4,7 +4,71 @@
 
 menu "Security options"
 
-source security/keys/Kconfig
+config KEYS
+        bool "Enable access key retention support"
+        help
+          This option provides support for retaining authentication tokens and
+          access keys in the kernel.
+
+          It also includes provision of methods by which such keys might be
+          associated with a process so that network filesystems, encryption
+          support and the like can find them.
+
+          Furthermore, a special type of key is available that acts as keyring:
+          a searchable sequence of keys. Each process is equipped with access
+          to five standard keyrings: UID-specific, GID-specific, session,
+          process and thread.
+
+          If you are unsure as to whether this is required, answer N.
+
+config TRUSTED_KEYS
+        tristate "TRUSTED KEYS"
+        depends on KEYS && TCG_TPM
+        select CRYPTO
+        select CRYPTO_HMAC
+        select CRYPTO_SHA1
+        help
+          This option provides support for creating, sealing, and unsealing
+          keys in the kernel. Trusted keys are random number symmetric keys,
+          generated and RSA-sealed by the TPM. The TPM only unseals the keys,
+          if the boot PCRs and other criteria match.  Userspace will only ever
+          see encrypted blobs.
+
+          If you are unsure as to whether this is required, answer N.
+
+config ENCRYPTED_KEYS
+        tristate "ENCRYPTED KEYS"
+        depends on KEYS && TRUSTED_KEYS
+        select CRYPTO_AES
+        select CRYPTO_CBC
+        select CRYPTO_SHA256
+        select CRYPTO_RNG
+        help
+          This option provides support for create/encrypting/decrypting keys
+          in the kernel.  Encrypted keys are kernel generated random numbers,
+          which are encrypted/decrypted with a 'master' symmetric key. The
+          'master' key can be either a trusted-key or user-key type.
+          Userspace only ever sees/stores encrypted blobs.
+
+          If you are unsure as to whether this is required, answer N.
+
+config KEYS_DEBUG_PROC_KEYS
+        bool "Enable the /proc/keys file by which keys may be viewed"
+        depends on KEYS
+        help
+          This option turns on support for the /proc/keys file - through which
+          can be listed all the keys on the system that are viewable by the
+          reading process.
+
+          The only keys included in the list are those that grant View
+          permission to the reading process whether or not it possesses them.
+          Note that LSM security checks are still performed, and may further
+          filter out keys that the current process is not authorised to view.
+
+          Only key attributes are listed here; key payloads are not included in
+          the resulting table.
+
+          If you are unsure as to whether this is required, answer N.
 
 config SECURITY_DMESG_RESTRICT
         bool "Restrict unprivileged access to the kernel syslog"
@@ -121,9 +185,9 @@ source security/selinux/Kconfig
 source security/smack/Kconfig
 source security/tomoyo/Kconfig
 source security/apparmor/Kconfig
-source security/yama/Kconfig
+source security/tf_driver/Kconfig
 
-source security/integrity/Kconfig
+source security/integrity/ima/Kconfig
 
 choice
         prompt "Default security module"
@@ -131,7 +195,6 @@ choice
         default DEFAULT_SECURITY_SMACK if SECURITY_SMACK
         default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO
         default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR
-        default DEFAULT_SECURITY_YAMA if SECURITY_YAMA
         default DEFAULT_SECURITY_DAC
 
         help
@@ -150,9 +213,6 @@ choice
         config DEFAULT_SECURITY_APPARMOR
                 bool "AppArmor" if SECURITY_APPARMOR=y
 
-        config DEFAULT_SECURITY_YAMA
-                bool "Yama" if SECURITY_YAMA=y
-
         config DEFAULT_SECURITY_DAC
                 bool "Unix Discretionary Access Controls"
 
@@ -164,7 +224,6 @@ config DEFAULT_SECURITY
         default "smack" if DEFAULT_SECURITY_SMACK
         default "tomoyo" if DEFAULT_SECURITY_TOMOYO
         default "apparmor" if DEFAULT_SECURITY_APPARMOR
-        default "yama" if DEFAULT_SECURITY_YAMA
         default "" if DEFAULT_SECURITY_DAC
 
 endmenu