diff options
| -rw-r--r-- | entropy.c | 34 | ||||
| -rw-r--r-- | sshd.c | 8 |
2 files changed, 0 insertions, 42 deletions
@@ -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) @@ -937,14 +937,10 @@ send_rexec_state(int fd, struct sshbuf *conf) * string filename * string contents * } - * string rng_seed (if required) */ if ((r = sshbuf_put_stringb(m, conf)) != 0 || (r = sshbuf_put_stringb(m, inc)) != 0) fatal_fr(r, "compose config"); -#if defined(WITH_OPENSSL) && !defined(OPENSSL_PRNG_ONLY) - rexec_send_rng_seed(m); -#endif if (ssh_msg_send(fd, 0, m) == -1) error_f("ssh_msg_send failed"); @@ -977,10 +973,6 @@ recv_rexec_state(int fd, struct sshbuf *conf) (r = sshbuf_get_stringb(m, inc)) != 0) fatal_fr(r, "parse config"); -#if defined(WITH_OPENSSL) && !defined(OPENSSL_PRNG_ONLY) - rexec_recv_rng_seed(m); -#endif - if (conf != NULL && (r = sshbuf_put(conf, cp, len))) fatal_fr(r, "sshbuf_put"); |