Mercurial > dropbear
diff common-kex.c @ 1055:4d7b4c5526c5 nocircbuffer
A bit of a bodge to avoid memcpy if zlib is disabled
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 01 Mar 2015 00:57:21 +0800 |
| parents | a1e79ffa5862 |
| children | c45d65392c1a |
line wrap: on
line diff
--- a/common-kex.c Sun Mar 01 00:44:45 2015 +0800 +++ b/common-kex.c Sun Mar 01 00:57:21 2015 +0800 @@ -534,8 +534,10 @@ buf_putstring(ses.kexhashbuf, ses.transkexinit->data, ses.transkexinit->len); /* I_S, the payload of the server's SSH_MSG_KEXINIT */ - buf_setpos(ses.payload, 0); - buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len); + buf_setpos(ses.payload, ses.payload_beginning); + buf_putstring(ses.kexhashbuf, + buf_getptr(ses.payload, ses.payload->len-ses.payload->pos), + ses.payload->len-ses.payload->pos); ses.requirenext = SSH_MSG_KEXDH_REPLY; } else { /* SERVER */ @@ -549,8 +551,10 @@ (unsigned char*)LOCAL_IDENT, local_ident_len); /* I_C, the payload of the client's SSH_MSG_KEXINIT */ - buf_setpos(ses.payload, 0); - buf_putstring(ses.kexhashbuf, ses.payload->data, ses.payload->len); + buf_setpos(ses.payload, ses.payload_beginning); + buf_putstring(ses.kexhashbuf, + buf_getptr(ses.payload, ses.payload->len-ses.payload->pos), + ses.payload->len-ses.payload->pos); /* I_S, the payload of the server's SSH_MSG_KEXINIT */ buf_putstring(ses.kexhashbuf,