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

x2t- binary - fix bug #48045, fix bug #48099, remove weak encrypt

Browse Source
This commit is contained in:
ElenaSubbotina
2020-12-22 18:52:11 +03:00
parent 44d3ec9441
commit a995053d47
5 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OfficeCryptReader/source/ECMACryptFile.cpp
View File

@ -648,18 +648,18 @@ bool ECMACryptFile::EncryptOfficeFile(const std::wstring &file_name_inp, const s
std::wstring sApplication = NSSystemUtils::GetEnvVariable(NSSystemUtils::gc_EnvMethodEncrypt);
if (sApplication == L"Weak")
{
cryptData.bAgile = false;
cryptData.cipherAlgorithm = CRYPT_METHOD::DES_ECB;
cryptData.hashAlgorithm = CRYPT_METHOD::SHA1;
cryptData.keySize = 0x08;
cryptData.hashSize = 0x14;
cryptData.blockSize = 0x10;
cryptData.saltSize = 0x10;
cryptData.spinCount = 50000;
}
else
//if (sApplication == L"Weak")
//{
// cryptData.bAgile = false;
// cryptData.cipherAlgorithm = CRYPT_METHOD::DES_ECB;
// cryptData.hashAlgorithm = CRYPT_METHOD::SHA1;
// cryptData.keySize = 0x08;
// cryptData.hashSize = 0x14;
// cryptData.blockSize = 0x10;
// cryptData.saltSize = 0x10;
// cryptData.spinCount = 50000;
//}
//else
{
cryptData.bAgile = true;
cryptData.cipherAlgorithm = CRYPT_METHOD::AES_CBC;