Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index d6bc083..34f5934 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -4,8 +4,38 @@
 
 menu "Security options"
 
+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 KEYS_DEBUG_PROC_KEYS
+       bool "Enable the /proc/keys file by which all keys may be viewed"
+       depends on KEYS
+       help
+         This option turns on support for the /proc/keys file through which
+         all the keys on the system can be listed.
+
+         This option is a slight security risk in that it makes it possible
+         for anyone to see all the keys on the system. Normally the manager
+         pretends keys that are inaccessible to a process don't exist as far
+         as that process is concerned.
+
 config SECURITY
        bool "Enable different security models"
+       depends on SYSFS
        help
          This allows you to choose different security modules to be
          configured into your kernel.
@@ -24,16 +54,29 @@ config SECURITY_NETWORK
          implement socket and networking access controls.
          If you are unsure how to answer this question, answer N.
 
+config SECURITY_NETWORK_XFRM
+       bool "XFRM (IPSec) Networking Security Hooks"
+       depends on XFRM && SECURITY_NETWORK
+       help
+         This enables the XFRM (IPSec) networking security hooks.
+         If enabled, a security module can use these hooks to
+         implement per-packet access controls based on labels
+         derived from IPSec policy.  Non-IPSec communications are
+         designated as unlabelled, and only sockets authorized
+         to communicate unlabelled data can send without using
+         IPSec.
+         If you are unsure how to answer this question, answer N.
+
 config SECURITY_CAPABILITIES
        tristate "Default Linux Capabilities"
-       depends on SECURITY!=n
+       depends on SECURITY
        help
          This enables the "default" Linux capabilities functionality.
          If you are unsure how to answer this question, answer Y.
 
 config SECURITY_ROOTPLUG
        tristate "Root Plug Support"
-       depends on USB && SECURITY!=n
+       depends on USB && SECURITY
        help
          This is a sample LSM module that should only be used as such.
          It prevents any programs running with egid == 0 if a specific
@@ -44,6 +87,18 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
+config SECURITY_SECLVL
+       tristate "BSD Secure Levels"
+       depends on SECURITY
+       select CRYPTO
+       select CRYPTO_SHA1
+       help
+         Implements BSD Secure Levels as an LSM.  See
+         <file:Documentation/seclvl.txt> for instructions on how to use this
+         module.
+
+         If you are unsure how to answer this question, answer N.
+
 source security/selinux/Kconfig
 
 endmenu