openssh unix dev - Jun 2000 - problem in entropy.c if no getrusage

entropy.c assumes RUSAGE_SELF and RUSAGE_CHILDREN

*** entropy.c.orig      Thu Jun 15 13:57:28 2000
--- entropy.c   Thu Jun 15 13:58:25 2000
***************
*** 201,207 ****
--- 201,209 ----
  
        total_entropy_estimate += stir_gettimeofday(1.0);
        total_entropy_estimate += stir_clock(0.2);
+ #ifdef HAVE_GETRUSAGE
        total_entropy_estimate += stir_rusage(RUSAGE_SELF, 2.0);
+ #endif
  
        return(total_entropy_estimate);
  }
***************
*** 247,254 ****
--- 249,258 ----
                        /* Execution times should be a little unpredictable */
                                total_entropy_estimate +=
stir_gettimeofday(0.05);
                                total_entropy_estimate += stir_clock(0.05);
+ #ifdef HAVE_GETRUSAGE
                                total_entropy_estimate +=
stir_rusage(RUSAGE_SELF, 0.1);
                                total_entropy_estimate +=
stir_rusage(RUSAGE_CHILDREN, 0.1);
+ #endif
                        } else {
  #ifdef DEBUG_ENTROPY
                                debug("Command '%s' disabled
(badness %d)",


-- 
Mike Stone

On Thu, 15 Jun 2000, Michael Stone wrote:
> entropy.c assumes RUSAGE_SELF and RUSAGE_CHILDREN
Thanks. This patch also fixes the problem of getrusage being a 
privileged operation on some Unices:

Index: entropy.c
==================================================================RCS file:
/var/cvs/openssh/entropy.c,v
retrieving revision 1.13
diff -u -r1.13 entropy.c
--- entropy.c	2000/06/07 12:20:23	1.13
+++ entropy.c	2000/06/18 02:52:12
@@ -55,6 +55,13 @@
 
 #define WHITESPACE " \t\n"
 
+#ifndef RUSAGE_SELF
+# define RUSAGE_SELF 0
+#endif
+#ifndef RUSAGE_CHILDREN
+# define RUSAGE_CHILDREN 0
+#endif
+
 #if defined(EGD_SOCKET) || defined(RANDOM_POOL)
 
 #ifdef EGD_SOCKET
@@ -301,9 +308,9 @@
 	struct rusage ru;
 	
 	if (getrusage(who, &ru) == -1)
-		fatal("Couldn't getrusage: %s", strerror(errno));
+		return(0);
 
-	RAND_add(&ru, sizeof(ru), 0.1);
+	RAND_add(&ru, sizeof(ru), entropy_estimate);
 
 	return(entropy_estimate);
 #else /* _HAVE_GETRUSAGE */


-- 
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)