summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2013-05-22 10:32:10 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2013-05-22 10:32:10 +0000
commitd6d11472b8c769934ed377de639655482e63b577 (patch)
tree84e740e16ce7e5bf762ccfde63b3d3cfbb6a48f9
parenta4022b62ab69b797d7ddf08805ae3e01b9693f5e (diff)
Move the gmac/null ciphers to a different table block, clearly labelled as
not doing encryption. ok reyk@
-rw-r--r--sbin/iked/iked.conf.513
1 files changed, 9 insertions, 4 deletions
diff --git a/sbin/iked/iked.conf.5 b/sbin/iked/iked.conf.5
index c915ee04f08..bea3b784887 100644
--- a/sbin/iked/iked.conf.5
+++ b/sbin/iked/iked.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iked.conf.5,v 1.23 2013/03/05 19:16:01 sobrado Exp $
+.\" $OpenBSD: iked.conf.5,v 1.24 2013/05/22 10:32:09 sthen Exp $
.\"
.\" Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
.\" Copyright (c) 2004 Mathieu Sauve-Frankel All rights reserved.
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 5 2013 $
+.Dd $Mdocdate: May 22 2013 $
.Dt IKED.CONF 5
.Os
.Sh NAME
@@ -720,11 +720,16 @@ keyword:
.It Li aes-128-gcm Ta "160 bits" Ta "[ESP only]"
.It Li aes-192-gcm Ta "224 bits" Ta "[ESP only]"
.It Li aes-256-gcm Ta "288 bits" Ta "[ESP only]"
+.It Li blowfish Ta "160 bits" Ta "[ESP only]"
+.It Li cast Ta "128 bits" Ta "[ESP only]"
+.El
+.Pp
+The following cipher types provide only authentication,
+not encryption:
+.Bl -column "aes-128-gmac" "Key Length" "[ESP only]" -offset indent
.It Li aes-128-gmac Ta "160 bits" Ta "[ESP only]"
.It Li aes-192-gmac Ta "224 bits" Ta "[ESP only]"
.It Li aes-256-gmac Ta "288 bits" Ta "[ESP only]"
-.It Li blowfish Ta "160 bits" Ta "[ESP only]"
-.It Li cast Ta "128 bits" Ta "[ESP only]"
.It Li null Ta "" Ta "[ESP only]"
.El
.Pp