diff options
| author | bcook <bcook@cvs.openbsd.org> | 2014-07-20 20:51:14 +0000 |
|---|---|---|
| committer | bcook <bcook@cvs.openbsd.org> | 2014-07-20 20:51:14 +0000 |
| commit | 43b96940ee4a95bd9ca411e91c2911ce14cfd74e (patch) | |
| tree | 8cbd3de145056d9ff1a61e2827a5d01ba98f51cf /lib/libcrypto | |
| parent | 404854e696fa6480e40e79141dbe0f631f9e2c11 (diff) | |
Move more OS-specific functionality to arc4random.h headers.
Move <sys/mman.h> and raise(SIGKILL) calls to OS-specific headers.
On OpenBSD, move thread_private.h as well to arc4random.h.
On Windows, use TerminateProcess on getentropy failure.
ok deraadt@
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/crypto/arc4random_linux.h | 11 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/arc4random_osx.h | 11 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/arc4random_solaris.h | 11 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/arc4random_win.h | 8 |
4 files changed, 37 insertions, 4 deletions
diff --git a/lib/libcrypto/crypto/arc4random_linux.h b/lib/libcrypto/crypto/arc4random_linux.h index 0da5a4a433d..7acba3f78e5 100644 --- a/lib/libcrypto/crypto/arc4random_linux.h +++ b/lib/libcrypto/crypto/arc4random_linux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_linux.h,v 1.6 2014/07/19 15:29:25 bcook Exp $ */ +/* $OpenBSD: arc4random_linux.h,v 1.7 2014/07/20 20:51:13 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -22,7 +22,10 @@ * Stub functions for portability. */ +#include <sys/mman.h> + #include <pthread.h> +#include <signal.h> static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; #define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) @@ -36,6 +39,12 @@ extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void #define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) #endif +static inline void +_getentropy_fail(void) +{ + raise(SIGKILL); +} + static volatile sig_atomic_t _rs_forked; static inline void diff --git a/lib/libcrypto/crypto/arc4random_osx.h b/lib/libcrypto/crypto/arc4random_osx.h index aacbef9aaec..c14e044fe26 100644 --- a/lib/libcrypto/crypto/arc4random_osx.h +++ b/lib/libcrypto/crypto/arc4random_osx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_osx.h,v 1.6 2014/07/19 15:29:25 bcook Exp $ */ +/* $OpenBSD: arc4random_osx.h,v 1.7 2014/07/20 20:51:13 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -22,7 +22,10 @@ * Stub functions for portability. */ +#include <sys/mman.h> + #include <pthread.h> +#include <signal.h> static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; #define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) @@ -30,6 +33,12 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; #define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) +static inline void +_getentropy_fail(void) +{ + raise(SIGKILL); +} + static volatile sig_atomic_t _rs_forked; static inline void diff --git a/lib/libcrypto/crypto/arc4random_solaris.h b/lib/libcrypto/crypto/arc4random_solaris.h index 18b1bd54e05..2082a4728f5 100644 --- a/lib/libcrypto/crypto/arc4random_solaris.h +++ b/lib/libcrypto/crypto/arc4random_solaris.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_solaris.h,v 1.6 2014/07/19 15:29:25 bcook Exp $ */ +/* $OpenBSD: arc4random_solaris.h,v 1.7 2014/07/20 20:51:13 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -22,7 +22,10 @@ * Stub functions for portability. */ +#include <sys/mman.h> + #include <pthread.h> +#include <signal.h> static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; #define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) @@ -30,6 +33,12 @@ static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; #define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) +static inline void +_getentropy_fail(void) +{ + raise(SIGKILL); +} + static volatile sig_atomic_t _rs_forked; static inline void diff --git a/lib/libcrypto/crypto/arc4random_win.h b/lib/libcrypto/crypto/arc4random_win.h index 1e044de1097..b7a5a360133 100644 --- a/lib/libcrypto/crypto/arc4random_win.h +++ b/lib/libcrypto/crypto/arc4random_win.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random_win.h,v 1.3 2014/07/20 16:59:31 bcook Exp $ */ +/* $OpenBSD: arc4random_win.h,v 1.4 2014/07/20 20:51:13 bcook Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -42,6 +42,12 @@ static volatile HANDLE arc4random_mtx = NULL; #define _ARC4_UNLOCK() ReleaseMutex(arc4random_mtx) +static inline void +_getentropy_fail(void) +{ + TerminateProcess(GetCurrentProcess(), 0); +} + static inline int _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) { |