9a10,13
> /*
> * explicit_bzero - don't let the compiler optimize away bzero
> */
>
11a16,25
> #ifdef HAVE_MEMSET_S
>
> void
> explicit_bzero(void *p, size_t n)
> {
> (void)memset_s(p, n, 0, n);
> }
>
> #else /* HAVE_MEMSET_S */
>
13c27,28
< * explicit_bzero - don't let the compiler optimize away bzero
---
> * Indirect bzero through a volatile pointer to hopefully avoid
> * dead-store optimisation eliminating the call.
14a30,31
> static void (* volatile ssh_bzero)(void *, size_t) = bzero;
>
18c35
< bzero(p, n);
---
> ssh_bzero(p, n);
20c37,40
< #endif
---
>
> #endif /* HAVE_MEMSET_S */
>
> #endif /* HAVE_EXPLICIT_BZERO */