summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-10-21 10:13:35 +1000
committerDamien Miller <djm@mindrot.org>2002-10-21 10:13:35 +1000
commit5a5da88c59d30c8a97625def757d20f151bb200c (patch)
treead67fa1954289734b7625d8877a497b8f49bcd80
parent3e0064781bfd3a0efdd28ee84f34a3807ff2988a (diff)
- (djm) Kill ssh-rand-helper children on timeout, patch from
dtucker@zip.com.au
-rw-r--r--ChangeLog6
-rw-r--r--ssh-rand-helper.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0947b39e0..9a01c2317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120021021
2 - (djm) Kill ssh-rand-helper children on timeout, patch from
3 dtucker@zip.com.au
4
120021015 520021015
2 - (bal) Fix bug id 383 and only call loginrestrict for AIX if not root. 6 - (bal) Fix bug id 383 and only call loginrestrict for AIX if not root.
3 - (bal) More advanced strsep test by Darren Tucker <dtucker@zip.com.au> 7 - (bal) More advanced strsep test by Darren Tucker <dtucker@zip.com.au>
@@ -768,4 +772,4 @@
768 save auth method before monitor_reset_key_state(); bugzilla bug #284; 772 save auth method before monitor_reset_key_state(); bugzilla bug #284;
769 ok provos@ 773 ok provos@
770 774
771$Id: ChangeLog,v 1.2496 2002/10/16 00:24:03 mouring Exp $ 775$Id: ChangeLog,v 1.2497 2002/10/21 00:13:35 djm Exp $
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index e6c52b546..375ba3cbf 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,7 @@
39#include "pathnames.h" 39#include "pathnames.h"
40#include "log.h" 40#include "log.h"
41 41
42RCSID("$Id: ssh-rand-helper.c,v 1.8 2002/07/28 20:42:24 stevesk Exp $"); 42RCSID("$Id: ssh-rand-helper.c,v 1.9 2002/10/21 00:13:37 djm Exp $");
43 43
44/* Number of bytes we write out */ 44/* Number of bytes we write out */
45#define OUTPUT_SEED_SIZE 48 45#define OUTPUT_SEED_SIZE 48
@@ -355,6 +355,7 @@ hash_command_output(entropy_cmd_t *src, unsigned char *hash)
355 case 0: 355 case 0:
356 /* timer expired */ 356 /* timer expired */
357 error_abort = 1; 357 error_abort = 1;
358 kill(pid, SIGINT);
358 break; 359 break;
359 case 1: 360 case 1:
360 /* command input */ 361 /* command input */