pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix/txt' into fix/v7.3.0-refactoring

Browse Source
This commit is contained in:
Elena Subbotina
2022-11-11 22:51:44 +03:00
parent 8b45546ebd 8b4aae06e6
commit 703893e3f3
359 changed files with 35599 additions and 36101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OfficeCryptReader/source/CryptTransform.cpp
View File

@ -52,8 +52,7 @@
#include "../../Common/3dParty/cryptopp/zdeflate.h"
#include "../../Common/DocxFormat/Source/Base/unicode_util.h"
#include "../../Common/DocxFormat/Source/Base/Types_32.h"
#include "../../Common/DocxFormat/Source/XML/Utils.h"
#include "../../Common/DocxFormat/Source/Base/Unit.h"
#include "../../DesktopEditor/common/File.h"
static const unsigned char encrVerifierHashInputBlockKey[8] = { 0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b, 0x9e, 0x79 };
@ -900,7 +899,7 @@ bool ECMAWriteProtect::VerifyWrike()
wPasswordHash ^= (0x8000 | ('N' << 8) | 'K');
wPasswordHash ^= p.length();
std::string sPasswordHash = XmlUtils::IntToString(wPasswordHash, "%4.4X");
std::string sPasswordHash = XmlUtils::ToString(wPasswordHash, "%4.4X");
return data.hashValue == sPasswordHash;
}

2
OfficeCryptReader/source/ECMACryptFile.cpp
View File

@ -34,7 +34,7 @@
#include "CryptTransform.h"
#include "../../Common/3dParty/pole/pole.h"
#include "../../Common/DocxFormat/Source/Base/Types_32.h"
#include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../DesktopEditor/common/File.h"
#include "../../DesktopEditor/common/SystemUtils.h"