diff options
Diffstat (limited to 'sbin/isakmpd/samples')
| -rw-r--r-- | sbin/isakmpd/samples/VPN-3way-template.conf | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/VPN-east.conf | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/VPN-west.conf | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/policy | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/singlehost-east.conf | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/samples/singlehost-west.conf | 7 |
6 files changed, 20 insertions, 19 deletions
diff --git a/sbin/isakmpd/samples/VPN-3way-template.conf b/sbin/isakmpd/samples/VPN-3way-template.conf index f1cab8b2bed..72e7d25cad1 100644 --- a/sbin/isakmpd/samples/VPN-3way-template.conf +++ b/sbin/isakmpd/samples/VPN-3way-template.conf @@ -1,5 +1,5 @@ -# $OpenBSD: VPN-3way-template.conf,v 1.6 2000/05/02 14:37:06 niklas Exp $ -# $EOM: VPN-3way-template.conf,v 1.7 2000/05/01 22:58:44 ho Exp $ +# $OpenBSD: VPN-3way-template.conf,v 1.7 2000/10/09 23:27:29 niklas Exp $ +# $EOM: VPN-3way-template.conf,v 1.8 2000/10/09 22:08:30 angelos Exp $ # # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. # @@ -106,7 +106,7 @@ Transforms= BLF-SHA-M1024 [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE +Suites= QM-ESP-AES-SHA-PFS-SUITE [Blowfish-quick-mode] DOI= IPSEC diff --git a/sbin/isakmpd/samples/VPN-east.conf b/sbin/isakmpd/samples/VPN-east.conf index e174cfe801b..475e9ae2e75 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.10 2000/05/02 14:35:19 niklas Exp $ -# $EOM: VPN-east.conf,v 1.11 2000/05/01 20:57:54 niklas Exp $ +# $OpenBSD: VPN-east.conf,v 1.11 2000/10/09 23:27:29 niklas Exp $ +# $EOM: VPN-east.conf,v 1.12 2000/10/09 22:08:30 angelos Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. # @@ -47,4 +47,4 @@ Transforms= 3DES-SHA [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE +Suites= QM-ESP-AES-SHA-PFS-SUITE diff --git a/sbin/isakmpd/samples/VPN-west.conf b/sbin/isakmpd/samples/VPN-west.conf index 99e0d9a5c07..a5240e9fdcb 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.10 2000/05/02 14:37:12 niklas Exp $ -# $EOM: VPN-west.conf,v 1.12 2000/05/01 23:49:35 niklas Exp $ +# $OpenBSD: VPN-west.conf,v 1.11 2000/10/09 23:27:29 niklas Exp $ +# $EOM: VPN-west.conf,v 1.13 2000/10/09 22:08:30 angelos Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. # @@ -47,4 +47,4 @@ Transforms= 3DES-SHA [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE +Suites= QM-ESP-AES-SHA-PFS-SUITE diff --git a/sbin/isakmpd/samples/policy b/sbin/isakmpd/samples/policy index 96548543edb..7ae8e94c4ff 100644 --- a/sbin/isakmpd/samples/policy +++ b/sbin/isakmpd/samples/policy @@ -1,8 +1,10 @@ KeyNote-Version: 2 Comment: This policy accepts ESP SAs from a remote that uses the right password - $OpenBSD: policy,v 1.4 2000/01/26 15:20:40 niklas Exp $ - $EOM: policy,v 1.5 2000/01/26 14:03:07 niklas Exp $ + $OpenBSD: policy,v 1.5 2000/10/09 23:27:29 niklas Exp $ + $EOM: policy,v 1.6 2000/10/09 22:08:30 angelos Exp $ Authorizer: "POLICY" Licensees: "passphrase:mekmitasdigoat" Conditions: app_domain == "IPsec policy" && - esp_present == "yes" -> "true"; + esp_present == "yes" && + esp_enc_alg == "aes" && + esp_auth_alg == "sha" -> "true"; diff --git a/sbin/isakmpd/samples/singlehost-east.conf b/sbin/isakmpd/samples/singlehost-east.conf index 7e27a288164..3551233ea94 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.8 2000/05/03 13:37:33 niklas Exp $ -# $EOM: singlehost-east.conf,v 1.8 2000/05/03 13:25:25 niklas Exp $ +# $OpenBSD: singlehost-east.conf,v 1.9 2000/10/09 23:27:30 niklas Exp $ +# $EOM: singlehost-east.conf,v 1.9 2000/10/09 22:08:30 angelos Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -60,4 +60,4 @@ Transforms= 3DES-SHA-RSA [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE +Suites= QM-ESP-AES-SHA-PFS-SUITE diff --git a/sbin/isakmpd/samples/singlehost-west.conf b/sbin/isakmpd/samples/singlehost-west.conf index ee1d91bc48e..94e5b720a69 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.8 2000/05/03 13:37:33 niklas Exp $ -# $EOM: singlehost-west.conf,v 1.8 2000/05/03 13:25:25 niklas Exp $ +# $OpenBSD: singlehost-west.conf,v 1.9 2000/10/09 23:27:30 niklas Exp $ +# $EOM: singlehost-west.conf,v 1.9 2000/10/09 22:08:30 angelos Exp $ # A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon. @@ -29,7 +29,6 @@ Transport= udp Local-address= 10.1.0.1 Address= 10.1.0.2 Configuration= Default-aggressive-mode -Identification= FQDN/diego.niklas.hallqvist.se Authentication= mekmitasdigoat [IPsec-west-east] @@ -62,4 +61,4 @@ Transforms= 3DES-SHA-RSA [Default-quick-mode] DOI= IPSEC EXCHANGE_TYPE= QUICK_MODE -Suites= QM-ESP-3DES-SHA-PFS-SUITE +Suites= QM-ESP-AES-SHA-PFS-SUITE |