diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:23:18 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:23:18 +0000 |
| commit | fef6946559516a458ed226e53a2e5fb607ce61a0 (patch) | |
| tree | 721a1c3e728e08459ba32d3868eee7446f6794db /sbin | |
| parent | 1aa89f71ba996c7e3fbbb268c707e7efb251932a (diff) | |
samples/singlehost-east.conf: Merge with EOM 1.6
samples/singlehost-west.conf: Merge with EOM 1.6
samples/VPN-west.conf: Merge with EOM 1.9
samples/VPN-east.conf: Merge with EOM 1.9
author: niklas
Remove deprecated stayalive flags
author: niklas
Correct AH transform attributes
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/samples/VPN-east.conf | 7 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/VPN-west.conf | 7 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/singlehost-east.conf | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/singlehost-west.conf | 8 |
4 files changed, 12 insertions, 18 deletions
diff --git a/sbin/isakmpd/samples/VPN-east.conf b/sbin/isakmpd/samples/VPN-east.conf index 3e094b3c90e..fca9eba595c 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.7 1999/10/29 07:46:04 todd Exp $ -# $EOM: VPN-east.conf,v 1.7 1999/07/18 09:25:34 niklas Exp $ +# $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 $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -28,7 +28,6 @@ Address= 10.1.0.1 #Port= 500 Configuration= Default-main-mode Authentication= mekmitasdigoat -#Flags= [IPsec-east-west] Phase= 2 @@ -36,7 +35,6 @@ ISAKMP-peer= ISAKMP-peer-west Configuration= Default-quick-mode Local-ID= Net-east Remote-ID= Net-west -#Flags= [Net-west] ID-type= IPV4_ADDR_SUBNET @@ -286,6 +284,7 @@ Life= LIFE_600_SECS [QM-AH-MD5-PFS-XF] TRANSFORM_ID= MD5 ENCAPSULATION_MODE= TUNNEL +AUTHENTICATION_ALGORITHM= HMAC_MD5 GROUP_DESCRIPTION= MODP_768 Life= LIFE_600_SECS diff --git a/sbin/isakmpd/samples/VPN-west.conf b/sbin/isakmpd/samples/VPN-west.conf index 9ce634be824..315369c5717 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.7 1999/10/29 07:46:04 todd Exp $ -# $EOM: VPN-west.conf,v 1.7 1999/07/18 09:25:34 niklas Exp $ +# $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 $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -28,7 +28,6 @@ Address= 10.1.0.2 #Port= 500 Configuration= Default-main-mode Authentication= mekmitasdigoat -#Flags= [IPsec-west-east] Phase= 2 @@ -36,7 +35,6 @@ ISAKMP-peer= ISAKMP-peer-east Configuration= Default-quick-mode Local-ID= Net-west Remote-ID= Net-east -#Flags= [Net-west] ID-type= IPV4_ADDR_SUBNET @@ -287,6 +285,7 @@ Life= LIFE_600_SECS TRANSFORM_ID= MD5 ENCAPSULATION_MODE= TUNNEL GROUP_DESCRIPTION= MODP_768 +AUTHENTICATION_ALGORITHM= HMAC_MD5 Life= LIFE_600_SECS [LIFE_600_SECS] diff --git a/sbin/isakmpd/samples/singlehost-east.conf b/sbin/isakmpd/samples/singlehost-east.conf index d7f67c8ae1e..51c6121a642 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.5 1999/10/29 07:46:04 todd Exp $ -# $EOM: singlehost-east.conf,v 1.4 1999/07/18 09:25:34 niklas Exp $ +# $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 $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -30,7 +30,6 @@ Address= 10.1.0.1 #Port= 500 Configuration= Default-main-mode Authentication= mekmitasdigoat -#Flags= [ISAKMP-peer-west-aggressive] Phase= 1 @@ -42,7 +41,6 @@ Address= 10.1.0.1 #Port= 500 Configuration= Default-aggressive-mode Authentication= mekmitasdigoat -#Flags= [IPsec-east-west] Phase= 2 @@ -50,7 +48,6 @@ ISAKMP-peer= ISAKMP-peer-west Configuration= Default-quick-mode Local-ID= Net-east Remote-ID= Net-west -#Flags= [Net-west] ID-type= IPV4_ADDR_SUBNET @@ -313,6 +310,7 @@ Life= LIFE_600_SECS TRANSFORM_ID= MD5 ENCAPSULATION_MODE= TUNNEL GROUP_DESCRIPTION= MODP_768 +AUTHENTICATION_ALGORITHM= HMAC_MD5 Life= LIFE_600_SECS [LIFE_60_SECS] diff --git a/sbin/isakmpd/samples/singlehost-west.conf b/sbin/isakmpd/samples/singlehost-west.conf index 309950a2027..f5e267764eb 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.5 1999/10/29 07:46:04 todd Exp $ -# $EOM: singlehost-west.conf,v 1.4 1999/07/18 09:25:35 niklas Exp $ +# $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 $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -31,7 +31,6 @@ Address= 10.1.0.2 Configuration= Default-main-mode Identification= IPV4_ADDR/10.1.0.1 Authentication= mekmitasdigoat -#Flags= [ISAKMP-peer-east-aggressive] Phase= 1 @@ -44,7 +43,6 @@ Address= 10.1.0.2 Configuration= Default-aggressive-mode Identification= FQDN/diego.niklas.hallqvist.se Authentication= mekmitasdigoat -#Flags= [IPsec-west-east] Phase= 2 @@ -52,7 +50,6 @@ ISAKMP-peer= ISAKMP-peer-east Configuration= Default-quick-mode Local-ID= Net-west Remote-ID= Net-east -#Flags= [Net-west] ID-type= IPV4_ADDR_SUBNET @@ -315,6 +312,7 @@ Life= LIFE_600_SECS TRANSFORM_ID= MD5 ENCAPSULATION_MODE= TUNNEL GROUP_DESCRIPTION= MODP_768 +AUTHENTICATION_ALGORITHM= HMAC_MD5 Life= LIFE_600_SECS [LIFE_60_SECS] |