diff options
author | deraadt <> | 2003-06-11 21:03:10 +0000 |
---|---|---|
committer | deraadt <> | 2003-06-11 21:03:10 +0000 |
commit | 9b3b34e9713b6e433e3bb19fc1808375d5c69917 (patch) | |
tree | f59762eba799df967b9eb84c215e5256b6e4704f /src/lib/libc/crypt | |
parent | bf4543146942d69d86bd7bcda7713e9470d8a707 (diff) | |
download | openbsd-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.c | 27 |
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; | |||
49 | static pid_t arc4_stir_pid; | 49 | static pid_t arc4_stir_pid; |
50 | 50 | ||
51 | static inline void | 51 | static inline void |
52 | arc4_init(as) | 52 | arc4_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 | ||
63 | static inline void | 62 | static inline void |
64 | arc4_addrandom(as, dat, datlen) | 63 | arc4_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 | ||
83 | static void | 79 | static void |
84 | arc4_stir(as) | 80 | arc4_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 | ||
121 | static inline u_int8_t | 116 | static inline u_int8_t |
122 | arc4_getbyte(as) | 117 | arc4_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 | ||
136 | static inline u_int32_t | 130 | static inline u_int32_t |
137 | arc4_getword(as) | 131 | arc4_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 | ||
148 | void | 141 | void |
149 | arc4random_stir() | 142 | arc4random_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 | ||
158 | void | 151 | void |
159 | arc4random_addrandom(dat, datlen) | 152 | arc4random_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 | ||
168 | u_int32_t | 159 | u_int32_t |
169 | arc4random() | 160 | arc4random(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(); |