summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_linux.c8
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_osx.c8
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_solaris.c8
-rw-r--r--src/lib/libcrypto/crypto/getentropy_linux.c8
-rw-r--r--src/lib/libcrypto/crypto/getentropy_osx.c8
-rw-r--r--src/lib/libcrypto/crypto/getentropy_solaris.c8
6 files changed, 6 insertions, 42 deletions
diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c
index b0223237d0..04f21e147b 100644
--- a/src/lib/libcrypto/arc4random/getentropy_linux.c
+++ b/src/lib/libcrypto/arc4random/getentropy_linux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_linux.c,v 1.26 2014/07/19 16:10:50 deraadt Exp $ */ 1/* $OpenBSD: getentropy_linux.c,v 1.27 2014/07/19 16:12:00 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -73,9 +73,6 @@
73 73
74int getentropy(void *buf, size_t len); 74int getentropy(void *buf, size_t len);
75 75
76#if 0
77extern int main(int, char *argv[]);
78#endif
79static int gotdata(char *buf, size_t len); 76static int gotdata(char *buf, size_t len);
80static int getentropy_urandom(void *buf, size_t len); 77static int getentropy_urandom(void *buf, size_t len);
81#ifdef CTL_MAXNAME 78#ifdef CTL_MAXNAME
@@ -360,9 +357,6 @@ getentropy_fallback(void *buf, size_t len)
360 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, 357 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
361 sigset); 358 sigset);
362 359
363#if 0
364 HF(main); /* an addr in program */
365#endif
366 HF(getentropy); /* an addr in this library */ 360 HF(getentropy); /* an addr in this library */
367 HF(printf); /* an addr in libc */ 361 HF(printf); /* an addr in libc */
368 p = (char *)&p; 362 p = (char *)&p;
diff --git a/src/lib/libcrypto/arc4random/getentropy_osx.c b/src/lib/libcrypto/arc4random/getentropy_osx.c
index dc17301fce..b0ffda8c09 100644
--- a/src/lib/libcrypto/arc4random/getentropy_osx.c
+++ b/src/lib/libcrypto/arc4random/getentropy_osx.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_osx.c,v 1.6 2014/07/13 13:03:09 deraadt Exp $ */ 1/* $OpenBSD: getentropy_osx.c,v 1.7 2014/07/19 16:12:00 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -77,9 +77,6 @@
77 77
78int getentropy(void *buf, size_t len); 78int getentropy(void *buf, size_t len);
79 79
80#if 0
81extern int main(int, char *argv[]);
82#endif
83static int gotdata(char *buf, size_t len); 80static int gotdata(char *buf, size_t len);
84static int getentropy_urandom(void *buf, size_t len); 81static int getentropy_urandom(void *buf, size_t len);
85static int getentropy_fallback(void *buf, size_t len); 82static int getentropy_fallback(void *buf, size_t len);
@@ -297,9 +294,6 @@ getentropy_fallback(void *buf, size_t len)
297 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, 294 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
298 sigset); 295 sigset);
299 296
300#if 0
301 HF(main); /* an addr in program */
302#endif
303 HF(getentropy); /* an addr in this library */ 297 HF(getentropy); /* an addr in this library */
304 HF(printf); /* an addr in libc */ 298 HF(printf); /* an addr in libc */
305 p = (char *)&p; 299 p = (char *)&p;
diff --git a/src/lib/libcrypto/arc4random/getentropy_solaris.c b/src/lib/libcrypto/arc4random/getentropy_solaris.c
index c6a9bfff4b..fed0eeb53a 100644
--- a/src/lib/libcrypto/arc4random/getentropy_solaris.c
+++ b/src/lib/libcrypto/arc4random/getentropy_solaris.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_solaris.c,v 1.7 2014/07/13 13:37:38 deraadt Exp $ */ 1/* $OpenBSD: getentropy_solaris.c,v 1.8 2014/07/19 16:12:00 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -68,9 +68,6 @@
68 68
69int getentropy(void *buf, size_t len); 69int getentropy(void *buf, size_t len);
70 70
71#if 0
72extern int main(int, char *argv[]);
73#endif
74static int gotdata(char *buf, size_t len); 71static int gotdata(char *buf, size_t len);
75static int getentropy_urandom(void *buf, size_t len, const char *path, 72static int getentropy_urandom(void *buf, size_t len, const char *path,
76 int devfscheck); 73 int devfscheck);
@@ -315,9 +312,6 @@ getentropy_fallback(void *buf, size_t len)
315 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, 312 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
316 sigset); 313 sigset);
317 314
318#if 0
319 HF(main); /* an addr in program */
320#endif
321 HF(getentropy); /* an addr in this library */ 315 HF(getentropy); /* an addr in this library */
322 HF(printf); /* an addr in libc */ 316 HF(printf); /* an addr in libc */
323 p = (char *)&p; 317 p = (char *)&p;
diff --git a/src/lib/libcrypto/crypto/getentropy_linux.c b/src/lib/libcrypto/crypto/getentropy_linux.c
index b0223237d0..04f21e147b 100644
--- a/src/lib/libcrypto/crypto/getentropy_linux.c
+++ b/src/lib/libcrypto/crypto/getentropy_linux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_linux.c,v 1.26 2014/07/19 16:10:50 deraadt Exp $ */ 1/* $OpenBSD: getentropy_linux.c,v 1.27 2014/07/19 16:12:00 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -73,9 +73,6 @@
73 73
74int getentropy(void *buf, size_t len); 74int getentropy(void *buf, size_t len);
75 75
76#if 0
77extern int main(int, char *argv[]);
78#endif
79static int gotdata(char *buf, size_t len); 76static int gotdata(char *buf, size_t len);
80static int getentropy_urandom(void *buf, size_t len); 77static int getentropy_urandom(void *buf, size_t len);
81#ifdef CTL_MAXNAME 78#ifdef CTL_MAXNAME
@@ -360,9 +357,6 @@ getentropy_fallback(void *buf, size_t len)
360 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, 357 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
361 sigset); 358 sigset);
362 359
363#if 0
364 HF(main); /* an addr in program */
365#endif
366 HF(getentropy); /* an addr in this library */ 360 HF(getentropy); /* an addr in this library */
367 HF(printf); /* an addr in libc */ 361 HF(printf); /* an addr in libc */
368 p = (char *)&p; 362 p = (char *)&p;
diff --git a/src/lib/libcrypto/crypto/getentropy_osx.c b/src/lib/libcrypto/crypto/getentropy_osx.c
index dc17301fce..b0ffda8c09 100644
--- a/src/lib/libcrypto/crypto/getentropy_osx.c
+++ b/src/lib/libcrypto/crypto/getentropy_osx.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_osx.c,v 1.6 2014/07/13 13:03:09 deraadt Exp $ */ 1/* $OpenBSD: getentropy_osx.c,v 1.7 2014/07/19 16:12:00 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -77,9 +77,6 @@
77 77
78int getentropy(void *buf, size_t len); 78int getentropy(void *buf, size_t len);
79 79
80#if 0
81extern int main(int, char *argv[]);
82#endif
83static int gotdata(char *buf, size_t len); 80static int gotdata(char *buf, size_t len);
84static int getentropy_urandom(void *buf, size_t len); 81static int getentropy_urandom(void *buf, size_t len);
85static int getentropy_fallback(void *buf, size_t len); 82static int getentropy_fallback(void *buf, size_t len);
@@ -297,9 +294,6 @@ getentropy_fallback(void *buf, size_t len)
297 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, 294 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
298 sigset); 295 sigset);
299 296
300#if 0
301 HF(main); /* an addr in program */
302#endif
303 HF(getentropy); /* an addr in this library */ 297 HF(getentropy); /* an addr in this library */
304 HF(printf); /* an addr in libc */ 298 HF(printf); /* an addr in libc */
305 p = (char *)&p; 299 p = (char *)&p;
diff --git a/src/lib/libcrypto/crypto/getentropy_solaris.c b/src/lib/libcrypto/crypto/getentropy_solaris.c
index c6a9bfff4b..fed0eeb53a 100644
--- a/src/lib/libcrypto/crypto/getentropy_solaris.c
+++ b/src/lib/libcrypto/crypto/getentropy_solaris.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_solaris.c,v 1.7 2014/07/13 13:37:38 deraadt Exp $ */ 1/* $OpenBSD: getentropy_solaris.c,v 1.8 2014/07/19 16:12:00 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -68,9 +68,6 @@
68 68
69int getentropy(void *buf, size_t len); 69int getentropy(void *buf, size_t len);
70 70
71#if 0
72extern int main(int, char *argv[]);
73#endif
74static int gotdata(char *buf, size_t len); 71static int gotdata(char *buf, size_t len);
75static int getentropy_urandom(void *buf, size_t len, const char *path, 72static int getentropy_urandom(void *buf, size_t len, const char *path,
76 int devfscheck); 73 int devfscheck);
@@ -315,9 +312,6 @@ getentropy_fallback(void *buf, size_t len)
315 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, 312 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
316 sigset); 313 sigset);
317 314
318#if 0
319 HF(main); /* an addr in program */
320#endif
321 HF(getentropy); /* an addr in this library */ 315 HF(getentropy); /* an addr in this library */
322 HF(printf); /* an addr in libc */ 316 HF(printf); /* an addr in libc */
323 p = (char *)&p; 317 p = (char *)&p;