From 2a7acbb25a204aaaaf63317884506795d033456a Mon Sep 17 00:00:00 2001 From: djm <> Date: Mon, 29 Nov 2021 01:04:45 +0000 Subject: Niels agreed to remove the advertising clause; switching these to 3-term BSD license. --- src/lib/libc/crypt/blowfish.3 | 9 +++------ src/lib/libc/crypt/blowfish.c | 7 ++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/lib/libc/crypt/blowfish.3 b/src/lib/libc/crypt/blowfish.3 index 88a62336cf..c64ccb684b 100644 --- a/src/lib/libc/crypt/blowfish.3 +++ b/src/lib/libc/crypt/blowfish.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: blowfish.3,v 1.23 2015/11/10 23:48:17 jmc Exp $ +.\" $OpenBSD: blowfish.3,v 1.24 2021/11/29 01:04:45 djm Exp $ .\" .\" Copyright 1997 Niels Provos .\" All rights reserved. @@ -11,10 +11,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 Niels Provos. -.\" 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 @@ -30,7 +27,7 @@ .\" .\" Manual page, using -mandoc macros .\" -.Dd $Mdocdate: November 10 2015 $ +.Dd $Mdocdate: November 29 2021 $ .Dt BLF_KEY 3 .Os .Sh NAME diff --git a/src/lib/libc/crypt/blowfish.c b/src/lib/libc/crypt/blowfish.c index a658e602d2..e66d9befa6 100644 --- a/src/lib/libc/crypt/blowfish.c +++ b/src/lib/libc/crypt/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.19 2015/09/11 09:18:27 guenther Exp $ */ +/* $OpenBSD: blowfish.c,v 1.20 2021/11/29 01:04:45 djm Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos @@ -14,10 +14,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 Niels Provos. - * 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 -- cgit v1.2.3-55-g6feb