summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/crypto/getentropy_freebsd.c
diff options
context:
space:
mode:
authorbcook <>2014-11-03 06:23:30 +0000
committerbcook <>2014-11-03 06:23:30 +0000
commita3eca90dbf58e4b053bf7a401300f044cfdc2256 (patch)
tree9c175467713d63cf2e0e331b942d923c801a93d4 /src/lib/libcrypto/crypto/getentropy_freebsd.c
parentae4a0ba982e7f6609f71539c65c23a5bdfdf446d (diff)
downloadopenbsd-a3eca90dbf58e4b053bf7a401300f044cfdc2256.tar.gz
openbsd-a3eca90dbf58e4b053bf7a401300f044cfdc2256.tar.bz2
openbsd-a3eca90dbf58e4b053bf7a401300f044cfdc2256.zip
Add hooks to override native arc4random_buf on FreeBSD.
The FreeBSD-native arc4random_buf implementation falls back to weak sources of entropy if the sysctl fails. Remove these dangerous fallbacks by overriding locally. Unfortunately, pthread_atfork() is also broken on FreeBSD (at least 9 and 10) if a program does not link to -lthr. Callbacks registered with pthread_atfork() simply fail silently. So, it is not always possible to detect a PID wraparound. I wish we could do better. This improves arc4random_buf's safety compared to the native FreeBSD implementation. Tested on FreeBSD 9 and 10.
Diffstat (limited to 'src/lib/libcrypto/crypto/getentropy_freebsd.c')
-rw-r--r--src/lib/libcrypto/crypto/getentropy_freebsd.c64
1 files changed, 64 insertions, 0 deletions
diff --git a/src/lib/libcrypto/crypto/getentropy_freebsd.c b/src/lib/libcrypto/crypto/getentropy_freebsd.c
new file mode 100644
index 0000000000..ec760ae43d
--- /dev/null
+++ b/src/lib/libcrypto/crypto/getentropy_freebsd.c
@@ -0,0 +1,64 @@
1/* $OpenBSD: getentropy_freebsd.c,v 1.1 2014/11/03 06:23:30 bcook Exp $ */
2
3/*
4 * Copyright (c) 2014 Pawel Jakub Dawidek <pjd@FreeBSD.org>
5 * Copyright (c) 2014 Brent Cook <bcook@openbsd.org>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 *
19 * Emulation of getentropy(2) as documented at:
20 * http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man2/getentropy.2
21 */
22
23#include <sys/types.h>
24#include <sys/sysctl.h>
25
26#include <errno.h>
27#include <stddef.h>
28
29/*
30 * Derived from lib/libc/gen/arc4random.c from FreeBSD.
31 */
32static size_t
33getentropy_sysctl(u_char *buf, size_t size)
34{
35 int mib[2];
36 size_t len, done;
37
38 mib[0] = CTL_KERN;
39 mib[1] = KERN_ARND;
40 done = 0;
41
42 do {
43 len = size;
44 if (sysctl(mib, 2, buf, &len, NULL, 0) == -1)
45 return (done);
46 done += len;
47 buf += len;
48 size -= len;
49 } while (size > 0);
50
51 return (done);
52}
53
54int
55getentropy(void *buf, size_t len)
56{
57 if (len <= 256 &&
58 getentropy_sysctl(buf, len) == len) {
59 return 0;
60 }
61
62 errno = EIO;
63 return -1;
64}