JehanneOS/jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

libsec: improve fix #4: check valid length in TLS (msgRecv)

Browse Source 
This commit should complete the work done at 90fe80e73b

Should also fix CID 155874.
This commit is contained in:
Giacomo Tesio
2017-01-21 01:06:28 +01:00
parent f6e1c78244
commit aa25654232
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sys/src/lib/sec/port/tlshand.c
View File

@@ -1808,10 +1808,19 @@ msgRecv(TlsConnection *c, Msg *m)
break; break;
case HFinished: case HFinished:
m->u.finished.n = c->finished.n; m->u.finished.n = c->finished.n;
if(n < m->u.finished.n) switch(m->u.finished.n){
goto Short; case TLSFinishedLen:
memmove(m->u.finished.verify, p, m->u.finished.n); case SSL3FinishedLen:
n -= m->u.finished.n; if(n < m->u.finished.n)
goto Short;
memmove(m->u.finished.verify, p, m->u.finished.n);
n -= m->u.finished.n;
break;
case BeforeSetVersion:
default:
tlsError(c, EDecodeError, "unexpected HFinished length");
goto Err;
}
break; break;
} }