summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_aix.c33
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_hpux.c33
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_linux.c39
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_osx.c33
-rw-r--r--src/lib/libcrypto/arc4random/getentropy_solaris.c33
5 files changed, 27 insertions, 144 deletions
diff --git a/src/lib/libcrypto/arc4random/getentropy_aix.c b/src/lib/libcrypto/arc4random/getentropy_aix.c
index ff48ae7071..bd8818f264 100644
--- a/src/lib/libcrypto/arc4random/getentropy_aix.c
+++ b/src/lib/libcrypto/arc4random/getentropy_aix.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_aix.c,v 1.5 2016/08/07 03:27:21 tb Exp $ */ 1/* $OpenBSD: getentropy_aix.c,v 1.6 2018/11/20 08:04:28 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2015 Michael Felt <aixtools@gmail.com> 4 * Copyright (c) 2015 Michael Felt <aixtools@gmail.com>
@@ -60,7 +60,6 @@
60 60
61int getentropy(void *buf, size_t len); 61int getentropy(void *buf, size_t len);
62 62
63static int gotdata(char *buf, size_t len);
64static int getentropy_urandom(void *buf, size_t len, const char *path, 63static int getentropy_urandom(void *buf, size_t len, const char *path,
65 int devfscheck); 64 int devfscheck);
66static int getentropy_fallback(void *buf, size_t len); 65static int getentropy_fallback(void *buf, size_t len);
@@ -118,22 +117,6 @@ getentropy(void *buf, size_t len)
118 return (ret); 117 return (ret);
119} 118}
120 119
121/*
122 * Basic sanity checking; wish we could do better.
123 */
124static int
125gotdata(char *buf, size_t len)
126{
127 char any_set = 0;
128 size_t i;
129
130 for (i = 0; i < len; ++i)
131 any_set |= buf[i];
132 if (any_set == 0)
133 return (-1);
134 return (0);
135}
136
137static int 120static int
138getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck) 121getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck)
139{ 122{
@@ -179,10 +162,8 @@ start:
179 i += ret; 162 i += ret;
180 } 163 }
181 close(fd); 164 close(fd);
182 if (gotdata(buf, len) == 0) { 165 errno = save_errno;
183 errno = save_errno; 166 return (0); /* satisfied */
184 return (0); /* satisfied */
185 }
186nodevrandom: 167nodevrandom:
187 errno = EIO; 168 errno = EIO;
188 return (-1); 169 return (-1);
@@ -416,10 +397,6 @@ getentropy_fallback(void *buf, size_t len)
416 } 397 }
417 explicit_bzero(&ctx, sizeof ctx); 398 explicit_bzero(&ctx, sizeof ctx);
418 explicit_bzero(results, sizeof results); 399 explicit_bzero(results, sizeof results);
419 if (gotdata(buf, len) == 0) { 400 errno = save_errno;
420 errno = save_errno; 401 return (0); /* satisfied */
421 return (0); /* satisfied */
422 }
423 errno = EIO;
424 return (-1);
425} 402}
diff --git a/src/lib/libcrypto/arc4random/getentropy_hpux.c b/src/lib/libcrypto/arc4random/getentropy_hpux.c
index 3ae6a6aa42..7208aa44c4 100644
--- a/src/lib/libcrypto/arc4random/getentropy_hpux.c
+++ b/src/lib/libcrypto/arc4random/getentropy_hpux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_hpux.c,v 1.5 2016/08/07 03:27:21 tb Exp $ */ 1/* $OpenBSD: getentropy_hpux.c,v 1.6 2018/11/20 08:04:28 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -64,7 +64,6 @@
64 64
65int getentropy(void *buf, size_t len); 65int getentropy(void *buf, size_t len);
66 66
67static int gotdata(char *buf, size_t len);
68static int getentropy_urandom(void *buf, size_t len, const char *path, 67static int getentropy_urandom(void *buf, size_t len, const char *path,
69 int devfscheck); 68 int devfscheck);
70static int getentropy_fallback(void *buf, size_t len); 69static int getentropy_fallback(void *buf, size_t len);
@@ -122,22 +121,6 @@ getentropy(void *buf, size_t len)
122 return (ret); 121 return (ret);
123} 122}
124 123
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 124static int
142getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck) 125getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck)
143{ 126{
@@ -183,10 +166,8 @@ start:
183 i += ret; 166 i += ret;
184 } 167 }
185 close(fd); 168 close(fd);
186 if (gotdata(buf, len) == 0) { 169 errno = save_errno;
187 errno = save_errno; 170 return (0); /* satisfied */
188 return (0); /* satisfied */
189 }
190nodevrandom: 171nodevrandom:
191 errno = EIO; 172 errno = EIO;
192 return (-1); 173 return (-1);
@@ -410,10 +391,6 @@ getentropy_fallback(void *buf, size_t len)
410 } 391 }
411 explicit_bzero(&ctx, sizeof ctx); 392 explicit_bzero(&ctx, sizeof ctx);
412 explicit_bzero(results, sizeof results); 393 explicit_bzero(results, sizeof results);
413 if (gotdata(buf, len) == 0) { 394 errno = save_errno;
414 errno = save_errno; 395 return (0); /* satisfied */
415 return (0); /* satisfied */
416 }
417 errno = EIO;
418 return (-1);
419} 396}
diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c
index 408d7fda34..6b220be311 100644
--- a/src/lib/libcrypto/arc4random/getentropy_linux.c
+++ b/src/lib/libcrypto/arc4random/getentropy_linux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_linux.c,v 1.45 2018/03/13 22:53:28 bcook Exp $ */ 1/* $OpenBSD: getentropy_linux.c,v 1.46 2018/11/20 08:04:28 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -73,7 +73,6 @@
73 73
74int getentropy(void *buf, size_t len); 74int getentropy(void *buf, size_t len);
75 75
76static int gotdata(char *buf, size_t len);
77#if defined(SYS_getrandom) && defined(GRND_NONBLOCK) 76#if defined(SYS_getrandom) && defined(GRND_NONBLOCK)
78static int getentropy_getrandom(void *buf, size_t len); 77static int getentropy_getrandom(void *buf, size_t len);
79#endif 78#endif
@@ -177,22 +176,6 @@ getentropy(void *buf, size_t len)
177 return (ret); 176 return (ret);
178} 177}
179 178
180/*
181 * Basic sanity checking; wish we could do better.
182 */
183static int
184gotdata(char *buf, size_t len)
185{
186 char any_set = 0;
187 size_t i;
188
189 for (i = 0; i < len; ++i)
190 any_set |= buf[i];
191 if (any_set == 0)
192 return (-1);
193 return (0);
194}
195
196#if defined(SYS_getrandom) && defined(GRND_NONBLOCK) 179#if defined(SYS_getrandom) && defined(GRND_NONBLOCK)
197static int 180static int
198getentropy_getrandom(void *buf, size_t len) 181getentropy_getrandom(void *buf, size_t len)
@@ -261,10 +244,8 @@ start:
261 i += ret; 244 i += ret;
262 } 245 }
263 close(fd); 246 close(fd);
264 if (gotdata(buf, len) == 0) { 247 errno = save_errno;
265 errno = save_errno; 248 return (0); /* satisfied */
266 return (0); /* satisfied */
267 }
268nodevrandom: 249nodevrandom:
269 errno = EIO; 250 errno = EIO;
270 return (-1); 251 return (-1);
@@ -292,10 +273,8 @@ getentropy_sysctl(void *buf, size_t len)
292 goto sysctlfailed; 273 goto sysctlfailed;
293 i += chunk; 274 i += chunk;
294 } 275 }
295 if (gotdata(buf, len) == 0) { 276 errno = save_errno;
296 errno = save_errno; 277 return (0); /* satisfied */
297 return (0); /* satisfied */
298 }
299sysctlfailed: 278sysctlfailed:
300 errno = EIO; 279 errno = EIO;
301 return (-1); 280 return (-1);
@@ -541,10 +520,6 @@ getentropy_fallback(void *buf, size_t len)
541 } 520 }
542 explicit_bzero(&ctx, sizeof ctx); 521 explicit_bzero(&ctx, sizeof ctx);
543 explicit_bzero(results, sizeof results); 522 explicit_bzero(results, sizeof results);
544 if (gotdata(buf, len) == 0) { 523 errno = save_errno;
545 errno = save_errno; 524 return (0); /* satisfied */
546 return (0); /* satisfied */
547 }
548 errno = EIO;
549 return (-1);
550} 525}
diff --git a/src/lib/libcrypto/arc4random/getentropy_osx.c b/src/lib/libcrypto/arc4random/getentropy_osx.c
index 2a5f83f3bb..26dcc824de 100644
--- a/src/lib/libcrypto/arc4random/getentropy_osx.c
+++ b/src/lib/libcrypto/arc4random/getentropy_osx.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_osx.c,v 1.11 2016/09/03 15:24:09 bcook Exp $ */ 1/* $OpenBSD: getentropy_osx.c,v 1.12 2018/11/20 08:04:28 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -82,7 +82,6 @@
82 82
83int getentropy(void *buf, size_t len); 83int getentropy(void *buf, size_t len);
84 84
85static int gotdata(char *buf, size_t len);
86static int getentropy_urandom(void *buf, size_t len); 85static int getentropy_urandom(void *buf, size_t len);
87static int getentropy_fallback(void *buf, size_t len); 86static int getentropy_fallback(void *buf, size_t len);
88 87
@@ -142,22 +141,6 @@ getentropy(void *buf, size_t len)
142 return (ret); 141 return (ret);
143} 142}
144 143
145/*
146 * Basic sanity checking; wish we could do better.
147 */
148static int
149gotdata(char *buf, size_t len)
150{
151 char any_set = 0;
152 size_t i;
153
154 for (i = 0; i < len; ++i)
155 any_set |= buf[i];
156 if (any_set == 0)
157 return (-1);
158 return (0);
159}
160
161static int 144static int
162getentropy_urandom(void *buf, size_t len) 145getentropy_urandom(void *buf, size_t len)
163{ 146{
@@ -203,10 +186,8 @@ start:
203 i += ret; 186 i += ret;
204 } 187 }
205 close(fd); 188 close(fd);
206 if (gotdata(buf, len) == 0) { 189 errno = save_errno;
207 errno = save_errno; 190 return (0); /* satisfied */
208 return (0); /* satisfied */
209 }
210nodevrandom: 191nodevrandom:
211 errno = EIO; 192 errno = EIO;
212 return (-1); 193 return (-1);
@@ -431,10 +412,6 @@ getentropy_fallback(void *buf, size_t len)
431 } 412 }
432 explicit_bzero(&ctx, sizeof ctx); 413 explicit_bzero(&ctx, sizeof ctx);
433 explicit_bzero(results, sizeof results); 414 explicit_bzero(results, sizeof results);
434 if (gotdata(buf, len) == 0) { 415 errno = save_errno;
435 errno = save_errno; 416 return (0); /* satisfied */
436 return (0); /* satisfied */
437 }
438 errno = EIO;
439 return (-1);
440} 417}
diff --git a/src/lib/libcrypto/arc4random/getentropy_solaris.c b/src/lib/libcrypto/arc4random/getentropy_solaris.c
index f0fcdcf28b..b80c84de9e 100644
--- a/src/lib/libcrypto/arc4random/getentropy_solaris.c
+++ b/src/lib/libcrypto/arc4random/getentropy_solaris.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: getentropy_solaris.c,v 1.12 2016/08/07 03:27:21 tb Exp $ */ 1/* $OpenBSD: getentropy_solaris.c,v 1.13 2018/11/20 08:04:28 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> 4 * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -68,7 +68,6 @@
68 68
69int getentropy(void *buf, size_t len); 69int getentropy(void *buf, size_t len);
70 70
71static int gotdata(char *buf, size_t len);
72static int getentropy_urandom(void *buf, size_t len, const char *path, 71static int getentropy_urandom(void *buf, size_t len, const char *path,
73 int devfscheck); 72 int devfscheck);
74static int getentropy_fallback(void *buf, size_t len); 73static int getentropy_fallback(void *buf, size_t len);
@@ -148,22 +147,6 @@ getentropy(void *buf, size_t len)
148 return (ret); 147 return (ret);
149} 148}
150 149
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 150static int
168getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck) 151getentropy_urandom(void *buf, size_t len, const char *path, int devfscheck)
169{ 152{
@@ -210,10 +193,8 @@ start:
210 i += ret; 193 i += ret;
211 } 194 }
212 close(fd); 195 close(fd);
213 if (gotdata(buf, len) == 0) { 196 errno = save_errno;
214 errno = save_errno; 197 return (0); /* satisfied */
215 return (0); /* satisfied */
216 }
217nodevrandom: 198nodevrandom:
218 errno = EIO; 199 errno = EIO;
219 return (-1); 200 return (-1);
@@ -436,10 +417,6 @@ getentropy_fallback(void *buf, size_t len)
436 } 417 }
437 explicit_bzero(&ctx, sizeof ctx); 418 explicit_bzero(&ctx, sizeof ctx);
438 explicit_bzero(results, sizeof results); 419 explicit_bzero(results, sizeof results);
439 if (gotdata(buf, len) == 0) { 420 errno = save_errno;
440 errno = save_errno; 421 return (0); /* satisfied */
441 return (0); /* satisfied */
442 }
443 errno = EIO;
444 return (-1);
445} 422}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-24 20:48:59 +0000