summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbcook <>2014-07-19 13:02:28 +0000
committerbcook <>2014-07-19 13:02:28 +0000
commitd9cd3809979ad097af843b89445c42701190f8df (patch)
tree53d501834c44a51110661a8ac9346c6c06f12bbe /src
parentf1d8f3a3b077fb14b74b07c4a948c986f57e716a (diff)
downloadopenbsd-d9cd3809979ad097af843b89445c42701190f8df.tar.gz
openbsd-d9cd3809979ad097af843b89445c42701190f8df.tar.bz2
openbsd-d9cd3809979ad097af843b89445c42701190f8df.zip
fixup typos
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_linux.h36
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_osx.h36
-rw-r--r--src/lib/libcrypto/arc4random/arc4random_solaris.h37
-rw-r--r--src/lib/libcrypto/crypto/arc4random_linux.h36
-rw-r--r--src/lib/libcrypto/crypto/arc4random_osx.h36
-rw-r--r--src/lib/libcrypto/crypto/arc4random_solaris.h37
6 files changed, 108 insertions, 110 deletions
diff --git a/src/lib/libcrypto/arc4random/arc4random_linux.h b/src/lib/libcrypto/arc4random/arc4random_linux.h
index a713d15e06..992ee6bb8e 100644
--- a/src/lib/libcrypto/arc4random/arc4random_linux.h
+++ b/src/lib/libcrypto/arc4random/arc4random_linux.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: arc4random_linux.h,v 1.3 2014/07/19 00:08:43 deraadt Exp $ */ 1/* $OpenBSD: arc4random_linux.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>
@@ -22,23 +22,6 @@
22 * Stub functions for portability. 22 * Stub functions for portability.
23 */ 23 */
24 24
25static 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
42static volatile sig_atomic_t _rs_forked; 25static volatile sig_atomic_t _rs_forked;
43 26
44static inline void 27static inline void
@@ -60,3 +43,20 @@ _rs_forkdetect(void)
60 memset(rs, 0, sizeof(*rs)); 43 memset(rs, 0, sizeof(*rs));
61 } 44 }
62} 45}
46
47static inline int
48_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
49{
50 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
51 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
52 return (-1);
53
54 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
55 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
56 munmap(*rsxp, sizeof(**rsxp));
57 return (-1);
58 }
59
60 _ARC4_ATFORK(_rs_forkhandler);
61 return (0);
62}
diff --git a/src/lib/libcrypto/arc4random/arc4random_osx.h b/src/lib/libcrypto/arc4random/arc4random_osx.h
index ea4bd70fcd..274288000f 100644
--- a/src/lib/libcrypto/arc4random/arc4random_osx.h
+++ b/src/lib/libcrypto/arc4random/arc4random_osx.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: arc4random_osx.h,v 1.3 2014/07/19 00:08:43 deraadt Exp $ */ 1/* $OpenBSD: arc4random_osx.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>
@@ -22,23 +22,6 @@
22 * Stub functions for portability. 22 * Stub functions for portability.
23 */ 23 */
24 24
25static 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
42static volatile sig_atomic_t _rs_forked; 25static volatile sig_atomic_t _rs_forked;
43 26
44static inline void 27static inline void
@@ -60,3 +43,20 @@ _rs_forkdetect(void)
60 memset(rs, 0, sizeof(*rs)); 43 memset(rs, 0, sizeof(*rs));
61 } 44 }
62} 45}
46
47static inline int
48_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
49{
50 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
51 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
52 return -1;
53
54 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
55 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
56 munmap(*rsxp, sizeof(**rsxp));
57 return -1;
58 }
59
60 _ARC4_ATFORK(_rs_forkhandler);
61 return 0;
62}
diff --git a/src/lib/libcrypto/arc4random/arc4random_solaris.h b/src/lib/libcrypto/arc4random/arc4random_solaris.h
index ec9353f1b7..128f61e003 100644
--- a/src/lib/libcrypto/arc4random/arc4random_solaris.h
+++ b/src/lib/libcrypto/arc4random/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
25static 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
42static volatile sig_atomic_t _rs_forked; 24static volatile sig_atomic_t _rs_forked;
43 25
44static inline void 26static 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
46static 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}
diff --git a/src/lib/libcrypto/crypto/arc4random_linux.h b/src/lib/libcrypto/crypto/arc4random_linux.h
index a713d15e06..992ee6bb8e 100644
--- a/src/lib/libcrypto/crypto/arc4random_linux.h
+++ b/src/lib/libcrypto/crypto/arc4random_linux.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: arc4random_linux.h,v 1.3 2014/07/19 00:08:43 deraadt Exp $ */ 1/* $OpenBSD: arc4random_linux.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>
@@ -22,23 +22,6 @@
22 * Stub functions for portability. 22 * Stub functions for portability.
23 */ 23 */
24 24
25static 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
42static volatile sig_atomic_t _rs_forked; 25static volatile sig_atomic_t _rs_forked;
43 26
44static inline void 27static inline void
@@ -60,3 +43,20 @@ _rs_forkdetect(void)
60 memset(rs, 0, sizeof(*rs)); 43 memset(rs, 0, sizeof(*rs));
61 } 44 }
62} 45}
46
47static inline int
48_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
49{
50 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
51 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
52 return (-1);
53
54 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
55 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
56 munmap(*rsxp, sizeof(**rsxp));
57 return (-1);
58 }
59
60 _ARC4_ATFORK(_rs_forkhandler);
61 return (0);
62}
diff --git a/src/lib/libcrypto/crypto/arc4random_osx.h b/src/lib/libcrypto/crypto/arc4random_osx.h
index ea4bd70fcd..274288000f 100644
--- a/src/lib/libcrypto/crypto/arc4random_osx.h
+++ b/src/lib/libcrypto/crypto/arc4random_osx.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: arc4random_osx.h,v 1.3 2014/07/19 00:08:43 deraadt Exp $ */ 1/* $OpenBSD: arc4random_osx.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>
@@ -22,23 +22,6 @@
22 * Stub functions for portability. 22 * Stub functions for portability.
23 */ 23 */
24 24
25static 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
42static volatile sig_atomic_t _rs_forked; 25static volatile sig_atomic_t _rs_forked;
43 26
44static inline void 27static inline void
@@ -60,3 +43,20 @@ _rs_forkdetect(void)
60 memset(rs, 0, sizeof(*rs)); 43 memset(rs, 0, sizeof(*rs));
61 } 44 }
62} 45}
46
47static inline int
48_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
49{
50 if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
51 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
52 return -1;
53
54 if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
55 MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
56 munmap(*rsxp, sizeof(**rsxp));
57 return -1;
58 }
59
60 _ARC4_ATFORK(_rs_forkhandler);
61 return 0;
62}
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
25static 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
42static volatile sig_atomic_t _rs_forked; 24static volatile sig_atomic_t _rs_forked;
43 25
44static inline void 26static 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
46static 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}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 00:10:38 +0000