From ebcfa9213de55892e384e1b884c4751637991f5f Mon Sep 17 00:00:00 2001 From: beck <> Date: Sun, 13 Jul 2014 08:24:20 +0000 Subject: 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@ --- src/lib/libcrypto/crypto/getentropy_linux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib/libcrypto/crypto/getentropy_linux.c') diff --git a/src/lib/libcrypto/crypto/getentropy_linux.c b/src/lib/libcrypto/crypto/getentropy_linux.c index f550a9d365..e9a1ddb2e2 100644 --- a/src/lib/libcrypto/crypto/getentropy_linux.c +++ b/src/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 @@ -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; -- cgit v1.2.3-55-g6feb