pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 00:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

x2t - clear compiling warnings

Browse Source
This commit is contained in:
ElenaSubbotina
2018-09-28 14:30:27 +03:00
parent d9922e4782
commit c7eb16fa64
54 changed files with 270 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OfficeCryptReader/source/CryptTransform.cpp
View File

@ -978,6 +978,19 @@ bool ODFDecryptor::Decrypt(const std::wstring & wspassword, unsigned char* data_
bVerify = (pChecksum == pOutHash);
if (!bVerify && pOut.size < cryptData.checksum_size + 16)
{
for (int i = 0; !bVerify && i < pOut.size; i++)
{
_buf pOutLimit2(pOut.size - i, true);
memcpy(pOutLimit2.ptr, pOut.ptr, pOut.size - i);
_buf pOutHash2 = HashAppend(pOutLimit2, empty, cryptData.checksum_hashAlgorithm);
bVerify = (pChecksum == pOutHash2);
}
}
try
{
if (bVerify)