mdw@git.distorted.org.uk Git - termux-packages/blob - packages/openssh/openbsd-compat-explicit_bzero.c.patch

   1 On Android bzero() is a macro.
   2
   3 diff -u -r ../openssh-7.4p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/explicit_bzero.c
   4 --- ../openssh-7.4p1/openbsd-compat/explicit_bzero.c    2016-12-18 23:59:41.000000000 -0500
   5 +++ ./openbsd-compat/explicit_bzero.c   2016-12-20 19:57:24.595833810 -0500
   6 @@ -25,12 +25,6 @@
   7
   8  #else /* HAVE_MEMSET_S */
   9
  10 -/*
  11 - * Indirect bzero through a volatile pointer to hopefully avoid
  12 - * dead-store optimisation eliminating the call.
  13 - */
  14 -static void (* volatile ssh_bzero)(void *, size_t) = bzero;
  15 -
  16  void
  17  explicit_bzero(void *p, size_t n)
  18  {
  19 @@ -45,7 +39,7 @@
  20  # endif
  21  #endif
  22
  23 -       ssh_bzero(p, n);
  24 +       bzero(p, n);
  25  }
  26
  27  #endif /* HAVE_MEMSET_S */