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@

6 files changed, 30 insertions, 6 deletions

diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c
index f550a9d365..e9a1ddb2e2 100644
--- a/src/lib/libcrypto/arc4random/getentropy_linux.c
+++ b/src/lib/libcrypto/arc4random/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;
diff --git a/src/lib/libcrypto/arc4random/getentropy_osx.c b/src/lib/libcrypto/arc4random/getentropy_osx.c
index c7e09c78a5..3c4852e709 100644
--- a/src/lib/libcrypto/arc4random/getentropy_osx.c
+++ b/src/lib/libcrypto/arc4random/getentropy_osx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getentropy_osx.c,v 1.4 2014/07/12 20:41:47 wouter Exp $       */
+/*      $OpenBSD: getentropy_osx.c,v 1.5 2014/07/13 08:24:20 beck Exp $ */
 
 /*
  * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -74,7 +74,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);
 static int getentropy_fallback(void *buf, size_t len);
@@ -292,7 +294,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;
diff --git a/src/lib/libcrypto/arc4random/getentropy_solaris.c b/src/lib/libcrypto/arc4random/getentropy_solaris.c
index cfd5b70475..5a32922a23 100644
--- a/src/lib/libcrypto/arc4random/getentropy_solaris.c
+++ b/src/lib/libcrypto/arc4random/getentropy_solaris.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getentropy_solaris.c,v 1.4 2014/07/12 20:41:47 wouter Exp $   */
+/*      $OpenBSD: getentropy_solaris.c,v 1.5 2014/07/13 08:24:20 beck Exp $     */
 
 /*
  * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -64,7 +64,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, const char *path,
     int devfscheck);
@@ -297,7 +299,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;
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 <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;
diff --git a/src/lib/libcrypto/crypto/getentropy_osx.c b/src/lib/libcrypto/crypto/getentropy_osx.c
index c7e09c78a5..3c4852e709 100644
--- a/src/lib/libcrypto/crypto/getentropy_osx.c
+++ b/src/lib/libcrypto/crypto/getentropy_osx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getentropy_osx.c,v 1.4 2014/07/12 20:41:47 wouter Exp $       */
+/*      $OpenBSD: getentropy_osx.c,v 1.5 2014/07/13 08:24:20 beck Exp $ */
 
 /*
  * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -74,7 +74,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);
 static int getentropy_fallback(void *buf, size_t len);
@@ -292,7 +294,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;
diff --git a/src/lib/libcrypto/crypto/getentropy_solaris.c b/src/lib/libcrypto/crypto/getentropy_solaris.c
index cfd5b70475..5a32922a23 100644
--- a/src/lib/libcrypto/crypto/getentropy_solaris.c
+++ b/src/lib/libcrypto/crypto/getentropy_solaris.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getentropy_solaris.c,v 1.4 2014/07/12 20:41:47 wouter Exp $   */
+/*      $OpenBSD: getentropy_solaris.c,v 1.5 2014/07/13 08:24:20 beck Exp $     */
 
 /*
  * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -64,7 +64,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, const char *path,
     int devfscheck);
@@ -297,7 +299,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;