summaryrefslogtreecommitdiffstats
path: root/security/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-07 15:40:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 15:40:05 +0100
commit123656d4cc8c946f578ebd18c2050f5251720428 (patch)
tree3d5432eff034a3b9cfdc98b37e245abe5695342d /security/Kconfig
parent[ARM] Move AMBA include files to include/linux/amba/ (diff)
parent[PATCH] Fix posix-cpu-timers sched_time accumulation (diff)
downloadlinux-123656d4cc8c946f578ebd18c2050f5251720428.tar.xz
linux-123656d4cc8c946f578ebd18c2050f5251720428.zip
Merge with Linus' kernel.
Diffstat (limited to 'security/Kconfig')
-rw-r--r--security/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 64d3f1e9ca85..34f593410d57 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -54,6 +54,19 @@ 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