github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

wintls: Potential fix for undecrypted read

pull/1021/head
Tatsuhiro Tsujikawa 2017-10-07 19:43:17 +09:00
parent 64fe98a1ea
commit 8b32b26828
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/WinTLSSession.cc
View File

@ -514,18 +514,14 @@ ssize_t WinTLSSession::readData(void* data, size_t len)
return TLS_ERR_ERROR; return TLS_ERR_ERROR;
} }
// Decrypted message successfully. // Decrypted message successfully. Inspired from curl schannel.c.
bool ate = false; if (bufs[1].BufferType == SECBUFFER_DATA && bufs[1].cbBuffer > 0) {
for (auto& buf : bufs) { decBuf_.write(bufs[1].pvBuffer, bufs[1].cbBuffer);
if (buf.BufferType == SECBUFFER_DATA && buf.cbBuffer > 0) {
decBuf_.write(buf.pvBuffer, buf.cbBuffer);
}
else if (buf.BufferType == SECBUFFER_EXTRA && buf.cbBuffer > 0) {
readBuf_.eat(readBuf_.size() - buf.cbBuffer);
ate = true;
}
} }
if (!ate) { if (bufs[3].BufferType == SECBUFFER_EXTRA && bufs[3].cbBuffer > 0) {
readBuf_.eat(readBuf_.size() - bufs[3].cbBuffer);
}
else {
readBuf_.clear(); readBuf_.clear();
} }