mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
See ChangeLog: Sat Mar 20 11:53:40 CET 1999 Werner Koch
This commit is contained in:
parent
8d255ff264
commit
fb8dbdbd95
14 changed files with 118 additions and 29 deletions
|
@ -82,6 +82,7 @@ do_read( int fd, void *buf, size_t nbytes )
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* fixme: level 1 is not yet handled */
|
||||
static int
|
||||
gather_random( void (*add)(const void*, size_t, int), int requester,
|
||||
|
@ -138,14 +139,15 @@ gather_random( void (*add)(const void*, size_t, int), int requester,
|
|||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
if( !n ) {
|
||||
g10_log_error("bad EGD reply: too short\n");
|
||||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
if( n > 1 ) {
|
||||
n--;
|
||||
(*add)( buffer+1, n, requester );
|
||||
n = buffer[0];
|
||||
if( n ) {
|
||||
n = do_read( fd, buffer, n );
|
||||
if( n == -1 ) {
|
||||
g10_log_error("read error on EGD: %s\n", strerror(errno));
|
||||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
(*add)( buffer, n, requester );
|
||||
length -= n;
|
||||
}
|
||||
|
||||
|
@ -172,11 +174,6 @@ gather_random( void (*add)(const void*, size_t, int), int requester,
|
|||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
if( n != nbytes ) {
|
||||
g10_log_error("bad EGD reply: too short %d/%d\n", nbytes, n );
|
||||
do_restart = 1;
|
||||
goto restart;
|
||||
}
|
||||
(*add)( buffer, n, requester );
|
||||
length -= n;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue