CVS commit: pkgsrc/pkgtools/digest/files

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Nov  7 00:39:07 UTC 2018

Modified Files:
        pkgsrc/pkgtools/digest/files: blake2b.c

Log Message:
Fix build on Tribblix without introducing warnings on NetBSD. From
riastradh@ ("commit!") with help from maya@.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/digest/files/blake2b.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/digest/files/blake2b.c
diff -u pkgsrc/pkgtools/digest/files/blake2b.c:1.1 pkgsrc/pkgtools/digest/files/blake2b.c:1.2
--- pkgsrc/pkgtools/digest/files/blake2b.c:1.1  Sat Oct  6 14:32:45 2018
+++ pkgsrc/pkgtools/digest/files/blake2b.c      Wed Nov  7 00:39:07 2018
@@ -24,8 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#define        _POSIX_C_SOURCE 200809L
-
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
@@ -34,7 +32,7 @@
 
 void *(*volatile blake2b_explicit_memset_impl)(void *, int, size_t) = &memset;
 static void *
-explicit_memset(void *buf, int c, size_t n)
+blake2b_explicit_memset(void *buf, int c, size_t n)
 {
 
        return (*blake2b_explicit_memset_impl)(buf, c, n);
@@ -169,7 +167,7 @@ blake2b_compress(uint64_t h[8], uint64_t
        h[6] ^= v6 ^ v14;
        h[7] ^= v7 ^ v15;
 
-       (void)explicit_memset(m, 0, sizeof m);
+       (void)blake2b_explicit_memset(m, 0, sizeof m);
 }
 
 void
@@ -281,7 +279,7 @@ blake2b_final(struct blake2b *B, void *d
        }
 
        /* Erase the state.  */
-       (void)explicit_memset(B, 0, sizeof B);
+       (void)blake2b_explicit_memset(B, 0, sizeof B);
 }
 
 void