diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-05 20:57:26 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-05 20:57:26 +0000 |
| commit | e57f5905980c9e6967fc5ee16cb91aede3c0654e (patch) | |
| tree | 756963c8716d0858c05abb7f15e0352eb16f1fbe /sbin | |
| parent | 2033d1df43a836388649e5cc4a6e8d23cc4956e1 (diff) | |
Merge with EOM 1.2
Inconsistent proposals (wrt groups) not allowed.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/samples/singlehost-east.conf | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/singlehost-west.conf | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sbin/isakmpd/samples/singlehost-east.conf b/sbin/isakmpd/samples/singlehost-east.conf index ab6f3f83639..bac9f34666c 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.1 1999/03/31 23:45:51 niklas Exp $ -# $EOM: singlehost-east.conf,v 1.1 1999/03/31 23:36:51 niklas Exp $ +# $OpenBSD: singlehost-east.conf,v 1.2 1999/04/05 20:57:13 niklas Exp $ +# $EOM: singlehost-east.conf,v 1.2 1999/04/05 18:32:48 niklas Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -131,7 +131,7 @@ Life= LIFE_600_SECS,LIFE_1000_KB [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE,QM-ESP-DES-MD5-SUITE +Suites= QM-ESP-3DES-SHA-PFS-SUITE,QM-ESP-DES-MD5-PFS-SUITE # Quick mode protection suites ############################## @@ -245,7 +245,7 @@ Life= LIFE_600_SECS [QM-ESP-DES-MD5-PFS-XF] TRANSFORM_ID= DES ENCAPSULATION_MODE= TUNNEL -GROUP_DESCRIPTION= MODP_768 +GROUP_DESCRIPTION= MODP_1024 AUTHENTICATION_ALGORITHM= HMAC_MD5 Life= LIFE_600_SECS diff --git a/sbin/isakmpd/samples/singlehost-west.conf b/sbin/isakmpd/samples/singlehost-west.conf index 2477c9efb7d..0cce7fd092d 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.1 1999/03/31 23:45:53 niklas Exp $ -# $EOM: singlehost-west.conf,v 1.1 1999/03/31 23:36:52 niklas Exp $ +# $OpenBSD: singlehost-west.conf,v 1.2 1999/04/05 20:57:25 niklas Exp $ +# $EOM: singlehost-west.conf,v 1.2 1999/04/05 18:32:49 niklas Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -131,7 +131,7 @@ Life= LIFE_600_SECS,LIFE_1000_KB [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE,QM-ESP-DES-MD5-SUITE +Suites= QM-ESP-3DES-SHA-PFS-SUITE,QM-ESP-DES-MD5-PFS-SUITE # Quick mode protection suites ############################## @@ -245,7 +245,7 @@ Life= LIFE_600_SECS [QM-ESP-DES-MD5-PFS-XF] TRANSFORM_ID= DES ENCAPSULATION_MODE= TUNNEL -GROUP_DESCRIPTION= MODP_768 +GROUP_DESCRIPTION= MODP_1024 AUTHENTICATION_ALGORITHM= HMAC_MD5 Life= LIFE_600_SECS |