summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <>2021-11-29 01:04:45 +0000
committerdjm <>2021-11-29 01:04:45 +0000
commit2a7acbb25a204aaaaf63317884506795d033456a (patch)
tree6a3309ff9c86b60c41c7c1a05989b3f29c00c56c
parentfebc5b6e19de9b99232a2be473a31e053a3fafe6 (diff)
downloadopenbsd-2a7acbb25a204aaaaf63317884506795d033456a.tar.gz
openbsd-2a7acbb25a204aaaaf63317884506795d033456a.tar.bz2
openbsd-2a7acbb25a204aaaaf63317884506795d033456a.zip
Niels agreed to remove the advertising clause; switching these
to 3-term BSD license.
-rw-r--r--src/lib/libc/crypt/blowfish.39
-rw-r--r--src/lib/libc/crypt/blowfish.c7
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 @@
1.\" $OpenBSD: blowfish.3,v 1.23 2015/11/10 23:48:17 jmc Exp $ 1.\" $OpenBSD: blowfish.3,v 1.24 2021/11/29 01:04:45 djm Exp $
2.\" 2.\"
3.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> 3.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
4.\" All rights reserved. 4.\" All rights reserved.
@@ -11,10 +11,7 @@
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 3. All advertising materials mentioning features or use of this software 14.\" 3. The name of the author may not be used to endorse or promote products
15.\" must display the following acknowledgement:
16.\" This product includes software developed by Niels Provos.
17.\" 4. The name of the author may not be used to endorse or promote products
18.\" derived from this software without specific prior written permission. 15.\" derived from this software without specific prior written permission.
19.\" 16.\"
20.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 17.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -30,7 +27,7 @@
30.\" 27.\"
31.\" Manual page, using -mandoc macros 28.\" Manual page, using -mandoc macros
32.\" 29.\"
33.Dd $Mdocdate: November 10 2015 $ 30.Dd $Mdocdate: November 29 2021 $
34.Dt BLF_KEY 3 31.Dt BLF_KEY 3
35.Os 32.Os
36.Sh NAME 33.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 @@
1/* $OpenBSD: blowfish.c,v 1.19 2015/09/11 09:18:27 guenther Exp $ */ 1/* $OpenBSD: blowfish.c,v 1.20 2021/11/29 01:04:45 djm Exp $ */
2/* 2/*
3 * Blowfish block cipher for OpenBSD 3 * Blowfish block cipher for OpenBSD
4 * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> 4 * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -14,10 +14,7 @@
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in the 15 * notice, this list of conditions and the following disclaimer in the
16 * documentation and/or other materials provided with the distribution. 16 * documentation and/or other materials provided with the distribution.
17 * 3. All advertising materials mentioning features or use of this software 17 * 3. The name of the author may not be used to endorse or promote products
18 * must display the following acknowledgement:
19 * This product includes software developed by Niels Provos.
20 * 4. The name of the author may not be used to endorse or promote products
21 * derived from this software without specific prior written permission. 18 * derived from this software without specific prior written permission.
22 * 19 *
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR