Merge 4.3p2 to the trunk.

1 files changed, 33 insertions, 5 deletions

diff --git a/entropy.c b/entropy.c
index e48d6d3f9..b9d238200 100644
--- a/entropy.c
+++ b/entropy.c
@@ -26,6 +26,7 @@
 
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
+#include <openssl/err.h>
 
 #include "ssh.h"
 #include "misc.h"
@@ -33,6 +34,8 @@
 #include "atomicio.h"
 #include "pathnames.h"
 #include "log.h"
+#include "buffer.h"
+#include "bufaux.h"
 
 /*
  * Portable OpenSSH PRNG seeding:
@@ -45,7 +48,7 @@
  * XXX: we should tell the child how many bytes we need.
  */
 
-RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $");
+RCSID("$Id: entropy.c,v 1.52 2005/09/27 22:26:30 dtucker Exp $");
 
 #ifndef OPENSSL_PRNG_ONLY
 #define RANDOM_SEED_SIZE 48
@@ -148,10 +151,35 @@ init_rng(void)
 #endif
 
 #ifndef OPENSSL_PRNG_ONLY
-        if ((original_uid = getuid()) == -1)
-                fatal("getuid: %s", strerror(errno));
-        if ((original_euid = geteuid()) == -1)
-                fatal("geteuid: %s", strerror(errno));
+        original_uid = getuid();
+        original_euid = geteuid();
 #endif
 }
 
+#ifndef OPENSSL_PRNG_ONLY
+void
+rexec_send_rng_seed(Buffer *m)
+{
+        u_char buf[RANDOM_SEED_SIZE];
+
+        if (RAND_bytes(buf, sizeof(buf)) <= 0) {
+                error("Couldn't obtain random bytes (error %ld)",
+                    ERR_get_error());
+                buffer_put_string(m, "", 0);
+        } else 
+                buffer_put_string(m, buf, sizeof(buf));
+}
+
+void
+rexec_recv_rng_seed(Buffer *m)
+{
+        u_char *buf;
+        u_int len;
+
+        buf = buffer_get_string_ret(m, &len);
+        if (buf != NULL) {
+                debug3("rexec_recv_rng_seed: seeding rng with %u bytes", len);
+                RAND_add(buf, len, len);
+        }
+}
+#endif