summaryrefslogtreecommitdiff
path: root/src/lib/libc/crypt
diff options
context:
space:
mode:
authorderaadt <>2003-06-11 21:03:10 +0000
committerderaadt <>2003-06-11 21:03:10 +0000
commit9b3b34e9713b6e433e3bb19fc1808375d5c69917 (patch)
treef59762eba799df967b9eb84c215e5256b6e4704f /src/lib/libc/crypt
parentbf4543146942d69d86bd7bcda7713e9470d8a707 (diff)
downloadopenbsd-9b3b34e9713b6e433e3bb19fc1808375d5c69917.tar.gz
openbsd-9b3b34e9713b6e433e3bb19fc1808375d5c69917.tar.bz2
openbsd-9b3b34e9713b6e433e3bb19fc1808375d5c69917.zip
ansification; checked by pval
Diffstat (limited to 'src/lib/libc/crypt')
-rw-r--r--src/lib/libc/crypt/arc4random.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c
index a41001bcc3..b23b1955e4 100644
--- a/src/lib/libc/crypt/arc4random.c
+++ b/src/lib/libc/crypt/arc4random.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: arc4random.c,v 1.7 2003/02/14 17:12:54 deraadt Exp $ */ 1/* $OpenBSD: arc4random.c,v 1.8 2003/06/11 21:03:10 deraadt Exp $ */
2 2
3/* 3/*
4 * Arc4 random number generator for OpenBSD. 4 * Arc4 random number generator for OpenBSD.
@@ -49,8 +49,7 @@ static struct arc4_stream rs;
49static pid_t arc4_stir_pid; 49static pid_t arc4_stir_pid;
50 50
51static inline void 51static inline void
52arc4_init(as) 52arc4_init(struct arc4_stream *as)
53 struct arc4_stream *as;
54{ 53{
55 int n; 54 int n;
56 55
@@ -61,10 +60,7 @@ arc4_init(as)
61} 60}
62 61
63static inline void 62static inline void
64arc4_addrandom(as, dat, datlen) 63arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen)
65 struct arc4_stream *as;
66 u_char *dat;
67 int datlen;
68{ 64{
69 int n; 65 int n;
70 u_int8_t si; 66 u_int8_t si;
@@ -81,8 +77,7 @@ arc4_addrandom(as, dat, datlen)
81} 77}
82 78
83static void 79static void
84arc4_stir(as) 80arc4_stir(struct arc4_stream *as)
85 struct arc4_stream *as;
86{ 81{
87 int fd; 82 int fd;
88 struct { 83 struct {
@@ -119,8 +114,7 @@ arc4_stir(as)
119} 114}
120 115
121static inline u_int8_t 116static inline u_int8_t
122arc4_getbyte(as) 117arc4_getbyte(struct arc4_stream *as)
123 struct arc4_stream *as;
124{ 118{
125 u_int8_t si, sj; 119 u_int8_t si, sj;
126 120
@@ -134,8 +128,7 @@ arc4_getbyte(as)
134} 128}
135 129
136static inline u_int32_t 130static inline u_int32_t
137arc4_getword(as) 131arc4_getword(struct arc4_stream *as)
138 struct arc4_stream *as;
139{ 132{
140 u_int32_t val; 133 u_int32_t val;
141 val = arc4_getbyte(as) << 24; 134 val = arc4_getbyte(as) << 24;
@@ -146,7 +139,7 @@ arc4_getword(as)
146} 139}
147 140
148void 141void
149arc4random_stir() 142arc4random_stir(void)
150{ 143{
151 if (!rs_initialized) { 144 if (!rs_initialized) {
152 arc4_init(&rs); 145 arc4_init(&rs);
@@ -156,9 +149,7 @@ arc4random_stir()
156} 149}
157 150
158void 151void
159arc4random_addrandom(dat, datlen) 152arc4random_addrandom(u_char *dat, int datlen)
160 u_char *dat;
161 int datlen;
162{ 153{
163 if (!rs_initialized) 154 if (!rs_initialized)
164 arc4random_stir(); 155 arc4random_stir();
@@ -166,7 +157,7 @@ arc4random_addrandom(dat, datlen)
166} 157}
167 158
168u_int32_t 159u_int32_t
169arc4random() 160arc4random(void)
170{ 161{
171 if (!rs_initialized || arc4_stir_pid != getpid()) 162 if (!rs_initialized || arc4_stir_pid != getpid())
172 arc4random_stir(); 163 arc4random_stir();