Merge branch 'little_update' into 'master'

[xonotic/d0_blind_id.git] / sha2.c

diff --git a/sha2.c b/sha2.c
index 1ca0f810810a88eb78bbfa45f00b5c13a9189088..4d31cec38cab843e09cabccfe4fd6ba13f8f7f72 100644 (file)
--- a/sha2.c
+++ b/sha2.c
@@ -189,6 +189,14 @@ typedef u_int64_t sha2_word64;     /* Exactly 8 bytes */
 #define MEMCPY_BCOPY(d,s,l)    bcopy((s), (d), (l))
 #endif
 
+#if HAVE_MEMSET_S
+#undef MEMSET_BZERO
+#define MEMSET_BZERO(p, l)      memset_s((p), (l), 0, (l))
+#elif HAVE_EXPLICIT_BZERO
+#undef MEMSET_BZERO
+#define MEMSET_BZERO(p, l)      explicit_bzero((p), (l))
+#endif
+
 
 /*** THE SIX LOGICAL FUNCTIONS ****************************************/
 /*