diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2003-06-03 14:39:52 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2003-06-03 14:39:52 +0000 |
| commit | d95deade20c7f02c6647be3c688447536e3f92ea (patch) | |
| tree | ffd2794b8aa1c42a29d0bce594a910adaf996e03 /sbin/isakmpd/regress/x509 | |
| parent | 06947e5a2eef745672a95e9d8dbd20acb950e608 (diff) | |
Remove clauses 3 and 4. Approved by Niklas Hallqvist and Niels Provos.
Diffstat (limited to 'sbin/isakmpd/regress/x509')
| -rw-r--r-- | sbin/isakmpd/regress/x509/Makefile | 7 | ||||
| -rw-r--r-- | sbin/isakmpd/regress/x509/x509test.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sbin/isakmpd/regress/x509/Makefile b/sbin/isakmpd/regress/x509/Makefile index 345f8c78825..2ce1e9559b4 100644 --- a/sbin/isakmpd/regress/x509/Makefile +++ b/sbin/isakmpd/regress/x509/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2001/07/01 20:43:40 niklas Exp $ +# $OpenBSD: Makefile,v 1.14 2003/06/03 14:39:51 ho Exp $ # $EOM: Makefile,v 1.16 2000/09/28 12:53:27 niklas Exp $ # @@ -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 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/regress/x509/x509test.c b/sbin/isakmpd/regress/x509/x509test.c index de4f14b5722..25b8babe614 100644 --- a/sbin/isakmpd/regress/x509/x509test.c +++ b/sbin/isakmpd/regress/x509/x509test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509test.c,v 1.21 2002/08/02 17:09:29 aaron Exp $ */ +/* $OpenBSD: x509test.c,v 1.22 2003/06/03 14:39:51 ho Exp $ */ /* $EOM: x509test.c,v 1.9 2000/12/21 15:24:25 ho Exp $ */ /* @@ -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 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 |