diff options
| -rw-r--r-- | include/blf.h | 7 | ||||
| -rw-r--r-- | lib/libc/crypt/blowfish.3 | 9 | ||||
| -rw-r--r-- | lib/libc/crypt/blowfish.c | 7 | ||||
| -rw-r--r-- | sys/crypto/blf.c | 7 | ||||
| -rw-r--r-- | sys/crypto/blf.h | 7 | ||||
| -rw-r--r-- | sys/lib/libsa/blowfish.c | 7 | ||||
| -rw-r--r-- | sys/lib/libsa/blowfish.h | 7 |
7 files changed, 15 insertions, 36 deletions
diff --git a/include/blf.h b/include/blf.h index ec42b419401..87d390cd79a 100644 --- a/include/blf.h +++ b/include/blf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.h,v 1.7 2007/03/14 17:59:41 grunk Exp $ */ +/* $OpenBSD: blf.h,v 1.8 2021/11/29 01:04:45 djm Exp $ */ /* * Blowfish - a fast block cipher designed by Bruce Schneier * @@ -13,10 +13,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 diff --git a/lib/libc/crypt/blowfish.3 b/lib/libc/crypt/blowfish.3 index 88a62336cf4..c64ccb684bd 100644 --- a/lib/libc/crypt/blowfish.3 +++ b/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 <provos@physnet.uni-hamburg.de> .\" 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/lib/libc/crypt/blowfish.c b/lib/libc/crypt/blowfish.c index a658e602d24..e66d9befa63 100644 --- a/lib/libc/crypt/blowfish.c +++ b/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 <provos@physnet.uni-hamburg.de> @@ -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 diff --git a/sys/crypto/blf.c b/sys/crypto/blf.c index 787d4585cbd..957d83da7bb 100644 --- a/sys/crypto/blf.c +++ b/sys/crypto/blf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.c,v 1.7 2007/11/26 09:28:34 martynas Exp $ */ +/* $OpenBSD: blf.c,v 1.8 2021/11/29 01:04:45 djm Exp $ */ /* * Blowfish block cipher for OpenBSD @@ -15,10 +15,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 diff --git a/sys/crypto/blf.h b/sys/crypto/blf.h index 79e832ca1a9..7ea350c529f 100644 --- a/sys/crypto/blf.h +++ b/sys/crypto/blf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.h,v 1.6 2007/02/21 19:25:40 grunk Exp $ */ +/* $OpenBSD: blf.h,v 1.7 2021/11/29 01:04:45 djm Exp $ */ /* * Blowfish - a fast block cipher designed by Bruce Schneier @@ -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 diff --git a/sys/lib/libsa/blowfish.c b/sys/lib/libsa/blowfish.c index 0336fcce02d..c89e3302664 100644 --- a/sys/lib/libsa/blowfish.c +++ b/sys/lib/libsa/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.1 2016/09/10 18:24:16 jsing Exp $ */ +/* $OpenBSD: blowfish.c,v 1.2 2021/11/29 01:04:45 djm Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -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 diff --git a/sys/lib/libsa/blowfish.h b/sys/lib/libsa/blowfish.h index 0739b85c8ca..30773626311 100644 --- a/sys/lib/libsa/blowfish.h +++ b/sys/lib/libsa/blowfish.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.h,v 1.1 2016/09/10 18:24:16 jsing Exp $ */ +/* $OpenBSD: blowfish.h,v 1.2 2021/11/29 01:04:45 djm Exp $ */ /* * Blowfish - a fast block cipher designed by Bruce Schneier * @@ -13,10 +13,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 |