Remove clauses 3 and 4. Approved by Niklas Hallqvist and Niels Provos.

4 files changed, 4 insertions, 24 deletions

diff --git a/sbin/isakmpd/sysdep/common/blf.h b/sbin/isakmpd/sysdep/common/blf.h
index c806c8fd945..97eec8923b5 100644
--- a/sbin/isakmpd/sysdep/common/blf.h
+++ b/sbin/isakmpd/sysdep/common/blf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: blf.h,v 1.4 2003/03/14 14:49:08 ho Exp $ */
+/* $OpenBSD: blf.h,v 1.5 2003/06/03 14:52:06 ho Exp $ */
 /*
  * Blowfish - a fast block cipher designed by Bruce Schneier
  *
@@ -13,11 +13,6 @@
  * 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 Niels Provos.
- * 4. 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
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile b/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile
index 23df20d66a5..3b623283a1f 100644
--- a/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile
+++ b/sbin/isakmpd/sysdep/common/libsysdep/GNUmakefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: GNUmakefile,v 1.3 2002/09/03 18:40:18 markus Exp $
+#	$OpenBSD: GNUmakefile,v 1.4 2003/06/03 14:52:06 ho Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -11,11 +11,6 @@
 # 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
-#    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/Makefile b/sbin/isakmpd/sysdep/common/libsysdep/Makefile
index 9f80a24ee2b..fce68d3a8c3 100644
--- a/sbin/isakmpd/sysdep/common/libsysdep/Makefile
+++ b/sbin/isakmpd/sysdep/common/libsysdep/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2002/09/03 18:40:18 markus Exp $
+#	$OpenBSD: Makefile,v 1.4 2003/06/03 14:52:06 ho Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -11,11 +11,6 @@
 # 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
-#    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c b/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c
index e587f893236..5c59f4b8338 100644
--- a/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c
+++ b/sbin/isakmpd/sysdep/common/libsysdep/blowfish.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: blowfish.c,v 1.3 2003/03/14 14:49:08 ho Exp $ */
+/* $OpenBSD: blowfish.c,v 1.4 2003/06/03 14:52:06 ho Exp $ */
 /*
  * Blowfish block cipher for OpenBSD
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -14,11 +14,6 @@
  * 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 Niels Provos.
- * 4. 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
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES