summaryrefslogtreecommitdiff
path: root/entropy.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-08-06 16:51:49 +1000
committerDamien Miller <djm@mindrot.org>2001-08-06 16:51:49 +1000
commit2ab5924d1fd11233b50714ef40384a62e1f6740a (patch)
treea55295ab28d63d59bf7aeeb61efe758b512f5183 /entropy.c
parente26a155415ffb384fd95296b2ed9e129169abd10 (diff)
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
a fast UltraSPARC.
Diffstat (limited to 'entropy.c')
-rw-r--r--entropy.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/entropy.c b/entropy.c
index 554a72b0d..d9760cc1d 100644
--- a/entropy.c
+++ b/entropy.c
@@ -40,7 +40,7 @@
40#include "pathnames.h" 40#include "pathnames.h"
41#include "log.h" 41#include "log.h"
42 42
43RCSID("$Id: entropy.c,v 1.37 2001/06/27 13:36:08 djm Exp $"); 43RCSID("$Id: entropy.c,v 1.38 2001/08/06 06:51:49 djm Exp $");
44 44
45#ifndef offsetof 45#ifndef offsetof
46# define offsetof(type, member) ((size_t) &((type *)0)->member) 46# define offsetof(type, member) ((size_t) &((type *)0)->member)
@@ -505,7 +505,9 @@ hash_output_from_command(entropy_source_t *src, char *hash)
505 break; 505 break;
506 case 1: 506 case 1:
507 /* command input */ 507 /* command input */
508 bytes_read = read(p[0], buf, sizeof(buf)); 508 do {
509 bytes_read = read(p[0], buf, sizeof(buf));
510 } while (bytes_read == -1 && errno == EINTR);
509 RAND_add(&bytes_read, sizeof(&bytes_read), 0.0); 511 RAND_add(&bytes_read, sizeof(&bytes_read), 0.0);
510 if (bytes_read == -1) { 512 if (bytes_read == -1) {
511 error_abort = 1; 513 error_abort = 1;