summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/samples
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-07-18 09:33:34 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-07-18 09:33:34 +0000
commite8617bbad095b22f7f8198bbb4b26f099badf19a (patch)
tree7196763c3c07f42e255cd00b85440d9a397421bb /sbin/isakmpd/samples
parent36e47efa8388a27af2c3a68358405baebd7200ec (diff)
samples/VPN-east.conf: Merge with EOM 1.7
samples/VPN-west.conf: Merge with EOM 1.7 samples/singlehost-west.conf: Merge with EOM 1.4 samples/singlehost-east.conf: Merge with EOM 1.4 README.PKI: Merge with EOM 1.3 ike_auth.c: Merge with EOM 1.33 isakmpd.conf.5: Merge with EOM 1.28 author: niklas Moving the PRIVKEY tag into the X509-certificates section, renaming it to Private-key. Also rename the keynote policy file.
Diffstat (limited to 'sbin/isakmpd/samples')
-rw-r--r--sbin/isakmpd/samples/VPN-east.conf10
-rw-r--r--sbin/isakmpd/samples/VPN-west.conf10
-rw-r--r--sbin/isakmpd/samples/singlehost-east.conf10
-rw-r--r--sbin/isakmpd/samples/singlehost-west.conf10
4 files changed, 16 insertions, 24 deletions
diff --git a/sbin/isakmpd/samples/VPN-east.conf b/sbin/isakmpd/samples/VPN-east.conf
index f5a457a7982..7b19f84f77e 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.5 1999/07/17 21:54:38 niklas Exp $
-# $EOM: VPN-east.conf,v 1.6 1999/07/17 20:44:14 niklas Exp $
+# $OpenBSD: VPN-east.conf,v 1.6 1999/07/18 09:33:33 niklas Exp $
+# $EOM: VPN-east.conf,v 1.7 1999/07/18 09:25:34 niklas Exp $
# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
@@ -313,7 +313,5 @@ LIFE_DURATION= 4608000,4096000:8192000
[X509-certificates]
CA-directory= /etc/isakmpd/ca/
Cert-directory= /etc/isakmpd/certs/
-#Accept-self-signed=
-
-[RSA_SIG]
-PRIVKEY= /etc/isakmpd/private/local.key
+#Accept-self-signed= defined
+Private-key= /etc/isakmpd/private/local.key
diff --git a/sbin/isakmpd/samples/VPN-west.conf b/sbin/isakmpd/samples/VPN-west.conf
index c4ff9e69c49..7c93bad83ff 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.5 1999/07/17 21:54:38 niklas Exp $
-# $EOM: VPN-west.conf,v 1.6 1999/07/17 20:44:14 niklas Exp $
+# $OpenBSD: VPN-west.conf,v 1.6 1999/07/18 09:33:33 niklas Exp $
+# $EOM: VPN-west.conf,v 1.7 1999/07/18 09:25:34 niklas Exp $
# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
@@ -313,7 +313,5 @@ LIFE_DURATION= 4608000,4096000:8192000
[X509-certificates]
CA-directory= /etc/isakmpd/ca/
Cert-directory= /etc/isakmpd/certs/
-#Accept-self-signed=
-
-[RSA_SIG]
-PRIVKEY= /etc/isakmpd/private/local.key
+#Accept-self-signed= defined
+Private-key= /etc/isakmpd/private/local.key
diff --git a/sbin/isakmpd/samples/singlehost-east.conf b/sbin/isakmpd/samples/singlehost-east.conf
index 3c7263b4a59..3b115a385d0 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.3 1999/07/17 21:54:38 niklas Exp $
-# $EOM: singlehost-east.conf,v 1.3 1999/07/17 20:44:16 niklas Exp $
+# $OpenBSD: singlehost-east.conf,v 1.4 1999/07/18 09:33:33 niklas Exp $
+# $EOM: singlehost-east.conf,v 1.4 1999/07/18 09:25:34 niklas Exp $
# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
@@ -347,7 +347,5 @@ LIFE_DURATION= 4608000,4096000:8192000
[X509-certificates]
CA-directory= /etc/isakmpd/ca/
Cert-directory= /etc/isakmpd/certs/
-#Accept-self-signed=
-
-[RSA_SIG]
-PRIVKEY= /etc/isakmpd/private/local.key
+#Accept-self-signed= defined
+Private-key= /etc/isakmpd/private/local.key
diff --git a/sbin/isakmpd/samples/singlehost-west.conf b/sbin/isakmpd/samples/singlehost-west.conf
index ce501155355..4c101a59ad3 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.3 1999/07/17 21:54:38 niklas Exp $
-# $EOM: singlehost-west.conf,v 1.3 1999/07/17 20:44:16 niklas Exp $
+# $OpenBSD: singlehost-west.conf,v 1.4 1999/07/18 09:33:33 niklas Exp $
+# $EOM: singlehost-west.conf,v 1.4 1999/07/18 09:25:35 niklas Exp $
# A configuration sample for the isakmpd ISAKMP/Oakley (aka IKE) daemon.
@@ -349,7 +349,5 @@ LIFE_DURATION= 4608000,4096000:8192000
[X509-certificates]
CA-directory= /etc/isakmpd/ca/
Cert-directory= /etc/isakmpd/certs/
-#Accept-self-signed=
-
-[RSA_SIG]
-PRIVKEY= /etc/isakmpd/private/local.key
+#Accept-self-signed= defined
+Private-key= /etc/isakmpd/private/local.key