Adapt portable to legacy buffer API removal
diff --git a/entropy.c b/entropy.c
index 14b98f1..c178c00 100644
--- a/entropy.c
+++ b/entropy.c
@@ -53,7 +53,8 @@
#include "atomicio.h"
#include "pathnames.h"
#include "log.h"
-#include "buffer.h"
+#include "sshbuf.h"
+#include "ssherr.h"
/*
* Portable OpenSSH PRNG seeding:
@@ -181,29 +182,34 @@
}
void
-rexec_send_rng_seed(Buffer *m)
+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());
- buffer_put_string(m, "", 0);
- } else
- buffer_put_string(m, buf, sizeof(buf));
+ 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(Buffer *m)
+rexec_recv_rng_seed(struct sshbuf *m)
{
- u_char *buf;
- u_int len;
+ u_char *buf = NULL;
+ size_t len = 0;
+ int r;
- 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);
- }
+ 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 %u bytes", len);
+ RAND_add(buf, len, len);
}
#endif /* OPENSSL_PRNG_ONLY */