Skip to content

Commit 599fc3d

Browse files
committed
Bump blowfish c libs
OpenBSD has new versions for blowfish that are easy enough to just drop in. It's mostly comment updates and unused code removal.
1 parent 13fef40 commit 599fc3d

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

c_src/blf.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: blf.h,v 1.7 2007/03/14 17:59:41 grunk Exp $ */
1+
/* $OpenBSD: blf.h,v 1.8 2021/11/29 01:04:45 djm Exp $ */
22
/*
33
* Blowfish - a fast block cipher designed by Bruce Schneier
44
*
@@ -13,10 +13,7 @@
1313
* 2. Redistributions in binary form must reproduce the above copyright
1414
* notice, this list of conditions and the following disclaimer in the
1515
* documentation and/or other materials provided with the distribution.
16-
* 3. All advertising materials mentioning features or use of this software
17-
* must display the following acknowledgement:
18-
* This product includes software developed by Niels Provos.
19-
* 4. The name of the author may not be used to endorse or promote products
16+
* 3. The name of the author may not be used to endorse or promote products
2017
* derived from this software without specific prior written permission.
2118
*
2219
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

c_src/blowfish.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -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.21 2022/08/28 11:11:25 jsg Exp $ */
22
/*
33
* Blowfish block cipher for OpenBSD
44
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -14,10 +14,7 @@
1414
* 2. Redistributions in binary form must reproduce the above copyright
1515
* notice, this list of conditions and the following disclaimer in the
1616
* documentation and/or other materials provided with the distribution.
17-
* 3. All advertising materials mentioning features or use of this software
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
17+
* 3. The name of the author may not be used to endorse or promote products
2118
* derived from this software without specific prior written permission.
2219
*
2320
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -46,13 +43,6 @@
4643

4744
#include "blf.h"
4845

49-
#undef inline
50-
#ifdef __GNUC__
51-
#define inline __inline
52-
#else /* !__GNUC__ */
53-
#define inline
54-
#endif /* !__GNUC__ */
55-
5646
/* Function for Feistel Networks */
5747

5848
#define F(s, x) ((((s)[ (((x)>>24)&0xFF)] \

0 commit comments

Comments
 (0)