From: Otto Moerbeek Date: Fri, 25 Aug 2023 13:00:37 +0000 (+0200) Subject: Declare ssh_compat_getentropy in the right spot. X-Git-Tag: rec-5.0.0-alpha1~38^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13175%2Fhead;p=thirdparty%2Fpdns.git Declare ssh_compat_getentropy in the right spot. Avoiding a redundant and/or missing declaration (depending HAVE_* defines) --- diff --git a/ext/arc4random/arc4random.c b/ext/arc4random/arc4random.c index afcaa64720..56ebd811e8 100644 --- a/ext/arc4random/arc4random.c +++ b/ext/arc4random/arc4random.c @@ -48,7 +48,6 @@ * will call a native getentropy if available then fall back as required. * We use a different name so that OpenSSL cannot call the wrong getentropy. */ -int _ssh_compat_getentropy(void *, size_t); #ifdef getentropy # undef getentropy #endif diff --git a/ext/arc4random/includes.h b/ext/arc4random/includes.h index 5ef06b816b..f5bedfa183 100644 --- a/ext/arc4random/includes.h +++ b/ext/arc4random/includes.h @@ -24,4 +24,6 @@ uint32_t arc4random_uniform(uint32_t upper_bound); void explicit_bzero(void *, size_t len); #endif +int _ssh_compat_getentropy(void *, size_t); + #define DEF_WEAK(x)