CVS commit: src/external/apache2/argon2/dist/phc-winner-argon2/src
Module Name:src
Committed By: riastradh
Date: Sat May 21 19:57:06 UTC 2022
Modified Files:
src/external/apache2/argon2/dist/phc-winner-argon2/src: thread.c
thread.h
Log Message:
argon2: Silence -Wmissing-noreturn in thread.c on clang.
Saves the trouble of patching it away in external code.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c \
src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c
diff -u src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c:1.1 src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c:1.2
--- src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c:1.1 Wed Oct 9 13:13:09 2019
+++ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c Sat May 21 19:57:06 2022
@@ -46,6 +46,7 @@ int argon2_thread_join(argon2_thread_han
#endif
}
+__attribute__((__noreturn__))
void argon2_thread_exit(void) {
#if defined(_WIN32)
_endthreadex(0);
Index: src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h
diff -u src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h:1.1 src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h:1.2
--- src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h:1.1 Wed Oct 9 13:13:09 2019
+++ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h Sat May 21 19:57:06 2022
@@ -61,7 +61,7 @@ int argon2_thread_join(argon2_thread_han
/* Terminate the current thread. Must be run inside a thread created by
* argon2_thread_create.
*/
-void argon2_thread_exit(void);
+void argon2_thread_exit(void) __attribute__((__noreturn__));
#endif /* ARGON2_NO_THREADS */
#endif
CVS commit: src/external/apache2/argon2/dist/phc-winner-argon2/src
Module Name:src Committed By: riastradh Date: Sat May 21 19:57:06 UTC 2022 Modified Files: src/external/apache2/argon2/dist/phc-winner-argon2/src: thread.c thread.h Log Message: argon2: Silence -Wmissing-noreturn in thread.c on clang. Saves the trouble of patching it away in external code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.c \ src/external/apache2/argon2/dist/phc-winner-argon2/src/thread.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/apache2/argon2/dist/phc-winner-argon2/src
Module Name:src Committed By: nia Date: Sun Oct 17 10:44:21 UTC 2021 Modified Files: src/external/apache2/argon2/dist/phc-winner-argon2/src: core.c Log Message: Teach argon2 about explicit_memset(3). Should be upstreamed. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c diff -u src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c:1.1 src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c:1.2 --- src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c:1.1 Wed Oct 9 13:13:09 2019 +++ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c Sun Oct 17 10:44:21 2021 @@ -125,6 +125,8 @@ void free_memory(const argon2_context *c #if defined(__OpenBSD__) #define HAVE_EXPLICIT_BZERO 1 +#elif defined(__NetBSD__) +#define HAVE_EXPLICIT_MEMSET 1 #elif defined(__GLIBC__) && defined(__GLIBC_PREREQ) #if __GLIBC_PREREQ(2,25) #define HAVE_EXPLICIT_BZERO 1 @@ -138,6 +140,8 @@ void NOT_OPTIMIZED secure_wipe_memory(vo memset_s(v, n, 0, n); #elif defined(HAVE_EXPLICIT_BZERO) explicit_bzero(v, n); +#elif defined(HAVE_EXPLICIT_MEMSET) +explicit_memset(v, 0, n); #else static void *(*const volatile memset_sec)(void *, int, size_t) = memset_sec(v, 0, n);
CVS commit: src/external/apache2/argon2/dist/phc-winner-argon2/src
Module Name:src Committed By: nia Date: Sun Oct 17 10:44:21 UTC 2021 Modified Files: src/external/apache2/argon2/dist/phc-winner-argon2/src: core.c Log Message: Teach argon2 about explicit_memset(3). Should be upstreamed. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/apache2/argon2/dist/phc-winner-argon2/src/core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
