From: Pádraig Brady <P@draigBrady.com>
Date: Sun, 23 Jul 2017 08:50:37 +0000 (-0700)
Subject: maint: resync with blake2 upstream
X-Git-Tag: v8.28~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b1c6eebaccb1105adc29ec4ae76691df9e691fa;p=thirdparty%2Fcoreutils.git

maint: resync with blake2 upstream

* src/blake2/blake2-impl.h: Don't use the equivalent explicit_bzero().
---

diff --git a/src/blake2/blake2-impl.h b/src/blake2/blake2-impl.h
index 241e5abf5c..5dff7fc7a3 100644
--- a/src/blake2/blake2-impl.h
+++ b/src/blake2/blake2-impl.h
@@ -153,7 +153,8 @@ static BLAKE2_INLINE uint64_t rotr64( const uint64_t w, const unsigned c )
 /* prevents compiler optimizing out memset() */
 static BLAKE2_INLINE void secure_zero_memory(void *v, size_t n)
 {
-  explicit_bzero (v, n);
+  static void *(*const volatile memset_v)(void *, int, size_t) = &memset;
+  memset_v(v, 0, n);
 }
 
 #endif