features/policy: Merge with EOM 1.4

features/ec: Merge with EOM 1.3
features/aggressive: Merge with EOM 1.3
features/x509: Merge with EOM 1.4

author: niklas
License change

4 files changed, 12 insertions, 24 deletions

diff --git a/sbin/isakmpd/features/aggressive b/sbin/isakmpd/features/aggressive
index a2c9e86ad60..f9d78dfd67a 100644
--- a/sbin/isakmpd/features/aggressive
+++ b/sbin/isakmpd/features/aggressive
@@ -1,5 +1,5 @@
-#	$OpenBSD: aggressive,v 1.2 2000/02/20 16:30:37 niklas Exp $
-#	$EOM: aggressive,v 1.2 2000/02/19 08:22:56 niklas Exp $
+#	$OpenBSD: aggressive,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$EOM: aggressive,v 1.3 2000/02/20 16:38:15 niklas Exp $
 
 #
 # Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
@@ -12,10 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
+# 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/sbin/isakmpd/features/ec b/sbin/isakmpd/features/ec
index a12041b4707..80f1fcd1ddc 100644
--- a/sbin/isakmpd/features/ec
+++ b/sbin/isakmpd/features/ec
@@ -1,5 +1,5 @@
-#	$OpenBSD: ec,v 1.2 2000/02/20 16:30:37 niklas Exp $
-#	$EOM: ec,v 1.2 2000/02/19 08:22:56 niklas Exp $
+#	$OpenBSD: ec,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$EOM: ec,v 1.3 2000/02/20 16:38:15 niklas Exp $
 
 #
 # Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
@@ -12,10 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
+# 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/sbin/isakmpd/features/policy b/sbin/isakmpd/features/policy
index 96046750737..e0afaae3403 100644
--- a/sbin/isakmpd/features/policy
+++ b/sbin/isakmpd/features/policy
@@ -1,5 +1,5 @@
-#	$OpenBSD: policy,v 1.2 2000/02/20 16:30:29 niklas Exp $
-#	$EOM: policy,v 1.3 2000/02/20 16:27:50 niklas Exp $
+#	$OpenBSD: policy,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$EOM: policy,v 1.4 2000/02/20 16:38:15 niklas Exp $
 
 #
 # Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
@@ -12,10 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
+# 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/sbin/isakmpd/features/x509 b/sbin/isakmpd/features/x509
index 2dc31a6577f..53e52e2fe5d 100644
--- a/sbin/isakmpd/features/x509
+++ b/sbin/isakmpd/features/x509
@@ -1,5 +1,5 @@
-#	$OpenBSD: x509,v 1.2 2000/02/20 16:30:29 niklas Exp $
-#	$EOM: x509,v 1.3 2000/02/20 16:27:50 niklas Exp $
+#	$OpenBSD: x509,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$EOM: x509,v 1.4 2000/02/20 16:38:15 niklas Exp $
 
 #
 # Copyright (c) 2000 Niklas Hallqvist.  All rights reserved.
@@ -12,10 +12,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Ericsson Radio Systems.
-# 4. The name of the author may not be used to endorse or promote products
+# 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR