From da0da145d306f8fa89ef3d5667f3a3b1d87bf82b Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Fri, 21 Oct 2022 09:28:37 +0200 Subject: [PATCH] Import Blowfish from OpenSSH 9.1p1 The new file versions do not carry the BSD advertisement clause anymore which is known to be incompatible with GPL. --- opensshlib/blf.h | 7 ++----- opensshlib/blowfish.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/opensshlib/blf.h b/opensshlib/blf.h index f1ac5a5c..5b8a73e5 100644 --- a/opensshlib/blf.h +++ b/opensshlib/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/opensshlib/blowfish.c b/opensshlib/blowfish.c index e10f7e7d..bfeba47c 100644 --- a/opensshlib/blowfish.c +++ b/opensshlib/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.18 2004/11/02 17:23:26 hshoexer 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