2016-12-21 02:33:53 +01:00
|
|
|
On Android bzero() is a macro.
|
2015-06-13 01:03:31 +02:00
|
|
|
|
2016-12-21 02:33:53 +01:00
|
|
|
diff -u -r ../openssh-7.4p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/explicit_bzero.c
|
|
|
|
|
--- ../openssh-7.4p1/openbsd-compat/explicit_bzero.c 2016-12-18 23:59:41.000000000 -0500
|
|
|
|
|
+++ ./openbsd-compat/explicit_bzero.c 2016-12-20 19:57:24.595833810 -0500
|
|
|
|
|
@@ -25,12 +25,6 @@
|
2015-06-13 01:03:31 +02:00
|
|
|
|
|
|
|
|
#else /* HAVE_MEMSET_S */
|
|
|
|
|
|
|
|
|
|
-/*
|
|
|
|
|
- * Indirect bzero through a volatile pointer to hopefully avoid
|
|
|
|
|
- * dead-store optimisation eliminating the call.
|
|
|
|
|
- */
|
|
|
|
|
-static void (* volatile ssh_bzero)(void *, size_t) = bzero;
|
|
|
|
|
-
|
|
|
|
|
void
|
|
|
|
|
explicit_bzero(void *p, size_t n)
|
|
|
|
|
{
|
2016-12-21 02:33:53 +01:00
|
|
|
@@ -45,7 +39,7 @@
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-06-13 01:03:31 +02:00
|
|
|
- ssh_bzero(p, n);
|
|
|
|
|
+ bzero(p, n);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* HAVE_MEMSET_S */
|
