diff options
Diffstat (limited to 'src/lib/libc/crypt/arc4random.c')
-rw-r--r-- | src/lib/libc/crypt/arc4random.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c index 3c80beb3b9..e4b6369bf1 100644 --- a/src/lib/libc/crypt/arc4random.c +++ b/src/lib/libc/crypt/arc4random.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: arc4random.c,v 1.48 2014/07/19 00:08:41 deraadt Exp $ */ | 1 | /* $OpenBSD: arc4random.c,v 1.49 2014/07/20 20:51:13 bcook Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1996, David Mazieres <dm@uun.org> | 4 | * Copyright (c) 1996, David Mazieres <dm@uun.org> |
@@ -32,9 +32,6 @@ | |||
32 | #include <sys/types.h> | 32 | #include <sys/types.h> |
33 | #include <sys/param.h> | 33 | #include <sys/param.h> |
34 | #include <sys/time.h> | 34 | #include <sys/time.h> |
35 | #include <sys/mman.h> | ||
36 | |||
37 | #include "thread_private.h" | ||
38 | 35 | ||
39 | #define KEYSTREAM_ONLY | 36 | #define KEYSTREAM_ONLY |
40 | #include "chacha_private.h" | 37 | #include "chacha_private.h" |
@@ -90,7 +87,7 @@ _rs_stir(void) | |||
90 | u_char rnd[KEYSZ + IVSZ]; | 87 | u_char rnd[KEYSZ + IVSZ]; |
91 | 88 | ||
92 | if (getentropy(rnd, sizeof rnd) == -1) | 89 | if (getentropy(rnd, sizeof rnd) == -1) |
93 | raise(SIGKILL); | 90 | _getentropy_fail(); |
94 | 91 | ||
95 | if (!rs) | 92 | if (!rs) |
96 | _rs_init(rnd, sizeof(rnd)); | 93 | _rs_init(rnd, sizeof(rnd)); |