shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-06 18:29:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

src: Use explicit_bzero() if available on the platform

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-02-12 14:35:55 +01:00
parent 25ff1214a4
commit ebcff9fd63
17 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/libssh/priv.h
View File

@@ -280,33 +280,22 @@ int ssh_connector_remove_event(ssh_connector connector);
/** Get the size of an array */
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
#ifndef HAVE_EXPLICIT_BZERO
/*
* See http://llvm.org/bugs/show_bug.cgi?id=15495
*/
#if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION)
/** Overwrite a string with '\0' */
# define BURN_STRING(x) do { \
if ((x) != NULL) \
memset((x), '\0', strlen((x))); __asm__ volatile("" : : "r"(&(x)) : "memory"); \
} while(0)
/** Overwrite the buffer with '\0' */
# define BURN_BUFFER(x, size) do { \
if ((x) != NULL) \
memset((x), '\0', (size)); __asm__ volatile("" : : "r"(&(x)) : "memory"); \
} while(0)
#define explicit_bzero(s, n) do { \
if ((s) != NULL) { \
memset((s), '\0', (n)); __asm__ volatile("" : : "r"(&(s)) : "memory"); \
} \
} while (0)
#else /* HAVE_GCC_VOLATILE_MEMORY_PROTECTION */
/** Overwrite a string with '\0' */
# define BURN_STRING(x) do { \
if ((x) != NULL) memset((x), '\0', strlen((x))); \
} while(0)
/** Overwrite the buffer with '\0' */
# define BURN_BUFFER(x, size) do { \
if ((x) != NULL) \
memset((x), '\0', (size)); \
} while(0)
#define explicit_bzero(s, n) do { \
memset((s), '\0', (n)); \
} while (0)
#endif /* HAVE_GCC_VOLATILE_MEMORY_PROTECTION */
#endif /* !HAVE_EXPLICIT_BZERO */
/**
* This is a hack to fix warnings. The idea is to use this everywhere that we