From d073af4c15b6fcd85970fb9bf6858aceaefc64ee Mon Sep 17 00:00:00 2001 From: jsg Date: Sun, 28 Aug 2022 11:11:25 +0000 Subject: [PATCH] remove unused blowfish inline defines inline use was removed in 1998 --- lib/libc/crypt/blowfish.c | 9 +-------- sys/crypto/blf.c | 9 +-------- sys/lib/libsa/blowfish.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/lib/libc/crypt/blowfish.c b/lib/libc/crypt/blowfish.c index e66d9befa63..05ad00d7a16 100644 --- a/lib/libc/crypt/blowfish.c +++ b/lib/libc/crypt/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.20 2021/11/29 01:04:45 djm Exp $ */ +/* $OpenBSD: blowfish.c,v 1.21 2022/08/28 11:11:25 jsg Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos @@ -44,13 +44,6 @@ #include #include -#undef inline -#ifdef __GNUC__ -#define inline __inline -#else /* !__GNUC__ */ -#define inline -#endif /* !__GNUC__ */ - /* Function for Feistel Networks */ #define F(s, x) ((((s)[ (((x)>>24)&0xFF)] \ diff --git a/sys/crypto/blf.c b/sys/crypto/blf.c index 957d83da7bb..c8a04125bd9 100644 --- a/sys/crypto/blf.c +++ b/sys/crypto/blf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.c,v 1.8 2021/11/29 01:04:45 djm Exp $ */ +/* $OpenBSD: blf.c,v 1.9 2022/08/28 11:11:25 jsg Exp $ */ /* * Blowfish block cipher for OpenBSD @@ -42,13 +42,6 @@ #include -#undef inline -#ifdef __GNUC__ -#define inline __inline -#else /* !__GNUC__ */ -#define inline -#endif /* !__GNUC__ */ - /* Function for Feistel Networks */ #define F(s, x) ((((s)[ (((x)>>24)&0xFF)] \ diff --git a/sys/lib/libsa/blowfish.c b/sys/lib/libsa/blowfish.c index c89e3302664..55423d6033a 100644 --- a/sys/lib/libsa/blowfish.c +++ b/sys/lib/libsa/blowfish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: blowfish.c,v 1.2 2021/11/29 01:04:45 djm Exp $ */ +/* $OpenBSD: blowfish.c,v 1.3 2022/08/28 11:11:25 jsg Exp $ */ /* * Blowfish block cipher for OpenBSD * Copyright 1997 Niels Provos @@ -45,13 +45,6 @@ #include "blowfish.h" -#undef inline -#ifdef __GNUC__ -#define inline __inline -#else /* !__GNUC__ */ -#define inline -#endif /* !__GNUC__ */ - /* Function for Feistel Networks */ #define F(s, x) ((((s)[ (((x)>>24)&0xFF)] \ -- 2.20.1