Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/ipcrypt2.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
#endif

#ifndef HAVE_EXPLICIT_BZERO
# if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
defined(__DragonFly__)) || \
# if (defined(__OpenBSD__) || defined(__FreeBSD__) || \
defined(__DragonFly__)) || \
(defined(__sun) && defined(__illumos__))
# define HAVE_EXPLICIT_BZERO 1
# elif defined(__GLIBC__) && defined(__GLIBC_PREREQ) && defined(_GNU_SOURCE)
Expand All @@ -68,6 +68,12 @@
# endif
#endif

#ifndef HAVE_EXPLICIT_MEMSET
# if defined(__NetBSD__)
# define HAVE_EXPLICIT_MEMSET 1
# endif
#endif

#ifdef __aarch64__
# ifndef __ARM_FEATURE_CRYPTO
# define __ARM_FEATURE_CRYPTO 1
Expand Down Expand Up @@ -683,6 +689,8 @@ ipcrypt_zeroize(void *pnt, size_t len)
{
#ifdef HAVE_EXPLICIT_BZERO
explicit_bzero(pnt, len);
#elif defined(HAVE_EXPLICIT_MEMSET)
explicit_memset(pnt, 0, len);
#elif defined(_MSC_VER)
SecureZeroMemory(pnt, len);
#elif defined(__STDC_LIB_EXT1__)
Expand Down
Loading