diff options
author | bcook <> | 2014-07-19 13:02:28 +0000 |
---|---|---|
committer | bcook <> | 2014-07-19 13:02:28 +0000 |
commit | d9cd3809979ad097af843b89445c42701190f8df (patch) | |
tree | 53d501834c44a51110661a8ac9346c6c06f12bbe /src/lib/libcrypto/crypto/arc4random_solaris.h | |
parent | f1d8f3a3b077fb14b74b07c4a948c986f57e716a (diff) | |
download | openbsd-d9cd3809979ad097af843b89445c42701190f8df.tar.gz openbsd-d9cd3809979ad097af843b89445c42701190f8df.tar.bz2 openbsd-d9cd3809979ad097af843b89445c42701190f8df.zip |
fixup typos
Diffstat (limited to 'src/lib/libcrypto/crypto/arc4random_solaris.h')
-rw-r--r-- | src/lib/libcrypto/crypto/arc4random_solaris.h | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/lib/libcrypto/crypto/arc4random_solaris.h b/src/lib/libcrypto/crypto/arc4random_solaris.h index ec9353f1b7..128f61e003 100644 --- a/src/lib/libcrypto/crypto/arc4random_solaris.h +++ b/src/lib/libcrypto/crypto/arc4random_solaris.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: arc4random_solaris.h,v 1.3 2014/07/19 00:08:43 deraadt Exp $ */ | 1 | /* $OpenBSD: arc4random_solaris.h,v 1.4 2014/07/19 13:02:28 bcook Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1996, David Mazieres <dm@uun.org> | 4 | * Copyright (c) 1996, David Mazieres <dm@uun.org> |
@@ -21,24 +21,6 @@ | |||
21 | /* | 21 | /* |
22 | * Stub functions for portability. | 22 | * Stub functions for portability. |
23 | */ | 23 | */ |
24 | |||
25 | static inline int | ||
26 | _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) | ||
27 | { | ||
28 | if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, | ||
29 | MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) | ||
30 | return (-1); | ||
31 | |||
32 | if ((*rsxp = mmap(NULL, sizeof(**rsxp) PROT_READ|PROT_WRITE, | ||
33 | MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { | ||
34 | munmap(*rsxp, sizeof(**rsxp); | ||
35 | return (-1); | ||
36 | } | ||
37 | |||
38 | _ARC4_ATFORK(_rs_forkhandler); | ||
39 | return (0); | ||
40 | } | ||
41 | |||
42 | static volatile sig_atomic_t _rs_forked; | 24 | static volatile sig_atomic_t _rs_forked; |
43 | 25 | ||
44 | static inline void | 26 | static inline void |
@@ -60,3 +42,20 @@ _rs_forkdetect(void) | |||
60 | memset(rs, 0, sizeof(*rs)); | 42 | memset(rs, 0, sizeof(*rs)); |
61 | } | 43 | } |
62 | } | 44 | } |
45 | |||
46 | static inline int | ||
47 | _rs_allocate(struct _rs **rsp, struct _rsx **rsxp) | ||
48 | { | ||
49 | if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, | ||
50 | MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) | ||
51 | return (-1); | ||
52 | |||
53 | if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, | ||
54 | MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { | ||
55 | munmap(*rsxp, sizeof(**rsxp)); | ||
56 | return (-1); | ||
57 | } | ||
58 | |||
59 | _ARC4_ATFORK(_rs_forkhandler); | ||
60 | return (0); | ||
61 | } | ||