openssh: Update from 7.3p1 to 7.4p1

[termux-packages] / packages / openssh / openbsd-compat-explicit_bzero.c.patch

diff --git a/packages/openssh/openbsd-compat-explicit_bzero.c.patch b/packages/openssh/openbsd-compat-explicit_bzero.c.patch
new file mode 100644 (file)
index 0000000..2991c4d
--- /dev/null
+++ b/packages/openssh/openbsd-compat-explicit_bzero.c.patch
@@ -0,0 +1,27 @@
+On Android bzero() is a macro.
+
+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 @@
+ 
+ #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)
+ {
+@@ -45,7 +39,7 @@
+ # endif
+ #endif
+ 
+-      ssh_bzero(p, n);
++      bzero(p, n);
+ }
+ 
+ #endif /* HAVE_MEMSET_S */