diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_linux.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_osx.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_solaris.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto/getentropy_linux.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto/getentropy_osx.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto/getentropy_solaris.c | 6 |
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 @@ | |||
1 | /* $OpenBSD: getentropy_linux.c,v 1.21 2014/07/12 20:41:47 wouter Exp $ */ | 1 | /* $OpenBSD: getentropy_linux.c,v 1.22 2014/07/13 08:24:20 beck 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> |
@@ -69,7 +69,9 @@ | |||
69 | 69 | ||
70 | int getentropy(void *buf, size_t len); | 70 | int getentropy(void *buf, size_t len); |
71 | 71 | ||
72 | #if 0 | ||
72 | extern int main(int, char *argv[]); | 73 | extern int main(int, char *argv[]); |
74 | #endif | ||
73 | static int gotdata(char *buf, size_t len); | 75 | static int gotdata(char *buf, size_t len); |
74 | static int getentropy_urandom(void *buf, size_t len); | 76 | static int getentropy_urandom(void *buf, size_t len); |
75 | #ifdef CTL_MAXNAME | 77 | #ifdef CTL_MAXNAME |
@@ -342,7 +344,9 @@ getentropy_fallback(void *buf, size_t len) | |||
342 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, | 344 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, |
343 | sigset); | 345 | sigset); |
344 | 346 | ||
347 | #if 0 | ||
345 | HF(main); /* an addr in program */ | 348 | HF(main); /* an addr in program */ |
349 | #endif | ||
346 | HF(getentropy); /* an addr in this library */ | 350 | HF(getentropy); /* an addr in this library */ |
347 | HF(printf); /* an addr in libc */ | 351 | HF(printf); /* an addr in libc */ |
348 | p = (char *)&p; | 352 | 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 @@ | |||
1 | /* $OpenBSD: getentropy_osx.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */ | 1 | /* $OpenBSD: getentropy_osx.c,v 1.5 2014/07/13 08:24:20 beck 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> |
@@ -74,7 +74,9 @@ | |||
74 | 74 | ||
75 | int getentropy(void *buf, size_t len); | 75 | int getentropy(void *buf, size_t len); |
76 | 76 | ||
77 | #if 0 | ||
77 | extern int main(int, char *argv[]); | 78 | extern int main(int, char *argv[]); |
79 | #endif | ||
78 | static int gotdata(char *buf, size_t len); | 80 | static int gotdata(char *buf, size_t len); |
79 | static int getentropy_urandom(void *buf, size_t len); | 81 | static int getentropy_urandom(void *buf, size_t len); |
80 | static int getentropy_fallback(void *buf, size_t len); | 82 | static int getentropy_fallback(void *buf, size_t len); |
@@ -292,7 +294,9 @@ getentropy_fallback(void *buf, size_t len) | |||
292 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, | 294 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, |
293 | sigset); | 295 | sigset); |
294 | 296 | ||
297 | #if 0 | ||
295 | HF(main); /* an addr in program */ | 298 | HF(main); /* an addr in program */ |
299 | #endif | ||
296 | HF(getentropy); /* an addr in this library */ | 300 | HF(getentropy); /* an addr in this library */ |
297 | HF(printf); /* an addr in libc */ | 301 | HF(printf); /* an addr in libc */ |
298 | p = (char *)&p; | 302 | 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 @@ | |||
1 | /* $OpenBSD: getentropy_solaris.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */ | 1 | /* $OpenBSD: getentropy_solaris.c,v 1.5 2014/07/13 08:24:20 beck 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> |
@@ -64,7 +64,9 @@ | |||
64 | 64 | ||
65 | int getentropy(void *buf, size_t len); | 65 | int getentropy(void *buf, size_t len); |
66 | 66 | ||
67 | #if 0 | ||
67 | extern int main(int, char *argv[]); | 68 | extern int main(int, char *argv[]); |
69 | #endif | ||
68 | static int gotdata(char *buf, size_t len); | 70 | static int gotdata(char *buf, size_t len); |
69 | static int getentropy_urandom(void *buf, size_t len, const char *path, | 71 | static int getentropy_urandom(void *buf, size_t len, const char *path, |
70 | int devfscheck); | 72 | int devfscheck); |
@@ -297,7 +299,9 @@ getentropy_fallback(void *buf, size_t len) | |||
297 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, | 299 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, |
298 | sigset); | 300 | sigset); |
299 | 301 | ||
302 | #if 0 | ||
300 | HF(main); /* an addr in program */ | 303 | HF(main); /* an addr in program */ |
304 | #endif | ||
301 | HF(getentropy); /* an addr in this library */ | 305 | HF(getentropy); /* an addr in this library */ |
302 | HF(printf); /* an addr in libc */ | 306 | HF(printf); /* an addr in libc */ |
303 | p = (char *)&p; | 307 | 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 @@ | |||
1 | /* $OpenBSD: getentropy_linux.c,v 1.21 2014/07/12 20:41:47 wouter Exp $ */ | 1 | /* $OpenBSD: getentropy_linux.c,v 1.22 2014/07/13 08:24:20 beck 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> |
@@ -69,7 +69,9 @@ | |||
69 | 69 | ||
70 | int getentropy(void *buf, size_t len); | 70 | int getentropy(void *buf, size_t len); |
71 | 71 | ||
72 | #if 0 | ||
72 | extern int main(int, char *argv[]); | 73 | extern int main(int, char *argv[]); |
74 | #endif | ||
73 | static int gotdata(char *buf, size_t len); | 75 | static int gotdata(char *buf, size_t len); |
74 | static int getentropy_urandom(void *buf, size_t len); | 76 | static int getentropy_urandom(void *buf, size_t len); |
75 | #ifdef CTL_MAXNAME | 77 | #ifdef CTL_MAXNAME |
@@ -342,7 +344,9 @@ getentropy_fallback(void *buf, size_t len) | |||
342 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, | 344 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, |
343 | sigset); | 345 | sigset); |
344 | 346 | ||
347 | #if 0 | ||
345 | HF(main); /* an addr in program */ | 348 | HF(main); /* an addr in program */ |
349 | #endif | ||
346 | HF(getentropy); /* an addr in this library */ | 350 | HF(getentropy); /* an addr in this library */ |
347 | HF(printf); /* an addr in libc */ | 351 | HF(printf); /* an addr in libc */ |
348 | p = (char *)&p; | 352 | 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 @@ | |||
1 | /* $OpenBSD: getentropy_osx.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */ | 1 | /* $OpenBSD: getentropy_osx.c,v 1.5 2014/07/13 08:24:20 beck 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> |
@@ -74,7 +74,9 @@ | |||
74 | 74 | ||
75 | int getentropy(void *buf, size_t len); | 75 | int getentropy(void *buf, size_t len); |
76 | 76 | ||
77 | #if 0 | ||
77 | extern int main(int, char *argv[]); | 78 | extern int main(int, char *argv[]); |
79 | #endif | ||
78 | static int gotdata(char *buf, size_t len); | 80 | static int gotdata(char *buf, size_t len); |
79 | static int getentropy_urandom(void *buf, size_t len); | 81 | static int getentropy_urandom(void *buf, size_t len); |
80 | static int getentropy_fallback(void *buf, size_t len); | 82 | static int getentropy_fallback(void *buf, size_t len); |
@@ -292,7 +294,9 @@ getentropy_fallback(void *buf, size_t len) | |||
292 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, | 294 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, |
293 | sigset); | 295 | sigset); |
294 | 296 | ||
297 | #if 0 | ||
295 | HF(main); /* an addr in program */ | 298 | HF(main); /* an addr in program */ |
299 | #endif | ||
296 | HF(getentropy); /* an addr in this library */ | 300 | HF(getentropy); /* an addr in this library */ |
297 | HF(printf); /* an addr in libc */ | 301 | HF(printf); /* an addr in libc */ |
298 | p = (char *)&p; | 302 | 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 @@ | |||
1 | /* $OpenBSD: getentropy_solaris.c,v 1.4 2014/07/12 20:41:47 wouter Exp $ */ | 1 | /* $OpenBSD: getentropy_solaris.c,v 1.5 2014/07/13 08:24:20 beck 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> |
@@ -64,7 +64,9 @@ | |||
64 | 64 | ||
65 | int getentropy(void *buf, size_t len); | 65 | int getentropy(void *buf, size_t len); |
66 | 66 | ||
67 | #if 0 | ||
67 | extern int main(int, char *argv[]); | 68 | extern int main(int, char *argv[]); |
69 | #endif | ||
68 | static int gotdata(char *buf, size_t len); | 70 | static int gotdata(char *buf, size_t len); |
69 | static int getentropy_urandom(void *buf, size_t len, const char *path, | 71 | static int getentropy_urandom(void *buf, size_t len, const char *path, |
70 | int devfscheck); | 72 | int devfscheck); |
@@ -297,7 +299,9 @@ getentropy_fallback(void *buf, size_t len) | |||
297 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, | 299 | HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1, |
298 | sigset); | 300 | sigset); |
299 | 301 | ||
302 | #if 0 | ||
300 | HF(main); /* an addr in program */ | 303 | HF(main); /* an addr in program */ |
304 | #endif | ||
301 | HF(getentropy); /* an addr in this library */ | 305 | HF(getentropy); /* an addr in this library */ |
302 | HF(printf); /* an addr in libc */ | 306 | HF(printf); /* an addr in libc */ |
303 | p = (char *)&p; | 307 | p = (char *)&p; |