summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/arc4random
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2015-03-08 16:48:49 +0000
committercvs2svn <admin@example.com>2015-03-08 16:48:49 +0000
commitdecf84ba5550c1656a7fdb51b5b81969590c3f03 (patch)
tree44872802e872bdfd60730fa9cf01d9d5751251c1 /src/lib/libcrypto/arc4random
parent7a8f138352aa4eb7b65ac4b1a5fe7630fbee1427 (diff)
downloadopenbsd-libressl-v2.1.5.tar.gz
openbsd-libressl-v2.1.5.tar.bz2
openbsd-libressl-v2.1.5.zip
This commit was manufactured by cvs2git to create branch 'OPENBSD_5_7'.libressl-v2.1.5
Diffstat (limited to 'src/lib/libcrypto/arc4random')
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_freebsd.h86
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_hpux.h80
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_linux.h86
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_netbsd.h86
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_osx.h80
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_solaris.h80
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_win.h75
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_freebsd.c64
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_hpux.c419
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_linux.c548
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_netbsd.c64
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_osx.c429
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_solaris.c445
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_win.c59
14 files changed, 0 insertions, 2601 deletions
diff --git a/src/lib/libcrypto/arc4random/arc4random_freebsd.h b/src/lib/libcrypto/arc4random/arc4random_freebsd.h
deleted file mode 100644
index b97bad86ca..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_freebsd.h
+++ /dev/null
@@ -1,86 +0,0 @@
1/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <sys/mman.h>
27
28#include <pthread.h>
29#include <signal.h>
30
31static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
32#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
33#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
34
35/*
36 * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
37 * a program does not link to -lthr. Callbacks registered with pthread_atfork()
38 * appear to fail silently. So, it is not always possible to detect a PID
39 * wraparound.
40 */
41#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
42
43static inline void
44_getentropy_fail(void)
45{
46 raise(SIGKILL);
47}
48
49static volatile sig_atomic_t _rs_forked;
50
51static inline void
52_rs_forkhandler(void)
53{
54 _rs_forked = 1;
55}
56
57static inline void
58_rs_forkdetect(void)
59{
60 static pid_t _rs_pid = 0;
61 pid_t pid = getpid();
62
63 if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
64 _rs_pid = pid;
65 _rs_forked = 0;
66 if (rs)
67 memset(rs, 0, sizeof(*rs));
68 }
69}
70
71static inline int
72_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
73{
74 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
75 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
76 return -1;
77
78 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
79 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
80 munmap(*rsp, sizeof(**rsp));
81 return -1;
82 }
83
84 _ARC4_ATFORK(_rs_forkhandler);
85 return 0;
86}
diff --git a/src/lib/libcrypto/arc4random/arc4random_hpux.h b/src/lib/libcrypto/arc4random/arc4random_hpux.h
deleted file mode 100644
index 5081d9722f..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_hpux.h
+++ /dev/null
@@ -1,80 +0,0 @@
1/* $OpenBSD: arc4random_hpux.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <sys/mman.h>
27
28#include <pthread.h>
29#include <signal.h>
30
31static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
32#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
33#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
34
35#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
36
37static inline void
38_getentropy_fail(void)
39{
40 raise(SIGKILL);
41}
42
43static volatile sig_atomic_t _rs_forked;
44
45static inline void
46_rs_forkhandler(void)
47{
48 _rs_forked = 1;
49}
50
51static inline void
52_rs_forkdetect(void)
53{
54 static pid_t _rs_pid = 0;
55 pid_t pid = getpid();
56
57 if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
58 _rs_pid = pid;
59 _rs_forked = 0;
60 if (rs)
61 memset(rs, 0, sizeof(*rs));
62 }
63}
64
65static inline int
66_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
67{
68 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
69 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
70 return (-1);
71
72 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
73 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
74 munmap(*rsp, sizeof(**rsp));
75 return (-1);
76 }
77
78 _ARC4_ATFORK(_rs_forkhandler);
79 return (0);
80}
diff --git a/src/lib/libcrypto/arc4random/arc4random_linux.h b/src/lib/libcrypto/arc4random/arc4random_linux.h
deleted file mode 100644
index 3296fdeca1..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_linux.h
+++ /dev/null
@@ -1,86 +0,0 @@
1/* $OpenBSD: arc4random_linux.h,v 1.9 2015/01/15 06:57:18 deraadt Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <sys/mman.h>
27
28#include <pthread.h>
29#include <signal.h>
30
31static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
32#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
33#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
34
35#ifdef __GLIBC__
36extern void *__dso_handle;
37extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
38#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
39#else
40#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
41#endif
42
43static inline void
44_getentropy_fail(void)
45{
46 raise(SIGKILL);
47}
48
49static volatile sig_atomic_t _rs_forked;
50
51static inline void
52_rs_forkhandler(void)
53{
54 _rs_forked = 1;
55}
56
57static inline void
58_rs_forkdetect(void)
59{
60 static pid_t _rs_pid = 0;
61 pid_t pid = getpid();
62
63 if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
64 _rs_pid = pid;
65 _rs_forked = 0;
66 if (rs)
67 memset(rs, 0, sizeof(*rs));
68 }
69}
70
71static inline int
72_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
73{
74 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
75 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
76 return (-1);
77
78 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
79 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
80 munmap(*rsp, sizeof(**rsp));
81 return (-1);
82 }
83
84 _ARC4_ATFORK(_rs_forkhandler);
85 return (0);
86}
diff --git a/src/lib/libcrypto/arc4random/arc4random_netbsd.h b/src/lib/libcrypto/arc4random/arc4random_netbsd.h
deleted file mode 100644
index 489e73a078..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_netbsd.h
+++ /dev/null
@@ -1,86 +0,0 @@
1/* $OpenBSD: arc4random_netbsd.h,v 1.1 2015/01/19 20:21:40 bcook Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <sys/mman.h>
27
28#include <pthread.h>
29#include <signal.h>
30
31static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
32#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
33#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
34
35/*
36 * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
37 * a program does not link to -lthr. Callbacks registered with pthread_atfork()
38 * appear to fail silently. So, it is not always possible to detect a PID
39 * wraparound.
40 */
41#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
42
43static inline void
44_getentropy_fail(void)
45{
46 raise(SIGKILL);
47}
48
49static volatile sig_atomic_t _rs_forked;
50
51static inline void
52_rs_forkhandler(void)
53{
54 _rs_forked = 1;
55}
56
57static inline void
58_rs_forkdetect(void)
59{
60 static pid_t _rs_pid = 0;
61 pid_t pid = getpid();
62
63 if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
64 _rs_pid = pid;
65 _rs_forked = 0;
66 if (rs)
67 memset(rs, 0, sizeof(*rs));
68 }
69}
70
71static inline int
72_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
73{
74 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
75 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
76 return -1;
77
78 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
79 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
80 munmap(*rsp, sizeof(**rsp));
81 return -1;
82 }
83
84 _ARC4_ATFORK(_rs_forkhandler);
85 return 0;
86}
diff --git a/src/lib/libcrypto/arc4random/arc4random_osx.h b/src/lib/libcrypto/arc4random/arc4random_osx.h
deleted file mode 100644
index 3bb14e03ab..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_osx.h
+++ /dev/null
@@ -1,80 +0,0 @@
1/* $OpenBSD: arc4random_osx.h,v 1.9 2015/01/15 06:57:18 deraadt Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <sys/mman.h>
27
28#include <pthread.h>
29#include <signal.h>
30
31static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
32#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
33#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
34
35#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
36
37static inline void
38_getentropy_fail(void)
39{
40 raise(SIGKILL);
41}
42
43static volatile sig_atomic_t _rs_forked;
44
45static inline void
46_rs_forkhandler(void)
47{
48 _rs_forked = 1;
49}
50
51static inline void
52_rs_forkdetect(void)
53{
54 static pid_t _rs_pid = 0;
55 pid_t pid = getpid();
56
57 if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
58 _rs_pid = pid;
59 _rs_forked = 0;
60 if (rs)
61 memset(rs, 0, sizeof(*rs));
62 }
63}
64
65static inline int
66_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
67{
68 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
69 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
70 return -1;
71
72 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
73 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
74 munmap(*rsp, sizeof(**rsp));
75 return -1;
76 }
77
78 _ARC4_ATFORK(_rs_forkhandler);
79 return 0;
80}
diff --git a/src/lib/libcrypto/arc4random/arc4random_solaris.h b/src/lib/libcrypto/arc4random/arc4random_solaris.h
deleted file mode 100644
index e8a14afdeb..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_solaris.h
+++ /dev/null
@@ -1,80 +0,0 @@
1/* $OpenBSD: arc4random_solaris.h,v 1.9 2015/01/15 06:57:18 deraadt Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <sys/mman.h>
27
28#include <pthread.h>
29#include <signal.h>
30
31static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
32#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
33#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
34
35#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
36
37static inline void
38_getentropy_fail(void)
39{
40 raise(SIGKILL);
41}
42
43static volatile sig_atomic_t _rs_forked;
44
45static inline void
46_rs_forkhandler(void)
47{
48 _rs_forked = 1;
49}
50
51static inline void
52_rs_forkdetect(void)
53{
54 static pid_t _rs_pid = 0;
55 pid_t pid = getpid();
56
57 if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
58 _rs_pid = pid;
59 _rs_forked = 0;
60 if (rs)
61 memset(rs, 0, sizeof(*rs));
62 }
63}
64
65static inline int
66_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
67{
68 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
69 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
70 return (-1);
71
72 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
73 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
74 munmap(*rsp, sizeof(**rsp));
75 return (-1);
76 }
77
78 _ARC4_ATFORK(_rs_forkhandler);
79 return (0);
80}
diff --git a/src/lib/libcrypto/arc4random/arc4random_win.h b/src/lib/libcrypto/arc4random/arc4random_win.h
deleted file mode 100644
index 48a1bda128..0000000000
--- a/src/lib/libcrypto/arc4random/arc4random_win.h
+++ /dev/null
@@ -1,75 +0,0 @@
1/* $OpenBSD: arc4random_win.h,v 1.5 2015/01/15 06:57:18 deraadt Exp $ */
2
3/*
4 * Copyright (c) 1996, David Mazieres <dm@uun.org>
5 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
6 * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
7 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.
12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */
21
22/*
23 * Stub functions for portability.
24 */
25
26#include <windows.h>
27
28static volatile HANDLE arc4random_mtx = NULL;
29
30/*
31 * Initialize the mutex on the first lock attempt. On collision, each thread
32 * will attempt to allocate a mutex and compare-and-swap it into place as the
33 * global mutex. On failure to swap in the global mutex, the mutex is closed.
34 */
35#define _ARC4_LOCK() { \
36 if (!arc4random_mtx) { \
37 HANDLE p = CreateMutex(NULL, FALSE, NULL); \
38 if (InterlockedCompareExchangePointer((void **)&arc4random_mtx, (void *)p, NULL)) \
39 CloseHandle(p); \
40 } \
41 WaitForSingleObject(arc4random_mtx, INFINITE); \
42} \
43
44#define _ARC4_UNLOCK() ReleaseMutex(arc4random_mtx)
45
46static inline void
47_getentropy_fail(void)
48{
49 TerminateProcess(GetCurrentProcess(), 0);
50}
51
52static inline int
53_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
54{
55 *rsp = calloc(1, sizeof(**rsp));
56 if (*rsp == NULL)
57 return (-1);
58
59 *rsxp = calloc(1, sizeof(**rsxp));
60 if (*rsxp == NULL) {
61 free(*rsp);
62 return (-1);
63 }
64 return (0);
65}
66
67static inline void
68_rs_forkhandler(void)
69{
70}
71
72static inline void
73_rs_forkdetect(void)
74{
75}
diff --git a/src/lib/libcrypto/arc4random/getentropy_freebsd.c b/src/lib/libcrypto/arc4random/getentropy_freebsd.c
deleted file mode 100644
index ec760ae43d..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_freebsd.c
+++ /dev/null
@@ -1,64 +0,0 @@
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}
diff --git a/src/lib/libcrypto/arc4random/getentropy_hpux.c b/src/lib/libcrypto/arc4random/getentropy_hpux.c
deleted file mode 100644
index 753c9af12b..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_hpux.c
+++ /dev/null
@@ -1,419 +0,0 @@
1/* $OpenBSD: getentropy_hpux.c,v 1.2 2015/01/07 01:15:57 bcook Exp $ */
2
3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
5 * Copyright (c) 2014 Bob Beck <beck@obtuse.com>
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/param.h>
25#include <sys/ioctl.h>
26#include <sys/resource.h>
27#include <sys/syscall.h>
28#include <sys/statvfs.h>
29#include <sys/socket.h>
30#include <sys/mount.h>
31#include <sys/mman.h>
32#include <sys/stat.h>
33#include <sys/time.h>
34#include <stdlib.h>
35#include <stdint.h>
36#include <stdio.h>
37#include <termios.h>
38#include <fcntl.h>
39#include <signal.h>
40#include <string.h>
41#include <errno.h>
42#include <unistd.h>
43#include <time.h>
44#include <openssl/sha.h>
45
46#include <sys/vfs.h>
47
48#include <sys/pstat.h>
49
50#define REPEAT 5
51#define min(a, b) (((a) < (b)) ? (a) : (b))
52
53#define HX(a, b) \
54 do { \
55 if ((a)) \
56 HD(errno); \
57 else \
58 HD(b); \
59 } while (0)
60
61#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
62#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
63#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
64
65int getentropy(void *buf, size_t len);
66
67static int gotdata(char *buf, size_t len);
68static int getentropy_urandom(void *buf, size_t len, const char *path,
69 int devfscheck);
70static int getentropy_fallback(void *buf, size_t len);
71
72int
73getentropy(void *buf, size_t len)
74{
75 int ret = -1;
76
77 if (len > 256) {
78 errno = EIO;
79 return -1;
80 }
81
82 /*
83 * Try to get entropy with /dev/urandom
84 */
85 ret = getentropy_urandom(buf, len, "/dev/urandom", 0);
86 if (ret != -1)
87 return (ret);
88
89 /*
90 * Entropy collection via /dev/urandom has failed.
91 *
92 * No other API exists for collecting entropy, and we have
93 * no failsafe way to get it on hpux that is not sensitive
94 * to resource exhaustion.
95 *
96 * We have very few options:
97 * - Even syslog_r is unsafe to call at this low level, so
98 * there is no way to alert the user or program.
99 * - Cannot call abort() because some systems have unsafe
100 * corefiles.
101 * - Could raise(SIGKILL) resulting in silent program termination.
102 * - Return EIO, to hint that arc4random's stir function
103 * should raise(SIGKILL)
104 * - Do the best under the circumstances....
105 *
106 * This code path exists to bring light to the issue that hpux
107 * does not provide a failsafe API for entropy collection.
108 *
109 * We hope this demonstrates that hpux should consider
110 * providing a new failsafe API which works in a chroot or
111 * when file descriptors are exhausted.
112 */
113#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
114#ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
115 raise(SIGKILL);
116#endif
117 ret = getentropy_fallback(buf, len);
118 if (ret != -1)
119 return (ret);
120
121 errno = EIO;
122 return (ret);
123}
124
125/*
126 * Basic sanity checking; wish we could do better.
127 */
128static int
129gotdata(char *buf, size_t len)
130{
131 char any_set = 0;
132 size_t i;
133
134 for (i = 0; i < len; ++i)
135 any_set |= buf[i];
136 if (any_set == 0)
137 return -1;
138 return 0;
139}
140
141static int
142getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck)
143{
144 struct stat st;
145 size_t i;
146 int fd, flags;
147 int save_errno = errno;
148
149start:
150
151 flags = O_RDONLY;
152#ifdef O_NOFOLLOW
153 flags |= O_NOFOLLOW;
154#endif
155#ifdef O_CLOEXEC
156 flags |= O_CLOEXEC;
157#endif
158 fd = open(path, flags, 0);
159 if (fd == -1) {
160 if (errno == EINTR)
161 goto start;
162 goto nodevrandom;
163 }
164#ifndef O_CLOEXEC
165 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
166#endif
167
168 /* Lightly verify that the device node looks sane */
169 if (fstat(fd, &st) == -1 || !S_ISCHR(st.st_mode)) {
170 close(fd);
171 goto nodevrandom;
172 }
173 for (i = 0; i < len; ) {
174 size_t wanted = len - i;
175 ssize_t ret = read(fd, (char *)buf + i, wanted);
176
177 if (ret == -1) {
178 if (errno == EAGAIN || errno == EINTR)
179 continue;
180 close(fd);
181 goto nodevrandom;
182 }
183 i += ret;
184 }
185 close(fd);
186 if (gotdata(buf, len) == 0) {
187 errno = save_errno;
188 return 0; /* satisfied */
189 }
190nodevrandom:
191 errno = EIO;
192 return -1;
193}
194
195static const int cl[] = {
196 CLOCK_REALTIME,
197#ifdef CLOCK_MONOTONIC
198 CLOCK_MONOTONIC,
199#endif
200#ifdef CLOCK_MONOTONIC_RAW
201 CLOCK_MONOTONIC_RAW,
202#endif
203#ifdef CLOCK_TAI
204 CLOCK_TAI,
205#endif
206#ifdef CLOCK_VIRTUAL
207 CLOCK_VIRTUAL,
208#endif
209#ifdef CLOCK_UPTIME
210 CLOCK_UPTIME,
211#endif
212#ifdef CLOCK_PROCESS_CPUTIME_ID
213 CLOCK_PROCESS_CPUTIME_ID,
214#endif
215#ifdef CLOCK_THREAD_CPUTIME_ID
216 CLOCK_THREAD_CPUTIME_ID,
217#endif
218};
219
220static int
221getentropy_fallback(void *buf, size_t len)
222{
223 uint8_t results[SHA512_DIGEST_LENGTH];
224 int save_errno = errno, e, pgs = sysconf(_SC_PAGESIZE), faster = 0, repeat;
225 static int cnt;
226 struct timespec ts;
227 struct timeval tv;
228 struct pst_vminfo pvi;
229 struct pst_vm_status pvs;
230 struct pst_dynamic pdy;
231 struct rusage ru;
232 sigset_t sigset;
233 struct stat st;
234 SHA512_CTX ctx;
235 static pid_t lastpid;
236 pid_t pid;
237 size_t i, ii, m;
238 char *p;
239
240 pid = getpid();
241 if (lastpid == pid) {
242 faster = 1;
243 repeat = 2;
244 } else {
245 faster = 0;
246 lastpid = pid;
247 repeat = REPEAT;
248 }
249 for (i = 0; i < len; ) {
250 int j;
251 SHA512_Init(&ctx);
252 for (j = 0; j < repeat; j++) {
253 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
254 if (e != -1) {
255 cnt += (int)tv.tv_sec;
256 cnt += (int)tv.tv_usec;
257 }
258
259 HX(pstat_getvminfo(&pvi, sizeof(pvi), 1, 0) != 1, pvi);
260 HX(pstat_getprocvm(&pvs, sizeof(pvs), 0, 0) != 1, pvs);
261
262 for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++)
263 HX(clock_gettime(cl[ii], &ts) == -1, ts);
264
265 HX((pid = getpid()) == -1, pid);
266 HX((pid = getsid(pid)) == -1, pid);
267 HX((pid = getppid()) == -1, pid);
268 HX((pid = getpgid(0)) == -1, pid);
269 HX((e = getpriority(0, 0)) == -1, e);
270
271 if(pstat_getdynamic(&pdy, sizeof(pdy), 1, 0) != 1) {
272 HD(errno);
273 } else {
274 HD(pdy.psd_avg_1_min);
275 HD(pdy.psd_avg_5_min);
276 HD(pdy.psd_avg_15_min);
277 }
278
279 if (!faster) {
280 ts.tv_sec = 0;
281 ts.tv_nsec = 1;
282 (void) nanosleep(&ts, NULL);
283 }
284
285 HX(sigpending(&sigset) == -1, sigset);
286 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
287 sigset);
288
289 HF(getentropy); /* an addr in this library */
290 HF(printf); /* an addr in libc */
291 p = (char *)&p;
292 HD(p); /* an addr on stack */
293 p = (char *)&errno;
294 HD(p); /* the addr of errno */
295
296 if (i == 0) {
297 struct sockaddr_storage ss;
298 struct statvfs stvfs;
299 struct termios tios;
300 socklen_t ssl;
301 off_t off;
302
303 /*
304 * Prime-sized mappings encourage fragmentation;
305 * thus exposing some address entropy.
306 */
307 struct mm {
308 size_t npg;
309 void *p;
310 } mm[] = {
311 { 17, MAP_FAILED }, { 3, MAP_FAILED },
312 { 11, MAP_FAILED }, { 2, MAP_FAILED },
313 { 5, MAP_FAILED }, { 3, MAP_FAILED },
314 { 7, MAP_FAILED }, { 1, MAP_FAILED },
315 { 57, MAP_FAILED }, { 3, MAP_FAILED },
316 { 131, MAP_FAILED }, { 1, MAP_FAILED },
317 };
318
319 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
320 HX(mm[m].p = mmap(NULL,
321 mm[m].npg * pgs,
322 PROT_READ|PROT_WRITE,
323 MAP_PRIVATE|MAP_ANON, -1,
324 (off_t)0), mm[m].p);
325 if (mm[m].p != MAP_FAILED) {
326 size_t mo;
327
328 /* Touch some memory... */
329 p = mm[m].p;
330 mo = cnt %
331 (mm[m].npg * pgs - 1);
332 p[mo] = 1;
333 cnt += (int)((long)(mm[m].p)
334 / pgs);
335 }
336
337 /* Check cnts and times... */
338 for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]);
339 ii++) {
340 HX((e = clock_gettime(cl[ii],
341 &ts)) == -1, ts);
342 if (e != -1)
343 cnt += (int)ts.tv_nsec;
344 }
345
346 HX((e = getrusage(RUSAGE_SELF,
347 &ru)) == -1, ru);
348 if (e != -1) {
349 cnt += (int)ru.ru_utime.tv_sec;
350 cnt += (int)ru.ru_utime.tv_usec;
351 }
352 }
353
354 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
355 if (mm[m].p != MAP_FAILED)
356 munmap(mm[m].p, mm[m].npg * pgs);
357 mm[m].p = MAP_FAILED;
358 }
359
360 HX(stat(".", &st) == -1, st);
361 HX(statvfs(".", &stvfs) == -1, stvfs);
362
363 HX(stat("/", &st) == -1, st);
364 HX(statvfs("/", &stvfs) == -1, stvfs);
365
366 HX((e = fstat(0, &st)) == -1, st);
367 if (e == -1) {
368 if (S_ISREG(st.st_mode) ||
369 S_ISFIFO(st.st_mode) ||
370 S_ISSOCK(st.st_mode)) {
371 HX(fstatvfs(0, &stvfs) == -1,
372 stvfs);
373 HX((off = lseek(0, (off_t)0,
374 SEEK_CUR)) < 0, off);
375 }
376 if (S_ISCHR(st.st_mode)) {
377 HX(tcgetattr(0, &tios) == -1,
378 tios);
379 } else if (S_ISSOCK(st.st_mode)) {
380 memset(&ss, 0, sizeof ss);
381 ssl = sizeof(ss);
382 HX(getpeername(0,
383 (void *)&ss, &ssl) == -1,
384 ss);
385 }
386 }
387
388 HX((e = getrusage(RUSAGE_CHILDREN,
389 &ru)) == -1, ru);
390 if (e != -1) {
391 cnt += (int)ru.ru_utime.tv_sec;
392 cnt += (int)ru.ru_utime.tv_usec;
393 }
394 } else {
395 /* Subsequent hashes absorb previous result */
396 HD(results);
397 }
398
399 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
400 if (e != -1) {
401 cnt += (int)tv.tv_sec;
402 cnt += (int)tv.tv_usec;
403 }
404
405 HD(cnt);
406 }
407 SHA512_Final(results, &ctx);
408 memcpy((char *)buf + i, results, min(sizeof(results), len - i));
409 i += min(sizeof(results), len - i);
410 }
411 explicit_bzero(&ctx, sizeof ctx);
412 explicit_bzero(results, sizeof results);
413 if (gotdata(buf, len) == 0) {
414 errno = save_errno;
415 return 0; /* satisfied */
416 }
417 errno = EIO;
418 return -1;
419}
diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c
deleted file mode 100644
index 37e03ed590..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_linux.c
+++ /dev/null
@@ -1,548 +0,0 @@
1/* $OpenBSD: getentropy_linux.c,v 1.36 2014/10/11 16:44:05 bcook Exp $ */
2
3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
5 * Copyright (c) 2014 Bob Beck <beck@obtuse.com>
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#define _POSIX_C_SOURCE 199309L
24#define _GNU_SOURCE 1
25#include <sys/types.h>
26#include <sys/param.h>
27#include <sys/ioctl.h>
28#include <sys/resource.h>
29#include <sys/syscall.h>
30#ifdef HAVE_SYS_SYSCTL_H
31#include <sys/sysctl.h>
32#endif
33#include <sys/statvfs.h>
34#include <sys/socket.h>
35#include <sys/mount.h>
36#include <sys/mman.h>
37#include <sys/stat.h>
38#include <sys/time.h>
39#include <stdlib.h>
40#include <stdint.h>
41#include <stdio.h>
42#include <link.h>
43#include <termios.h>
44#include <fcntl.h>
45#include <signal.h>
46#include <string.h>
47#include <errno.h>
48#include <unistd.h>
49#include <time.h>
50#include <openssl/sha.h>
51
52#include <linux/types.h>
53#include <linux/random.h>
54#include <linux/sysctl.h>
55#ifdef HAVE_GETAUXVAL
56#include <sys/auxv.h>
57#endif
58#include <sys/vfs.h>
59
60#define REPEAT 5
61#define min(a, b) (((a) < (b)) ? (a) : (b))
62
63#define HX(a, b) \
64 do { \
65 if ((a)) \
66 HD(errno); \
67 else \
68 HD(b); \
69 } while (0)
70
71#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
72#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
73#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
74
75int getentropy(void *buf, size_t len);
76
77static int gotdata(char *buf, size_t len);
78#ifdef SYS_getrandom
79static int getentropy_getrandom(void *buf, size_t len);
80#endif
81static int getentropy_urandom(void *buf, size_t len);
82#ifdef SYS__sysctl
83static int getentropy_sysctl(void *buf, size_t len);
84#endif
85static int getentropy_fallback(void *buf, size_t len);
86static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data);
87
88int
89getentropy(void *buf, size_t len)
90{
91 int ret = -1;
92
93 if (len > 256) {
94 errno = EIO;
95 return -1;
96 }
97
98#ifdef SYS_getrandom
99 /*
100 * Try descriptor-less getrandom()
101 */
102 ret = getentropy_getrandom(buf, len);
103 if (ret != -1)
104 return (ret);
105 if (errno != ENOSYS)
106 return (-1);
107#endif
108
109 /*
110 * Try to get entropy with /dev/urandom
111 *
112 * This can fail if the process is inside a chroot or if file
113 * descriptors are exhausted.
114 */
115 ret = getentropy_urandom(buf, len);
116 if (ret != -1)
117 return (ret);
118
119#ifdef SYS__sysctl
120 /*
121 * Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID.
122 * sysctl is a failsafe API, so it guarantees a result. This
123 * should work inside a chroot, or when file descriptors are
124 * exhuasted.
125 *
126 * However this can fail if the Linux kernel removes support
127 * for sysctl. Starting in 2007, there have been efforts to
128 * deprecate the sysctl API/ABI, and push callers towards use
129 * of the chroot-unavailable fd-using /proc mechanism --
130 * essentially the same problems as /dev/urandom.
131 *
132 * Numerous setbacks have been encountered in their deprecation
133 * schedule, so as of June 2014 the kernel ABI still exists on
134 * most Linux architectures. The sysctl() stub in libc is missing
135 * on some systems. There are also reports that some kernels
136 * spew messages to the console.
137 */
138 ret = getentropy_sysctl(buf, len);
139 if (ret != -1)
140 return (ret);
141#endif /* SYS__sysctl */
142
143 /*
144 * Entropy collection via /dev/urandom and sysctl have failed.
145 *
146 * No other API exists for collecting entropy. See the large
147 * comment block above.
148 *
149 * We have very few options:
150 * - Even syslog_r is unsafe to call at this low level, so
151 * there is no way to alert the user or program.
152 * - Cannot call abort() because some systems have unsafe
153 * corefiles.
154 * - Could raise(SIGKILL) resulting in silent program termination.
155 * - Return EIO, to hint that arc4random's stir function
156 * should raise(SIGKILL)
157 * - Do the best under the circumstances....
158 *
159 * This code path exists to bring light to the issue that Linux
160 * does not provide a failsafe API for entropy collection.
161 *
162 * We hope this demonstrates that Linux should either retain their
163 * sysctl ABI, or consider providing a new failsafe API which
164 * works in a chroot or when file descriptors are exhausted.
165 */
166#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
167#ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
168 raise(SIGKILL);
169#endif
170 ret = getentropy_fallback(buf, len);
171 if (ret != -1)
172 return (ret);
173
174 errno = EIO;
175 return (ret);
176}
177
178/*
179 * Basic sanity checking; wish we could do better.
180 */
181static int
182gotdata(char *buf, size_t len)
183{
184 char any_set = 0;
185 size_t i;
186
187 for (i = 0; i < len; ++i)
188 any_set |= buf[i];
189 if (any_set == 0)
190 return -1;
191 return 0;
192}
193
194#ifdef SYS_getrandom
195static int
196getentropy_getrandom(void *buf, size_t len)
197{
198 int pre_errno = errno;
199 int ret;
200 if (len > 256)
201 return (-1);
202 do {
203 ret = syscall(SYS_getrandom, buf, len, 0);
204 } while (ret == -1 && errno == EINTR);
205
206 if (ret != len)
207 return (-1);
208 errno = pre_errno;
209 return (0);
210}
211#endif
212
213static int
214getentropy_urandom(void *buf, size_t len)
215{
216 struct stat st;
217 size_t i;
218 int fd, cnt, flags;
219 int save_errno = errno;
220
221start:
222
223 flags = O_RDONLY;
224#ifdef O_NOFOLLOW
225 flags |= O_NOFOLLOW;
226#endif
227#ifdef O_CLOEXEC
228 flags |= O_CLOEXEC;
229#endif
230 fd = open("/dev/urandom", flags, 0);
231 if (fd == -1) {
232 if (errno == EINTR)
233 goto start;
234 goto nodevrandom;
235 }
236#ifndef O_CLOEXEC
237 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
238#endif
239
240 /* Lightly verify that the device node looks sane */
241 if (fstat(fd, &st) == -1 || !S_ISCHR(st.st_mode)) {
242 close(fd);
243 goto nodevrandom;
244 }
245 if (ioctl(fd, RNDGETENTCNT, &cnt) == -1) {
246 close(fd);
247 goto nodevrandom;
248 }
249 for (i = 0; i < len; ) {
250 size_t wanted = len - i;
251 ssize_t ret = read(fd, (char *)buf + i, wanted);
252
253 if (ret == -1) {
254 if (errno == EAGAIN || errno == EINTR)
255 continue;
256 close(fd);
257 goto nodevrandom;
258 }
259 i += ret;
260 }
261 close(fd);
262 if (gotdata(buf, len) == 0) {
263 errno = save_errno;
264 return 0; /* satisfied */
265 }
266nodevrandom:
267 errno = EIO;
268 return -1;
269}
270
271#ifdef SYS__sysctl
272static int
273getentropy_sysctl(void *buf, size_t len)
274{
275 static int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID };
276 size_t i;
277 int save_errno = errno;
278
279 for (i = 0; i < len; ) {
280 size_t chunk = min(len - i, 16);
281
282 /* SYS__sysctl because some systems already removed sysctl() */
283 struct __sysctl_args args = {
284 .name = mib,
285 .nlen = 3,
286 .oldval = (char *)buf + i,
287 .oldlenp = &chunk,
288 };
289 if (syscall(SYS__sysctl, &args) != 0)
290 goto sysctlfailed;
291 i += chunk;
292 }
293 if (gotdata(buf, len) == 0) {
294 errno = save_errno;
295 return (0); /* satisfied */
296 }
297sysctlfailed:
298 errno = EIO;
299 return -1;
300}
301#endif /* SYS__sysctl */
302
303static int cl[] = {
304 CLOCK_REALTIME,
305#ifdef CLOCK_MONOTONIC
306 CLOCK_MONOTONIC,
307#endif
308#ifdef CLOCK_MONOTONIC_RAW
309 CLOCK_MONOTONIC_RAW,
310#endif
311#ifdef CLOCK_TAI
312 CLOCK_TAI,
313#endif
314#ifdef CLOCK_VIRTUAL
315 CLOCK_VIRTUAL,
316#endif
317#ifdef CLOCK_UPTIME
318 CLOCK_UPTIME,
319#endif
320#ifdef CLOCK_PROCESS_CPUTIME_ID
321 CLOCK_PROCESS_CPUTIME_ID,
322#endif
323#ifdef CLOCK_THREAD_CPUTIME_ID
324 CLOCK_THREAD_CPUTIME_ID,
325#endif
326};
327
328static int
329getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data)
330{
331 SHA512_CTX *ctx = data;
332
333 SHA512_Update(ctx, &info->dlpi_addr, sizeof (info->dlpi_addr));
334 return 0;
335}
336
337static int
338getentropy_fallback(void *buf, size_t len)
339{
340 uint8_t results[SHA512_DIGEST_LENGTH];
341 int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
342 static int cnt;
343 struct timespec ts;
344 struct timeval tv;
345 struct rusage ru;
346 sigset_t sigset;
347 struct stat st;
348 SHA512_CTX ctx;
349 static pid_t lastpid;
350 pid_t pid;
351 size_t i, ii, m;
352 char *p;
353
354 pid = getpid();
355 if (lastpid == pid) {
356 faster = 1;
357 repeat = 2;
358 } else {
359 faster = 0;
360 lastpid = pid;
361 repeat = REPEAT;
362 }
363 for (i = 0; i < len; ) {
364 int j;
365 SHA512_Init(&ctx);
366 for (j = 0; j < repeat; j++) {
367 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
368 if (e != -1) {
369 cnt += (int)tv.tv_sec;
370 cnt += (int)tv.tv_usec;
371 }
372
373 dl_iterate_phdr(getentropy_phdr, &ctx);
374
375 for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++)
376 HX(clock_gettime(cl[ii], &ts) == -1, ts);
377
378 HX((pid = getpid()) == -1, pid);
379 HX((pid = getsid(pid)) == -1, pid);
380 HX((pid = getppid()) == -1, pid);
381 HX((pid = getpgid(0)) == -1, pid);
382 HX((e = getpriority(0, 0)) == -1, e);
383
384 if (!faster) {
385 ts.tv_sec = 0;
386 ts.tv_nsec = 1;
387 (void) nanosleep(&ts, NULL);
388 }
389
390 HX(sigpending(&sigset) == -1, sigset);
391 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
392 sigset);
393
394 HF(getentropy); /* an addr in this library */
395 HF(printf); /* an addr in libc */
396 p = (char *)&p;
397 HD(p); /* an addr on stack */
398 p = (char *)&errno;
399 HD(p); /* the addr of errno */
400
401 if (i == 0) {
402 struct sockaddr_storage ss;
403 struct statvfs stvfs;
404 struct termios tios;
405 struct statfs stfs;
406 socklen_t ssl;
407 off_t off;
408
409 /*
410 * Prime-sized mappings encourage fragmentation;
411 * thus exposing some address entropy.
412 */
413 struct mm {
414 size_t npg;
415 void *p;
416 } mm[] = {
417 { 17, MAP_FAILED }, { 3, MAP_FAILED },
418 { 11, MAP_FAILED }, { 2, MAP_FAILED },
419 { 5, MAP_FAILED }, { 3, MAP_FAILED },
420 { 7, MAP_FAILED }, { 1, MAP_FAILED },
421 { 57, MAP_FAILED }, { 3, MAP_FAILED },
422 { 131, MAP_FAILED }, { 1, MAP_FAILED },
423 };
424
425 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
426 HX(mm[m].p = mmap(NULL,
427 mm[m].npg * pgs,
428 PROT_READ|PROT_WRITE,
429 MAP_PRIVATE|MAP_ANON, -1,
430 (off_t)0), mm[m].p);
431 if (mm[m].p != MAP_FAILED) {
432 size_t mo;
433
434 /* Touch some memory... */
435 p = mm[m].p;
436 mo = cnt %
437 (mm[m].npg * pgs - 1);
438 p[mo] = 1;
439 cnt += (int)((long)(mm[m].p)
440 / pgs);
441 }
442
443 /* Check cnts and times... */
444 for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]);
445 ii++) {
446 HX((e = clock_gettime(cl[ii],
447 &ts)) == -1, ts);
448 if (e != -1)
449 cnt += (int)ts.tv_nsec;
450 }
451
452 HX((e = getrusage(RUSAGE_SELF,
453 &ru)) == -1, ru);
454 if (e != -1) {
455 cnt += (int)ru.ru_utime.tv_sec;
456 cnt += (int)ru.ru_utime.tv_usec;
457 }
458 }
459
460 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
461 if (mm[m].p != MAP_FAILED)
462 munmap(mm[m].p, mm[m].npg * pgs);
463 mm[m].p = MAP_FAILED;
464 }
465
466 HX(stat(".", &st) == -1, st);
467 HX(statvfs(".", &stvfs) == -1, stvfs);
468 HX(statfs(".", &stfs) == -1, stfs);
469
470 HX(stat("/", &st) == -1, st);
471 HX(statvfs("/", &stvfs) == -1, stvfs);
472 HX(statfs("/", &stfs) == -1, stfs);
473
474 HX((e = fstat(0, &st)) == -1, st);
475 if (e == -1) {
476 if (S_ISREG(st.st_mode) ||
477 S_ISFIFO(st.st_mode) ||
478 S_ISSOCK(st.st_mode)) {
479 HX(fstatvfs(0, &stvfs) == -1,
480 stvfs);
481 HX(fstatfs(0, &stfs) == -1,
482 stfs);
483 HX((off = lseek(0, (off_t)0,
484 SEEK_CUR)) < 0, off);
485 }
486 if (S_ISCHR(st.st_mode)) {
487 HX(tcgetattr(0, &tios) == -1,
488 tios);
489 } else if (S_ISSOCK(st.st_mode)) {
490 memset(&ss, 0, sizeof ss);
491 ssl = sizeof(ss);
492 HX(getpeername(0,
493 (void *)&ss, &ssl) == -1,
494 ss);
495 }
496 }
497
498 HX((e = getrusage(RUSAGE_CHILDREN,
499 &ru)) == -1, ru);
500 if (e != -1) {
501 cnt += (int)ru.ru_utime.tv_sec;
502 cnt += (int)ru.ru_utime.tv_usec;
503 }
504 } else {
505 /* Subsequent hashes absorb previous result */
506 HD(results);
507 }
508
509 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
510 if (e != -1) {
511 cnt += (int)tv.tv_sec;
512 cnt += (int)tv.tv_usec;
513 }
514
515 HD(cnt);
516 }
517#ifdef HAVE_GETAUXVAL
518#ifdef AT_RANDOM
519 /* Not as random as you think but we take what we are given */
520 p = (char *) getauxval(AT_RANDOM);
521 if (p)
522 HR(p, 16);
523#endif
524#ifdef AT_SYSINFO_EHDR
525 p = (char *) getauxval(AT_SYSINFO_EHDR);
526 if (p)
527 HR(p, pgs);
528#endif
529#ifdef AT_BASE
530 p = (char *) getauxval(AT_BASE);
531 if (p)
532 HD(p);
533#endif
534#endif
535
536 SHA512_Final(results, &ctx);
537 memcpy((char *)buf + i, results, min(sizeof(results), len - i));
538 i += min(sizeof(results), len - i);
539 }
540 explicit_bzero(&ctx, sizeof ctx);
541 explicit_bzero(results, sizeof results);
542 if (gotdata(buf, len) == 0) {
543 errno = save_errno;
544 return 0; /* satisfied */
545 }
546 errno = EIO;
547 return -1;
548}
diff --git a/src/lib/libcrypto/arc4random/getentropy_netbsd.c b/src/lib/libcrypto/arc4random/getentropy_netbsd.c
deleted file mode 100644
index a9710ef923..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_netbsd.c
+++ /dev/null
@@ -1,64 +0,0 @@
1/* $OpenBSD: getentropy_netbsd.c,v 1.1 2015/01/19 20:21:40 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}
diff --git a/src/lib/libcrypto/arc4random/getentropy_osx.c b/src/lib/libcrypto/arc4random/getentropy_osx.c
deleted file mode 100644
index ac5c748f6a..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_osx.c
+++ /dev/null
@@ -1,429 +0,0 @@
1/* $OpenBSD: getentropy_osx.c,v 1.8 2014/07/21 20:19:47 guenther Exp $ */
2
3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
5 * Copyright (c) 2014 Bob Beck <beck@obtuse.com>
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/param.h>
25#include <sys/ioctl.h>
26#include <sys/resource.h>
27#include <sys/syscall.h>
28#include <sys/sysctl.h>
29#include <sys/statvfs.h>
30#include <sys/socket.h>
31#include <sys/mount.h>
32#include <sys/mman.h>
33#include <sys/stat.h>
34#include <sys/time.h>
35#include <stdlib.h>
36#include <stdint.h>
37#include <stdio.h>
38#include <termios.h>
39#include <fcntl.h>
40#include <signal.h>
41#include <string.h>
42#include <errno.h>
43#include <unistd.h>
44#include <time.h>
45#include <mach/mach_time.h>
46#include <mach/mach_host.h>
47#include <mach/host_info.h>
48#include <sys/socketvar.h>
49#include <sys/vmmeter.h>
50#include <netinet/in.h>
51#include <netinet/tcp.h>
52#include <netinet/udp.h>
53#include <netinet/ip_var.h>
54#include <netinet/tcp_var.h>
55#include <netinet/udp_var.h>
56#include <CommonCrypto/CommonDigest.h>
57#define SHA512_Update(a, b, c) (CC_SHA512_Update((a), (b), (c)))
58#define SHA512_Init(xxx) (CC_SHA512_Init((xxx)))
59#define SHA512_Final(xxx, yyy) (CC_SHA512_Final((xxx), (yyy)))
60#define SHA512_CTX CC_SHA512_CTX
61#define SHA512_DIGEST_LENGTH CC_SHA512_DIGEST_LENGTH
62
63#define REPEAT 5
64#define min(a, b) (((a) < (b)) ? (a) : (b))
65
66#define HX(a, b) \
67 do { \
68 if ((a)) \
69 HD(errno); \
70 else \
71 HD(b); \
72 } while (0)
73
74#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
75#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
76#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
77
78int getentropy(void *buf, size_t len);
79
80static int gotdata(char *buf, size_t len);
81static int getentropy_urandom(void *buf, size_t len);
82static int getentropy_fallback(void *buf, size_t len);
83
84int
85getentropy(void *buf, size_t len)
86{
87 int ret = -1;
88
89 if (len > 256) {
90 errno = EIO;
91 return -1;
92 }
93
94 /*
95 * Try to get entropy with /dev/urandom
96 *
97 * This can fail if the process is inside a chroot or if file
98 * descriptors are exhausted.
99 */
100 ret = getentropy_urandom(buf, len);
101 if (ret != -1)
102 return (ret);
103
104 /*
105 * Entropy collection via /dev/urandom and sysctl have failed.
106 *
107 * No other API exists for collecting entropy, and we have
108 * no failsafe way to get it on OSX that is not sensitive
109 * to resource exhaustion.
110 *
111 * We have very few options:
112 * - Even syslog_r is unsafe to call at this low level, so
113 * there is no way to alert the user or program.
114 * - Cannot call abort() because some systems have unsafe
115 * corefiles.
116 * - Could raise(SIGKILL) resulting in silent program termination.
117 * - Return EIO, to hint that arc4random's stir function
118 * should raise(SIGKILL)
119 * - Do the best under the circumstances....
120 *
121 * This code path exists to bring light to the issue that OSX
122 * does not provide a failsafe API for entropy collection.
123 *
124 * We hope this demonstrates that OSX should consider
125 * providing a new failsafe API which works in a chroot or
126 * when file descriptors are exhausted.
127 */
128#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
129#ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
130 raise(SIGKILL);
131#endif
132 ret = getentropy_fallback(buf, len);
133 if (ret != -1)
134 return (ret);
135
136 errno = EIO;
137 return (ret);
138}
139
140/*
141 * Basic sanity checking; wish we could do better.
142 */
143static int
144gotdata(char *buf, size_t len)
145{
146 char any_set = 0;
147 size_t i;
148
149 for (i = 0; i < len; ++i)
150 any_set |= buf[i];
151 if (any_set == 0)
152 return -1;
153 return 0;
154}
155
156static int
157getentropy_urandom(void *buf, size_t len)
158{
159 struct stat st;
160 size_t i;
161 int fd, flags;
162 int save_errno = errno;
163
164start:
165
166 flags = O_RDONLY;
167#ifdef O_NOFOLLOW
168 flags |= O_NOFOLLOW;
169#endif
170#ifdef O_CLOEXEC
171 flags |= O_CLOEXEC;
172#endif
173 fd = open("/dev/urandom", flags, 0);
174 if (fd == -1) {
175 if (errno == EINTR)
176 goto start;
177 goto nodevrandom;
178 }
179#ifndef O_CLOEXEC
180 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
181#endif
182
183 /* Lightly verify that the device node looks sane */
184 if (fstat(fd, &st) == -1 || !S_ISCHR(st.st_mode)) {
185 close(fd);
186 goto nodevrandom;
187 }
188 for (i = 0; i < len; ) {
189 size_t wanted = len - i;
190 ssize_t ret = read(fd, (char *)buf + i, wanted);
191
192 if (ret == -1) {
193 if (errno == EAGAIN || errno == EINTR)
194 continue;
195 close(fd);
196 goto nodevrandom;
197 }
198 i += ret;
199 }
200 close(fd);
201 if (gotdata(buf, len) == 0) {
202 errno = save_errno;
203 return 0; /* satisfied */
204 }
205nodevrandom:
206 errno = EIO;
207 return -1;
208}
209
210static int tcpmib[] = { CTL_NET, AF_INET, IPPROTO_TCP, TCPCTL_STATS };
211static int udpmib[] = { CTL_NET, AF_INET, IPPROTO_UDP, UDPCTL_STATS };
212static int ipmib[] = { CTL_NET, AF_INET, IPPROTO_IP, IPCTL_STATS };
213static int kmib[] = { CTL_KERN, KERN_USRSTACK };
214static int hwmib[] = { CTL_HW, HW_USERMEM };
215
216static int
217getentropy_fallback(void *buf, size_t len)
218{
219 uint8_t results[SHA512_DIGEST_LENGTH];
220 int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
221 static int cnt;
222 struct timespec ts;
223 struct timeval tv;
224 struct rusage ru;
225 sigset_t sigset;
226 struct stat st;
227 SHA512_CTX ctx;
228 static pid_t lastpid;
229 pid_t pid;
230 size_t i, ii, m;
231 char *p;
232 struct tcpstat tcpstat;
233 struct udpstat udpstat;
234 struct ipstat ipstat;
235 u_int64_t mach_time;
236 unsigned int idata;
237 void *addr;
238
239 pid = getpid();
240 if (lastpid == pid) {
241 faster = 1;
242 repeat = 2;
243 } else {
244 faster = 0;
245 lastpid = pid;
246 repeat = REPEAT;
247 }
248 for (i = 0; i < len; ) {
249 int j;
250 SHA512_Init(&ctx);
251 for (j = 0; j < repeat; j++) {
252 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
253 if (e != -1) {
254 cnt += (int)tv.tv_sec;
255 cnt += (int)tv.tv_usec;
256 }
257
258 mach_time = mach_absolute_time();
259 HD(mach_time);
260
261 ii = sizeof(addr);
262 HX(sysctl(kmib, sizeof(kmib) / sizeof(kmib[0]),
263 &addr, &ii, NULL, 0) == -1, addr);
264
265 ii = sizeof(idata);
266 HX(sysctl(hwmib, sizeof(hwmib) / sizeof(hwmib[0]),
267 &idata, &ii, NULL, 0) == -1, idata);
268
269 ii = sizeof(tcpstat);
270 HX(sysctl(tcpmib, sizeof(tcpmib) / sizeof(tcpmib[0]),
271 &tcpstat, &ii, NULL, 0) == -1, tcpstat);
272
273 ii = sizeof(udpstat);
274 HX(sysctl(udpmib, sizeof(udpmib) / sizeof(udpmib[0]),
275 &udpstat, &ii, NULL, 0) == -1, udpstat);
276
277 ii = sizeof(ipstat);
278 HX(sysctl(ipmib, sizeof(ipmib) / sizeof(ipmib[0]),
279 &ipstat, &ii, NULL, 0) == -1, ipstat);
280
281 HX((pid = getpid()) == -1, pid);
282 HX((pid = getsid(pid)) == -1, pid);
283 HX((pid = getppid()) == -1, pid);
284 HX((pid = getpgid(0)) == -1, pid);
285 HX((e = getpriority(0, 0)) == -1, e);
286
287 if (!faster) {
288 ts.tv_sec = 0;
289 ts.tv_nsec = 1;
290 (void) nanosleep(&ts, NULL);
291 }
292
293 HX(sigpending(&sigset) == -1, sigset);
294 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
295 sigset);
296
297 HF(getentropy); /* an addr in this library */
298 HF(printf); /* an addr in libc */
299 p = (char *)&p;
300 HD(p); /* an addr on stack */
301 p = (char *)&errno;
302 HD(p); /* the addr of errno */
303
304 if (i == 0) {
305 struct sockaddr_storage ss;
306 struct statvfs stvfs;
307 struct termios tios;
308 struct statfs stfs;
309 socklen_t ssl;
310 off_t off;
311
312 /*
313 * Prime-sized mappings encourage fragmentation;
314 * thus exposing some address entropy.
315 */
316 struct mm {
317 size_t npg;
318 void *p;
319 } mm[] = {
320 { 17, MAP_FAILED }, { 3, MAP_FAILED },
321 { 11, MAP_FAILED }, { 2, MAP_FAILED },
322 { 5, MAP_FAILED }, { 3, MAP_FAILED },
323 { 7, MAP_FAILED }, { 1, MAP_FAILED },
324 { 57, MAP_FAILED }, { 3, MAP_FAILED },
325 { 131, MAP_FAILED }, { 1, MAP_FAILED },
326 };
327
328 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
329 HX(mm[m].p = mmap(NULL,
330 mm[m].npg * pgs,
331 PROT_READ|PROT_WRITE,
332 MAP_PRIVATE|MAP_ANON, -1,
333 (off_t)0), mm[m].p);
334 if (mm[m].p != MAP_FAILED) {
335 size_t mo;
336
337 /* Touch some memory... */
338 p = mm[m].p;
339 mo = cnt %
340 (mm[m].npg * pgs - 1);
341 p[mo] = 1;
342 cnt += (int)((long)(mm[m].p)
343 / pgs);
344 }
345
346 /* Check cnts and times... */
347 mach_time = mach_absolute_time();
348 HD(mach_time);
349 cnt += (int)mach_time;
350
351 HX((e = getrusage(RUSAGE_SELF,
352 &ru)) == -1, ru);
353 if (e != -1) {
354 cnt += (int)ru.ru_utime.tv_sec;
355 cnt += (int)ru.ru_utime.tv_usec;
356 }
357 }
358
359 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
360 if (mm[m].p != MAP_FAILED)
361 munmap(mm[m].p, mm[m].npg * pgs);
362 mm[m].p = MAP_FAILED;
363 }
364
365 HX(stat(".", &st) == -1, st);
366 HX(statvfs(".", &stvfs) == -1, stvfs);
367 HX(statfs(".", &stfs) == -1, stfs);
368
369 HX(stat("/", &st) == -1, st);
370 HX(statvfs("/", &stvfs) == -1, stvfs);
371 HX(statfs("/", &stfs) == -1, stfs);
372
373 HX((e = fstat(0, &st)) == -1, st);
374 if (e == -1) {
375 if (S_ISREG(st.st_mode) ||
376 S_ISFIFO(st.st_mode) ||
377 S_ISSOCK(st.st_mode)) {
378 HX(fstatvfs(0, &stvfs) == -1,
379 stvfs);
380 HX(fstatfs(0, &stfs) == -1,
381 stfs);
382 HX((off = lseek(0, (off_t)0,
383 SEEK_CUR)) < 0, off);
384 }
385 if (S_ISCHR(st.st_mode)) {
386 HX(tcgetattr(0, &tios) == -1,
387 tios);
388 } else if (S_ISSOCK(st.st_mode)) {
389 memset(&ss, 0, sizeof ss);
390 ssl = sizeof(ss);
391 HX(getpeername(0,
392 (void *)&ss, &ssl) == -1,
393 ss);
394 }
395 }
396
397 HX((e = getrusage(RUSAGE_CHILDREN,
398 &ru)) == -1, ru);
399 if (e != -1) {
400 cnt += (int)ru.ru_utime.tv_sec;
401 cnt += (int)ru.ru_utime.tv_usec;
402 }
403 } else {
404 /* Subsequent hashes absorb previous result */
405 HD(results);
406 }
407
408 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
409 if (e != -1) {
410 cnt += (int)tv.tv_sec;
411 cnt += (int)tv.tv_usec;
412 }
413
414 HD(cnt);
415 }
416
417 SHA512_Final(results, &ctx);
418 memcpy((char *)buf + i, results, min(sizeof(results), len - i));
419 i += min(sizeof(results), len - i);
420 }
421 explicit_bzero(&ctx, sizeof ctx);
422 explicit_bzero(results, sizeof results);
423 if (gotdata(buf, len) == 0) {
424 errno = save_errno;
425 return 0; /* satisfied */
426 }
427 errno = EIO;
428 return -1;
429}
diff --git a/src/lib/libcrypto/arc4random/getentropy_solaris.c b/src/lib/libcrypto/arc4random/getentropy_solaris.c
deleted file mode 100644
index 6ec2fe584c..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_solaris.c
+++ /dev/null
@@ -1,445 +0,0 @@
1/* $OpenBSD: getentropy_solaris.c,v 1.9 2014/07/21 20:19:47 guenther Exp $ */
2
3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
5 * Copyright (c) 2014 Bob Beck <beck@obtuse.com>
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/param.h>
25#include <sys/ioctl.h>
26#include <sys/resource.h>
27#include <sys/syscall.h>
28#include <sys/statvfs.h>
29#include <sys/socket.h>
30#include <sys/mount.h>
31#include <sys/mman.h>
32#include <sys/stat.h>
33#include <sys/time.h>
34#include <stdlib.h>
35#include <stdint.h>
36#include <stdio.h>
37#include <link.h>
38#include <termios.h>
39#include <fcntl.h>
40#include <signal.h>
41#include <string.h>
42#include <errno.h>
43#include <unistd.h>
44#include <time.h>
45#include <sys/sha2.h>
46#define SHA512_Init SHA512Init
47#define SHA512_Update SHA512Update
48#define SHA512_Final SHA512Final
49
50#include <sys/vfs.h>
51#include <sys/statfs.h>
52#include <sys/loadavg.h>
53
54#define REPEAT 5
55#define min(a, b) (((a) < (b)) ? (a) : (b))
56
57#define HX(a, b) \
58 do { \
59 if ((a)) \
60 HD(errno); \
61 else \
62 HD(b); \
63 } while (0)
64
65#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
66#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
67#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
68
69int getentropy(void *buf, size_t len);
70
71static int gotdata(char *buf, size_t len);
72static int getentropy_urandom(void *buf, size_t len, const char *path,
73 int devfscheck);
74static int getentropy_fallback(void *buf, size_t len);
75static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data);
76
77int
78getentropy(void *buf, size_t len)
79{
80 int ret = -1;
81
82 if (len > 256) {
83 errno = EIO;
84 return -1;
85 }
86
87 /*
88 * Try to get entropy with /dev/urandom
89 *
90 * Solaris provides /dev/urandom as a symbolic link to
91 * /devices/pseudo/random@0:urandom which is provided by
92 * a devfs filesystem. Best practice is to use O_NOFOLLOW,
93 * so we must try the unpublished name directly.
94 *
95 * This can fail if the process is inside a chroot which lacks
96 * the devfs mount, or if file descriptors are exhausted.
97 */
98 ret = getentropy_urandom(buf, len,
99 "/devices/pseudo/random@0:urandom", 1);
100 if (ret != -1)
101 return (ret);
102
103 /*
104 * Unfortunately, chroot spaces on Solaris are sometimes setup
105 * with direct device node of the well-known /dev/urandom name
106 * (perhaps to avoid dragging all of devfs into the space).
107 *
108 * This can fail if the process is inside a chroot or if file
109 * descriptors are exhausted.
110 */
111 ret = getentropy_urandom(buf, len, "/dev/urandom", 0);
112 if (ret != -1)
113 return (ret);
114
115 /*
116 * Entropy collection via /dev/urandom has failed.
117 *
118 * No other API exists for collecting entropy, and we have
119 * no failsafe way to get it on Solaris that is not sensitive
120 * to resource exhaustion.
121 *
122 * We have very few options:
123 * - Even syslog_r is unsafe to call at this low level, so
124 * there is no way to alert the user or program.
125 * - Cannot call abort() because some systems have unsafe
126 * corefiles.
127 * - Could raise(SIGKILL) resulting in silent program termination.
128 * - Return EIO, to hint that arc4random's stir function
129 * should raise(SIGKILL)
130 * - Do the best under the circumstances....
131 *
132 * This code path exists to bring light to the issue that Solaris
133 * does not provide a failsafe API for entropy collection.
134 *
135 * We hope this demonstrates that Solaris should consider
136 * providing a new failsafe API which works in a chroot or
137 * when file descriptors are exhausted.
138 */
139#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
140#ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
141 raise(SIGKILL);
142#endif
143 ret = getentropy_fallback(buf, len);
144 if (ret != -1)
145 return (ret);
146
147 errno = EIO;
148 return (ret);
149}
150
151/*
152 * Basic sanity checking; wish we could do better.
153 */
154static int
155gotdata(char *buf, size_t len)
156{
157 char any_set = 0;
158 size_t i;
159
160 for (i = 0; i < len; ++i)
161 any_set |= buf[i];
162 if (any_set == 0)
163 return -1;
164 return 0;
165}
166
167static int
168getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck)
169{
170 struct stat st;
171 size_t i;
172 int fd, flags;
173 int save_errno = errno;
174
175start:
176
177 flags = O_RDONLY;
178#ifdef O_NOFOLLOW
179 flags |= O_NOFOLLOW;
180#endif
181#ifdef O_CLOEXEC
182 flags |= O_CLOEXEC;
183#endif
184 fd = open(path, flags, 0);
185 if (fd == -1) {
186 if (errno == EINTR)
187 goto start;
188 goto nodevrandom;
189 }
190#ifndef O_CLOEXEC
191 fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
192#endif
193
194 /* Lightly verify that the device node looks sane */
195 if (fstat(fd, &st) == -1 || !S_ISCHR(st.st_mode) ||
196 (devfscheck && (strcmp(st.st_fstype, "devfs") != 0))) {
197 close(fd);
198 goto nodevrandom;
199 }
200 for (i = 0; i < len; ) {
201 size_t wanted = len - i;
202 ssize_t ret = read(fd, (char *)buf + i, wanted);
203
204 if (ret == -1) {
205 if (errno == EAGAIN || errno == EINTR)
206 continue;
207 close(fd);
208 goto nodevrandom;
209 }
210 i += ret;
211 }
212 close(fd);
213 if (gotdata(buf, len) == 0) {
214 errno = save_errno;
215 return 0; /* satisfied */
216 }
217nodevrandom:
218 errno = EIO;
219 return -1;
220}
221
222static const int cl[] = {
223 CLOCK_REALTIME,
224#ifdef CLOCK_MONOTONIC
225 CLOCK_MONOTONIC,
226#endif
227#ifdef CLOCK_MONOTONIC_RAW
228 CLOCK_MONOTONIC_RAW,
229#endif
230#ifdef CLOCK_TAI
231 CLOCK_TAI,
232#endif
233#ifdef CLOCK_VIRTUAL
234 CLOCK_VIRTUAL,
235#endif
236#ifdef CLOCK_UPTIME
237 CLOCK_UPTIME,
238#endif
239#ifdef CLOCK_PROCESS_CPUTIME_ID
240 CLOCK_PROCESS_CPUTIME_ID,
241#endif
242#ifdef CLOCK_THREAD_CPUTIME_ID
243 CLOCK_THREAD_CPUTIME_ID,
244#endif
245};
246
247static int
248getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data)
249{
250 SHA512_CTX *ctx = data;
251
252 SHA512_Update(ctx, &info->dlpi_addr, sizeof (info->dlpi_addr));
253 return 0;
254}
255
256static int
257getentropy_fallback(void *buf, size_t len)
258{
259 uint8_t results[SHA512_DIGEST_LENGTH];
260 int save_errno = errno, e, pgs = getpagesize(), faster = 0, repeat;
261 static int cnt;
262 struct timespec ts;
263 struct timeval tv;
264 double loadavg[3];
265 struct rusage ru;
266 sigset_t sigset;
267 struct stat st;
268 SHA512_CTX ctx;
269 static pid_t lastpid;
270 pid_t pid;
271 size_t i, ii, m;
272 char *p;
273
274 pid = getpid();
275 if (lastpid == pid) {
276 faster = 1;
277 repeat = 2;
278 } else {
279 faster = 0;
280 lastpid = pid;
281 repeat = REPEAT;
282 }
283 for (i = 0; i < len; ) {
284 int j;
285 SHA512_Init(&ctx);
286 for (j = 0; j < repeat; j++) {
287 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
288 if (e != -1) {
289 cnt += (int)tv.tv_sec;
290 cnt += (int)tv.tv_usec;
291 }
292
293 dl_iterate_phdr(getentropy_phdr, &ctx);
294
295 for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++)
296 HX(clock_gettime(cl[ii], &ts) == -1, ts);
297
298 HX((pid = getpid()) == -1, pid);
299 HX((pid = getsid(pid)) == -1, pid);
300 HX((pid = getppid()) == -1, pid);
301 HX((pid = getpgid(0)) == -1, pid);
302 HX((e = getpriority(0, 0)) == -1, e);
303 HX((getloadavg(loadavg, 3) == -1), loadavg);
304
305 if (!faster) {
306 ts.tv_sec = 0;
307 ts.tv_nsec = 1;
308 (void) nanosleep(&ts, NULL);
309 }
310
311 HX(sigpending(&sigset) == -1, sigset);
312 HX(sigprocmask(SIG_BLOCK, NULL, &sigset) == -1,
313 sigset);
314
315 HF(getentropy); /* an addr in this library */
316 HF(printf); /* an addr in libc */
317 p = (char *)&p;
318 HD(p); /* an addr on stack */
319 p = (char *)&errno;
320 HD(p); /* the addr of errno */
321
322 if (i == 0) {
323 struct sockaddr_storage ss;
324 struct statvfs stvfs;
325 struct termios tios;
326 socklen_t ssl;
327 off_t off;
328
329 /*
330 * Prime-sized mappings encourage fragmentation;
331 * thus exposing some address entropy.
332 */
333 struct mm {
334 size_t npg;
335 void *p;
336 } mm[] = {
337 { 17, MAP_FAILED }, { 3, MAP_FAILED },
338 { 11, MAP_FAILED }, { 2, MAP_FAILED },
339 { 5, MAP_FAILED }, { 3, MAP_FAILED },
340 { 7, MAP_FAILED }, { 1, MAP_FAILED },
341 { 57, MAP_FAILED }, { 3, MAP_FAILED },
342 { 131, MAP_FAILED }, { 1, MAP_FAILED },
343 };
344
345 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
346 HX(mm[m].p = mmap(NULL,
347 mm[m].npg * pgs,
348 PROT_READ|PROT_WRITE,
349 MAP_PRIVATE|MAP_ANON, -1,
350 (off_t)0), mm[m].p);
351 if (mm[m].p != MAP_FAILED) {
352 size_t mo;
353
354 /* Touch some memory... */
355 p = mm[m].p;
356 mo = cnt %
357 (mm[m].npg * pgs - 1);
358 p[mo] = 1;
359 cnt += (int)((long)(mm[m].p)
360 / pgs);
361 }
362
363 /* Check cnts and times... */
364 for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]);
365 ii++) {
366 HX((e = clock_gettime(cl[ii],
367 &ts)) == -1, ts);
368 if (e != -1)
369 cnt += (int)ts.tv_nsec;
370 }
371
372 HX((e = getrusage(RUSAGE_SELF,
373 &ru)) == -1, ru);
374 if (e != -1) {
375 cnt += (int)ru.ru_utime.tv_sec;
376 cnt += (int)ru.ru_utime.tv_usec;
377 }
378 }
379
380 for (m = 0; m < sizeof mm/sizeof(mm[0]); m++) {
381 if (mm[m].p != MAP_FAILED)
382 munmap(mm[m].p, mm[m].npg * pgs);
383 mm[m].p = MAP_FAILED;
384 }
385
386 HX(stat(".", &st) == -1, st);
387 HX(statvfs(".", &stvfs) == -1, stvfs);
388
389 HX(stat("/", &st) == -1, st);
390 HX(statvfs("/", &stvfs) == -1, stvfs);
391
392 HX((e = fstat(0, &st)) == -1, st);
393 if (e == -1) {
394 if (S_ISREG(st.st_mode) ||
395 S_ISFIFO(st.st_mode) ||
396 S_ISSOCK(st.st_mode)) {
397 HX(fstatvfs(0, &stvfs) == -1,
398 stvfs);
399 HX((off = lseek(0, (off_t)0,
400 SEEK_CUR)) < 0, off);
401 }
402 if (S_ISCHR(st.st_mode)) {
403 HX(tcgetattr(0, &tios) == -1,
404 tios);
405 } else if (S_ISSOCK(st.st_mode)) {
406 memset(&ss, 0, sizeof ss);
407 ssl = sizeof(ss);
408 HX(getpeername(0,
409 (void *)&ss, &ssl) == -1,
410 ss);
411 }
412 }
413
414 HX((e = getrusage(RUSAGE_CHILDREN,
415 &ru)) == -1, ru);
416 if (e != -1) {
417 cnt += (int)ru.ru_utime.tv_sec;
418 cnt += (int)ru.ru_utime.tv_usec;
419 }
420 } else {
421 /* Subsequent hashes absorb previous result */
422 HD(results);
423 }
424
425 HX((e = gettimeofday(&tv, NULL)) == -1, tv);
426 if (e != -1) {
427 cnt += (int)tv.tv_sec;
428 cnt += (int)tv.tv_usec;
429 }
430
431 HD(cnt);
432 }
433 SHA512_Final(results, &ctx);
434 memcpy((char *)buf + i, results, min(sizeof(results), len - i));
435 i += min(sizeof(results), len - i);
436 }
437 explicit_bzero(&ctx, sizeof ctx);
438 explicit_bzero(results, sizeof results);
439 if (gotdata(buf, len) == 0) {
440 errno = save_errno;
441 return 0; /* satisfied */
442 }
443 errno = EIO;
444 return -1;
445}
diff --git a/src/lib/libcrypto/arc4random/getentropy_win.c b/src/lib/libcrypto/arc4random/getentropy_win.c
deleted file mode 100644
index da048ae157..0000000000
--- a/src/lib/libcrypto/arc4random/getentropy_win.c
+++ /dev/null
@@ -1,59 +0,0 @@
1/* $OpenBSD: getentropy_win.c,v 1.3 2014/11/11 13:54:33 bcook Exp $ */
2
3/*
4 * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
5 * Copyright (c) 2014, Bob Beck <beck@obtuse.com>
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 <windows.h>
24#include <errno.h>
25#include <stdint.h>
26#include <sys/types.h>
27#include <wincrypt.h>
28#include <process.h>
29
30int getentropy(void *buf, size_t len);
31
32/*
33 * On Windows, CryptGenRandom is supposed to be a well-seeded
34 * cryptographically strong random number generator.
35 */
36int
37getentropy(void *buf, size_t len)
38{
39 HCRYPTPROV provider;
40
41 if (len > 256) {
42 errno = EIO;
43 return -1;
44 }
45
46 if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
47 CRYPT_VERIFYCONTEXT) == 0)
48 goto fail;
49 if (CryptGenRandom(provider, len, buf) == 0) {
50 CryptReleaseContext(provider, 0);
51 goto fail;
52 }
53 CryptReleaseContext(provider, 0);
54 return (0);
55
56fail:
57 errno = EIO;
58 return (-1);
59}