35c35
< #include "buffer.h"
---
> #include "sshbuf.h"
36a37
> #include "ssherr.h"
212a214
> int r;
245c247,248
< buffer_put_string(&c->input, ptr, len);
---
> if ((r = sshbuf_put_string(&c->input, ptr, len)) != 0)
> fatal("%s: buffer error: %s", __func__, ssh_err(r));
253a257,258
> int r;
> size_t xxx_dlen;
255c260,264
< *data = buffer_get_string(&c->output, dlen);
---
> /* XXX new API is incompatible with this signature. */
> if ((r = sshbuf_get_string(&c->output, data, &xxx_dlen)) != 0)
> fatal("%s: buffer error: %s", __func__, ssh_err(r));
> if (dlen != NULL)
> *dlen = xxx_dlen;