summaryrefslogtreecommitdiffstats
path: root/sys/conf/NOTES
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2007-07-03 12:13:45 +0000
committergnn <gnn@FreeBSD.org>2007-07-03 12:13:45 +0000
commitaeca69ded51d6233029432f2819670cdedc399fa (patch)
tree33a53f093fb66f940c2ed2dd7aab6c80eeaeafce /sys/conf/NOTES
parentd5177fc84ed40844713b6dc0352469ffbb12e526 (diff)
downloadFreeBSD-src-aeca69ded51d6233029432f2819670cdedc399fa.zip
FreeBSD-src-aeca69ded51d6233029432f2819670cdedc399fa.tar.gz
Commit the change from FAST_IPSEC to IPSEC. The FAST_IPSEC
option is now deprecated, as well as the KAME IPsec code. What was FAST_IPSEC is now IPSEC. Approved by: re Sponsored by: Secure Computing
Diffstat (limited to 'sys/conf/NOTES')
-rw-r--r--sys/conf/NOTES13
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 665145c..d5f6bc5 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -495,8 +495,7 @@ options HWPMC_HOOKS # Other necessary kernel hooks
#
options INET #Internet communications protocols
options INET6 #IPv6 communications protocols
-#options IPSEC #IP security
-#options IPSEC_ESP #IP security (crypto; define w/ IPSEC)
+options IPSEC #IP security
#options IPSEC_DEBUG #debug for IP security
#
# Set IPSEC_FILTERGIF to force packets coming through a gif tunnel
@@ -509,8 +508,6 @@ options INET6 #IPv6 communications protocols
#
#options IPSEC_FILTERGIF #filter ipsec packets from a tunnel
-options FAST_IPSEC #new IPsec (cannot define w/ IPSEC)
-
options IPX #IPX/SPX communications protocols
options NCP #NetWare Core protocol
@@ -786,7 +783,7 @@ device pflog #logging support interface for PF
device pfsync #synchronization interface for PF
options PF_MPSAFE_UGID #Workaround LOR with user/group rules
device carp #Common Address Redundancy Protocol
-device enc #IPSec interface (needs FAST_IPSEC)
+device enc #IPsec interface
device ppp #Point-to-point protocol
options PPP_BSDCOMP #PPP BSD-compress support
options PPP_DEFLATE #PPP zlib/deflate/gzip support
@@ -880,8 +877,8 @@ options ACCEPT_FILTER_HTTP
# carried in TCP option 19. This option is commonly used to protect
# TCP sessions (e.g. BGP) where IPSEC is not available nor desirable.
# This is enabled on a per-socket basis using the TCP_MD5SIG socket option.
-# This requires the use of 'device crypto', 'options FAST_IPSEC' or 'options
-# IPSEC', and 'device cryptodev'.
+# This requires the use of 'device crypto', 'options IPSEC'
+# or 'device cryptodev'.
#options TCP_SIGNATURE #include support for RFC 2385
# DUMMYNET enables the "dummynet" bandwidth limiter. You need IPFIREWALL
@@ -2513,7 +2510,7 @@ options DCONS_FORCE_GDB=1 # force to be the gdb device
# crypto subsystem
#
# This is a port of the OpenBSD crypto framework. Include this when
-# configuring FAST_IPSEC and when you have a h/w crypto device to accelerate
+# configuring IPSEC and when you have a h/w crypto device to accelerate
# user applications that link to OpenSSL.
#
# Drivers are ports from OpenBSD with some simple enhancements that have
OpenPOWER on IntegriCloud