diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-19 16:12:01 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-07-19 16:12:01 +0000 |
| commit | 0c6653d396c789c945a505c7ac4ff75c65073d87 (patch) | |
| tree | d0f3796868c237eb25734da8a7362cc36fb0d697 | |
| parent | 9ea26a70d8ed1029027842e8327399aef920a739 (diff) | |
remove disabled main hook; we use phdr now; ok bcook
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_linux.c | 8 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_osx.c | 8 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_solaris.c | 8 |
3 files changed, 3 insertions, 21 deletions
diff --git a/lib/libcrypto/crypto/getentropy_linux.c b/lib/libcrypto/crypto/getentropy_linux.c index b0223237d0b..04f21e147bb 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.26 2014/07/19 16:10:50 deraadt Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.27 2014/07/19 16:12:00 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -73,9 +73,6 @@ 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 @@ -360,9 +357,6 @@ 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/lib/libcrypto/crypto/getentropy_osx.c b/lib/libcrypto/crypto/getentropy_osx.c index dc17301fcee..b0ffda8c09f 100644 --- a/lib/libcrypto/crypto/getentropy_osx.c +++ b/lib/libcrypto/crypto/getentropy_osx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_osx.c,v 1.6 2014/07/13 13:03:09 deraadt Exp $ */ +/* $OpenBSD: getentropy_osx.c,v 1.7 2014/07/19 16:12:00 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -77,9 +77,6 @@ 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); @@ -297,9 +294,6 @@ 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/lib/libcrypto/crypto/getentropy_solaris.c b/lib/libcrypto/crypto/getentropy_solaris.c index c6a9bfff4ba..fed0eeb53ae 100644 --- a/lib/libcrypto/crypto/getentropy_solaris.c +++ b/lib/libcrypto/crypto/getentropy_solaris.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_solaris.c,v 1.7 2014/07/13 13:37:38 deraadt Exp $ */ +/* $OpenBSD: getentropy_solaris.c,v 1.8 2014/07/19 16:12:00 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -68,9 +68,6 @@ 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); @@ -315,9 +312,6 @@ 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; |