diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2007-03-18 22:31:41 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2007-03-18 22:31:41 +0000 |
| commit | a3b2bc233c6ffd7d22279937dc8da3ab4077a3d9 (patch) | |
| tree | a9644deba35532209d8e297ddc04f706823c24bd /sbin | |
| parent | a6a65388e2ee28eba6545ea5860d306b186d37ed (diff) | |
Fix usage of predefined lifetimes. "Default-phase-[12]-lifetime"
just specifies the values to be used. However, the specifications
are called "LIFE_MAIN_MODE" and "LIFE_QUICK_MODE".
ok ho@ jmc@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/isakmpd.conf.5 | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5 index 28b83eb6924..21667bbac56 100644 --- a/sbin/isakmpd/isakmpd.conf.5 +++ b/sbin/isakmpd/isakmpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: isakmpd.conf.5,v 1.121 2007/02/19 14:17:56 jmc Exp $ +.\" $OpenBSD: isakmpd.conf.5,v 1.122 2007/03/18 22:31:40 hshoexer Exp $ .\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $ .\" .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -1033,14 +1033,14 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-1-lifetime +Life= LIFE_MAIN_MODE [DES-SHA] ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-1-lifetime +Life= LIFE_MAIN_MODE # 3DES @@ -1049,7 +1049,7 @@ ENCRYPTION_ALGORITHM= 3DES_CBC HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-1-lifetime +Life= LIFE_MAIN_MODE # AES @@ -1059,7 +1059,7 @@ KEY_LENGTH= 128,128:256 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-1-lifetime +Life= LIFE_MAIN_MODE # Blowfish @@ -1069,7 +1069,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-1-lifetime +Life= LIFE_MAIN_MODE # Blowfish, using DH group 4 (non-default) [BLF-SHA-EC185] @@ -1078,7 +1078,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_185 -Life= Default-phase-1-lifetime +Life= LIFE_MAIN_MODE # Quick mode protection suites ############################## @@ -1203,26 +1203,26 @@ Transforms= QM-AH-MD5-PFS-XF [QM-ESP-DES-XF] TRANSFORM_ID= DES ENCAPSULATION_MODE= TUNNEL -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-DES-MD5-XF] TRANSFORM_ID= DES ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_MD5 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-DES-MD5-PFS-XF] TRANSFORM_ID= DES ENCAPSULATION_MODE= TUNNEL GROUP_DESCRIPTION= MODP_1024 AUTHENTICATION_ALGORITHM= HMAC_MD5 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-DES-SHA-XF] TRANSFORM_ID= DES ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_SHA -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE # 3DES @@ -1230,20 +1230,20 @@ Life= Default-phase-2-lifetime TRANSFORM_ID= 3DES ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_SHA -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-3DES-SHA-PFS-XF] TRANSFORM_ID= 3DES ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_SHA GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-3DES-SHA-TRP-XF] TRANSFORM_ID= 3DES ENCAPSULATION_MODE= TRANSPORT AUTHENTICATION_ALGORITHM= HMAC_SHA -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE # AES @@ -1252,7 +1252,7 @@ TRANSFORM_ID= AES ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_SHA KEY_LENGTH= 128 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-AES-SHA-PFS-XF] TRANSFORM_ID= AES @@ -1260,14 +1260,14 @@ ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_SHA GROUP_DESCRIPTION= MODP_1024 KEY_LENGTH= 128 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-ESP-AES-SHA-TRP-XF] TRANSFORM_ID= AES ENCAPSULATION_MODE= TRANSPORT AUTHENTICATION_ALGORITHM= HMAC_SHA KEY_LENGTH= 128 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE # AH @@ -1275,13 +1275,13 @@ Life= Default-phase-2-lifetime TRANSFORM_ID= MD5 ENCAPSULATION_MODE= TUNNEL AUTHENTICATION_ALGORITHM= HMAC_MD5 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [QM-AH-MD5-PFS-XF] TRANSFORM_ID= MD5 ENCAPSULATION_MODE= TUNNEL GROUP_DESCRIPTION= MODP_1024 -Life= Default-phase-2-lifetime +Life= LIFE_QUICK_MODE [Sample-Life-Time] LIFE_TYPE= SECONDS |