Module Name: src
Committed By: christos
Date: Wed Jun 5 23:08:10 UTC 2013
Modified Files:
src/share/man/man4: fast_ipsec.4 options.4
Log Message:
reflect current reality.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/fast_ipsec.4
cvs rdiff -u -r1.422 -r1.423 src/share/man/man4/options.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/fast_ipsec.4
diff -u src/share/man/man4/fast_ipsec.4:1.13 src/share/man/man4/fast_ipsec.4:1.14
--- src/share/man/man4/fast_ipsec.4:1.13 Thu Mar 22 16:34:38 2012
+++ src/share/man/man4/fast_ipsec.4 Wed Jun 5 19:08:10 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: fast_ipsec.4,v 1.13 2012/03/22 20:34:38 drochner Exp $
+.\" $NetBSD: fast_ipsec.4,v 1.14 2013/06/05 23:08:10 christos Exp $
.\" $FreeBSD: fast_ipsec.4,v 1.2 2003/03/03 11:51:30 ru Exp $
.\"
.\" Copyright (c) 2004
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 23, 2012
+.Dd June 5, 2013
.Dt FAST_IPSEC 4
.Os
.Sh NAME
@@ -37,7 +37,6 @@
.Sh SYNOPSIS
.Cd "options IPSEC"
.Cd "options IPSEC_DEBUG"
-.Cd "options IPSEC_NAT_T"
.Sh DESCRIPTION
.Tn IPsec
is a set of protocols,
@@ -106,9 +105,8 @@ Support for IPv6 and
protocols has been added in
.Nx 4.0 .
.Pp
-Support for IPSEC_NAT_T
-(Network Address Translator Traversal as
-described in RFCs 3947 and 3948) has been added in
+Support Network Address Translator Traversal as
+described in RFCs 3947 and 3948 has been added in
.Nx 5.0 .
.Sh BUGS
Certain legacy authentication algorithms are not supported because of
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.422 src/share/man/man4/options.4:1.423
--- src/share/man/man4/options.4:1.422 Tue Jun 4 21:01:57 2013
+++ src/share/man/man4/options.4 Wed Jun 5 19:08:09 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.422 2013/06/05 01:01:57 christos Exp $
+.\" $NetBSD: options.4,v 1.423 2013/06/05 23:08:09 christos Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd June 4, 2013
+.Dd June 5, 2013
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -1674,13 +1674,14 @@ for details.
.It Cd options IPSEC
Includes support for the
.Tn IPsec
-protocol, using the FAST_IPSEC implementation.
+protocol, using the implementation derived from
+.Ox ,
+relaying on
+.Xr opencrypto 9
+to carry out cryptographic operations.
See
.Xr fast_ipsec 4
for details.
-(This option is an alias for the
-.Cd FAST_IPSEC
-option described below.)
.It Cd options IPSEC_DEBUG
Enables debugging code in
.Tn IPsec
@@ -1688,19 +1689,8 @@ stack.
See
.Xr ipsec 4
for details.
-.It Cd options FAST_IPSEC
-Includes support for the
-.Tn IPsec
-protocol, using the implementation derived from
-.Ox ,
-relaying on
-.Xr opencrypto 9
-to carry out cryptographic operations.
-See
-.Xr fast_ipsec 4
-for details.
The
-.Cd FAST_IPSEC
+.Cd IPSEC
option includes support for
.Tn IPsec
Network Address Translator traversal (NAT-T), as described in RFCs 3947
