diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-31 10:45:04 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-31 10:45:04 +0000 |
commit | f16f98cca156de2491d704e205937575664b04c0 (patch) | |
tree | e9fb86ab05a50e710e5e14304d1efef7b86f7ea6 /sbin/isakmpd | |
parent | 3efedf8d8c1b96cac78e5f2b05bbb24019b0a0e0 (diff) |
samples/VPN-east.conf: Merge with EOM 1.10
samples/VPN-west.conf: Merge with EOM 1.10
samples/singlehost-east.conf: Merge with EOM 1.7
samples/singlehost-west.conf: Merge with EOM 1.7
author: niklas
Remove volume-based lifetimes on phase 1 SAs
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r-- | sbin/isakmpd/samples/VPN-east.conf | 16 | ||||
-rw-r--r-- | sbin/isakmpd/samples/VPN-west.conf | 16 | ||||
-rw-r--r-- | sbin/isakmpd/samples/singlehost-east.conf | 16 | ||||
-rw-r--r-- | sbin/isakmpd/samples/singlehost-west.conf | 16 |
4 files changed, 32 insertions, 32 deletions
diff --git a/sbin/isakmpd/samples/VPN-east.conf b/sbin/isakmpd/samples/VPN-east.conf index fca9eba595c..35a5d23a4fd 100644 --- a/sbin/isakmpd/samples/VPN-east.conf +++ b/sbin/isakmpd/samples/VPN-east.conf @@ -1,5 +1,5 @@ -# $OpenBSD: VPN-east.conf,v 1.8 2000/01/26 15:23:17 niklas Exp $ -# $EOM: VPN-east.conf,v 1.9 1999/12/08 20:34:14 niklas Exp $ +# $OpenBSD: VPN-east.conf,v 1.9 2000/01/31 10:45:02 niklas Exp $ +# $EOM: VPN-east.conf,v 1.10 2000/01/31 09:28:36 niklas Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -63,7 +63,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [DES-MD5-NO-VOL-LIFE] ENCRYPTION_ALGORITHM= DES_CBC @@ -77,7 +77,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # 3DES @@ -96,7 +96,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -104,7 +104,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-MD5-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -112,7 +112,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC185] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -120,7 +120,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_185 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # Quick mode description ######################## diff --git a/sbin/isakmpd/samples/VPN-west.conf b/sbin/isakmpd/samples/VPN-west.conf index 315369c5717..abbd9b980db 100644 --- a/sbin/isakmpd/samples/VPN-west.conf +++ b/sbin/isakmpd/samples/VPN-west.conf @@ -1,5 +1,5 @@ -# $OpenBSD: VPN-west.conf,v 1.8 2000/01/26 15:23:17 niklas Exp $ -# $EOM: VPN-west.conf,v 1.9 1999/12/08 20:34:14 niklas Exp $ +# $OpenBSD: VPN-west.conf,v 1.9 2000/01/31 10:45:02 niklas Exp $ +# $EOM: VPN-west.conf,v 1.10 2000/01/31 09:28:36 niklas Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -63,7 +63,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [DES-MD5-NO-VOL-LIFE] ENCRYPTION_ALGORITHM= DES_CBC @@ -77,7 +77,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # 3DES @@ -96,7 +96,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -104,7 +104,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-MD5-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -112,7 +112,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC185] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -120,7 +120,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_185 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # Quick mode description ######################## diff --git a/sbin/isakmpd/samples/singlehost-east.conf b/sbin/isakmpd/samples/singlehost-east.conf index 51c6121a642..0784bd91f5b 100644 --- a/sbin/isakmpd/samples/singlehost-east.conf +++ b/sbin/isakmpd/samples/singlehost-east.conf @@ -1,5 +1,5 @@ -# $OpenBSD: singlehost-east.conf,v 1.6 2000/01/26 15:23:16 niklas Exp $ -# $EOM: singlehost-east.conf,v 1.6 1999/12/08 20:34:15 niklas Exp $ +# $OpenBSD: singlehost-east.conf,v 1.7 2000/01/31 10:45:02 niklas Exp $ +# $EOM: singlehost-east.conf,v 1.7 2000/01/31 09:28:36 niklas Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -81,7 +81,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [DES-MD5-NO-VOL-LIFE] ENCRYPTION_ALGORITHM= DES_CBC @@ -95,7 +95,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # 3DES @@ -121,7 +121,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -129,7 +129,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-MD5-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -137,7 +137,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC185] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -145,7 +145,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_185 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # Quick mode description ######################## diff --git a/sbin/isakmpd/samples/singlehost-west.conf b/sbin/isakmpd/samples/singlehost-west.conf index f5e267764eb..783b96617f2 100644 --- a/sbin/isakmpd/samples/singlehost-west.conf +++ b/sbin/isakmpd/samples/singlehost-west.conf @@ -1,5 +1,5 @@ -# $OpenBSD: singlehost-west.conf,v 1.6 2000/01/26 15:23:16 niklas Exp $ -# $EOM: singlehost-west.conf,v 1.6 1999/12/08 20:34:15 niklas Exp $ +# $OpenBSD: singlehost-west.conf,v 1.7 2000/01/31 10:45:03 niklas Exp $ +# $EOM: singlehost-west.conf,v 1.7 2000/01/31 09:28:36 niklas Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -83,7 +83,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [DES-MD5-NO-VOL-LIFE] ENCRYPTION_ALGORITHM= DES_CBC @@ -97,7 +97,7 @@ ENCRYPTION_ALGORITHM= DES_CBC HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_768 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # 3DES @@ -123,7 +123,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= MODP_1024 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -131,7 +131,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-MD5-EC155] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -139,7 +139,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= MD5 AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_155 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS [BLF-SHA-EC185] ENCRYPTION_ALGORITHM= BLOWFISH_CBC @@ -147,7 +147,7 @@ KEY_LENGTH= 128,96:192 HASH_ALGORITHM= SHA AUTHENTICATION_METHOD= PRE_SHARED GROUP_DESCRIPTION= EC2N_185 -Life= LIFE_600_SECS,LIFE_1000_KB +Life= LIFE_600_SECS # Quick mode description ######################## |