summaryrefslogtreecommitdiff
path: root/entropy.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2022-11-10 12:44:51 +1100
committerDarren Tucker <dtucker@dtucker.net>2022-11-10 12:44:51 +1100
commit5372db7e7985ba2c00f20fdff8942145ca99e033 (patch)
treeccc42194889351a0181c36290e38d33e75aaf6a8 /entropy.c
parentca98d3f8c64cfc51af81e1b01c36a919d5947ec2 (diff)
downloadopenssh-git-5372db7e7985ba2c00f20fdff8942145ca99e033.tar.gz
Remove seed passing over reexec.
This was added for the benefit of platforms using ssh-rand-helper to prevent a delay on each connection as sshd reseeded itself. ssh-random-helper is long gone, and since the re-exec happens before the chroot the re-execed sshd can reseed itself normally. ok djm@
Diffstat (limited to 'entropy.c')
-rw-r--r--entropy.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/entropy.c b/entropy.c
index a4088e43..842c66fd 100644
--- a/entropy.c
+++ b/entropy.c
@@ -57,40 +57,6 @@
* /dev/random), then collect RANDOM_SEED_SIZE bytes of randomness from
* PRNGd.
*/
-#ifndef OPENSSL_PRNG_ONLY
-
-void
-rexec_send_rng_seed(struct sshbuf *m)
-{
- u_char buf[RANDOM_SEED_SIZE];
- size_t len = sizeof(buf);
- int r;
-
- if (RAND_bytes(buf, sizeof(buf)) <= 0) {
- error("Couldn't obtain random bytes (error %ld)",
- ERR_get_error());
- len = 0;
- }
- if ((r = sshbuf_put_string(m, buf, len)) != 0)
- fatal("%s: buffer error: %s", __func__, ssh_err(r));
- explicit_bzero(buf, sizeof(buf));
-}
-
-void
-rexec_recv_rng_seed(struct sshbuf *m)
-{
- const u_char *buf = NULL;
- size_t len = 0;
- int r;
-
- if ((r = sshbuf_get_string_direct(m, &buf, &len)) != 0)
- fatal("%s: buffer error: %s", __func__, ssh_err(r));
-
- debug3("rexec_recv_rng_seed: seeding rng with %lu bytes",
- (unsigned long)len);
- RAND_add(buf, len, len);
-}
-#endif /* OPENSSL_PRNG_ONLY */
void
seed_rng(void)