diff options
| author |   beck <beck@openbsd.org> | 2014-07-13 08:24:20 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2014-07-13 08:24:20 +0000 |
| commit | 94379de9e1093082535e27c6332d690c0c30eaa5 (patch) | |
| tree | b230f3cfc396f8b08c8bb8b3a0b5d98dbba7604a /lib/libcrypto/crypto/getentropy_linux.c | |
| parent | more mmap random on 64-bit platforms. noticed in freebsd aslr patches. (diff) | |
| download | wireguard-openbsd-94379de9e1093082535e27c6332d690c0c30eaa5.tar.xz wireguard-openbsd-94379de9e1093082535e27c6332d690c0c30eaa5.zip | |
Take away the use of the address of main as a source of entropy. Causes
distractions to people testing and seeing link errors in some setups.
This will come back in another form
ok deraadt@
Diffstat (limited to 'lib/libcrypto/crypto/getentropy_linux.c')
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_linux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libcrypto/crypto/getentropy_linux.c b/lib/libcrypto/crypto/getentropy_linux.c index f550a9d3653..e9a1ddb2e2d 100644 --- a/lib/libcrypto/crypto/getentropy_linux.c +++ b/lib/libcrypto/crypto/getentropy_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_linux.c,v 1.21 2014/07/12 20:41:47 wouter Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.22 2014/07/13 08:24:20 beck Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -69,7 +69,9 @@ int getentropy(void *buf, size_t len); +#if 0 extern int main(int, char *argv[]); +#endif static int gotdata(char *buf, size_t len); static int getentropy_urandom(void *buf, size_t len); #ifdef CTL_MAXNAME @@ -342,7 +344,9 @@ getentropy_fallback(void *buf, size_t len) HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, sigset); +#if 0 HF(main); /* an addr in program */ +#endif HF(getentropy); /* an addr in this library */ HF(printf); /* an addr in libc */ p = (char *)&p; |