Muldersoft/SlunkCrypt
Muldersoft/SlunkCrypt
1
0
Fork 0
Code Releases 6 Activity

Enable explicit_bzero() and getentropy() on DragonFly platform + enable explicit_bzero() on Haiku platform (requires linking against libbsd).

Browse Source
This commit is contained in:
LoRd_MuldeR 2022-05-08 16:11:52 +02:00
parent fc2784b256
commit f18a84b6c9
Signed by: mulder
GPG Key ID: 2B5913365F57E03F
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -85,6 +85,10 @@ ifneq (,$(firstword $(filter %-w64-mingw32 %w64-windows-gnu,$(MACHINE))))
LDFLGS += -mconsole -municode LDFLGS += -mconsole -municode
endif endif
ifneq (,$(firstword $(filter %-unknown-haiku,$(MACHINE))))
LDFLGS += -lbsd
endif
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# File names # File names
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------

4
libslunkcrypt/src/junk.c
View File

@ -51,7 +51,7 @@ static INLINE size_t MIN_SIZE(const size_t a, const size_t b) { return (a > b) ?
#undef HAVE_WIN32RTLGENRANDOM #undef HAVE_WIN32RTLGENRANDOM
#if defined(_WIN32) #if defined(_WIN32)
# define HAVE_WIN32RTLGENRANDOM 1 # define HAVE_WIN32RTLGENRANDOM 1
#elif (defined(__linux__) && !defined(__UCLIBC__)) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) || defined(__OpenBSD__) || (defined(__sun) && defined(__SVR4)) #elif (defined(__linux__) && !defined(__UCLIBC__)) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) || defined(__DragonFly__) || defined(__OpenBSD__) || (defined(__sun) && defined(__SVR4))
# define HAVE_GETENTROPY 1 # define HAVE_GETENTROPY 1
#else #else
# pragma message("Function getentropy() is *not* available -> using fallback!") # pragma message("Function getentropy() is *not* available -> using fallback!")
@ -61,7 +61,7 @@ static INLINE size_t MIN_SIZE(const size_t a, const size_t b) { return (a > b) ?
#undef EXPLICIT_BZERO #undef EXPLICIT_BZERO
#if defined(_WIN32) && defined(SecureZeroMemory) #if defined(_WIN32) && defined(SecureZeroMemory)
# define EXPLICIT_BZERO SecureZeroMemory # define EXPLICIT_BZERO SecureZeroMemory
#elif (defined(__linux__) && !defined(__UCLIBC__)) || (defined(__FreeBSD__) && (__FreeBSD__ >= 11)) || defined(__OpenBSD__) || (defined(__sun) && defined(__SVR4)) #elif (defined(__linux__) && !defined(__UCLIBC__)) || (defined(__FreeBSD__) && (__FreeBSD__ >= 11)) || defined(__DragonFly__) || defined(__OpenBSD__) || (defined(__sun) && defined(__SVR4)) || defined(__HAIKU__)
# define EXPLICIT_BZERO explicit_bzero # define EXPLICIT_BZERO explicit_bzero
#else #else
# pragma message("Function explicit_bzero() is *not* available -> using fallback!") # pragma message("Function explicit_bzero() is *not* available -> using fallback!")