WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bug in DoPacket when simplifying payloadSz

pull/1/head
John Safranek 2014-12-18 13:58:13 -08:00
parent 10844bfc51
commit adcf881278
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/internal.c
View File

@ -1177,16 +1177,12 @@ static int DoPacket(WOLFSSH* ssh)
uint8_t msg;
WLOG(WS_LOG_DEBUG, "DoPacket sequence number: %d", ssh->peerSeq);
/* Problem: len is equal to the amount of data left in the input buffer.
* The beginning part of that data is the packet we want to
* decode. The remainder is the pad and the MAC. */
/* Skip the packet_length field. */
idx += LENGTH_SZ;
padSz = buf[idx++];
payloadSz = ssh->curSz - PAD_LENGTH_SZ - padSz;
payloadSz = ssh->curSz - PAD_LENGTH_SZ - padSz - MSG_ID_SZ;
msg = buf[idx++];
payloadSz -= MSG_ID_SZ;
switch (msg) {
@ -1215,9 +1211,10 @@ static int DoPacket(WOLFSSH* ssh)
uint8_t scratchLen[LENGTH_SZ];
WLOG(WS_LOG_DEBUG, "Decoding MSGID_KEXINIT");
c32toa(payloadSz, scratchLen);
c32toa(payloadSz + sizeof(msg), scratchLen);
ShaUpdate(&ssh->handshake->hash, scratchLen, LENGTH_SZ);
ShaUpdate(&ssh->handshake->hash, buf + idx - 1, payloadSz + 1);
ShaUpdate(&ssh->handshake->hash, &msg, sizeof(msg));
ShaUpdate(&ssh->handshake->hash, buf + idx, payloadSz);
DoKexInit(ssh, buf, payloadSz, &idx);
}
break;