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

x2t - ...

Browse Source
This commit is contained in:
ElenaSubbotina
2019-03-25 13:50:29 +03:00
parent 441aa277e3
commit 498d58e856
28 changed files with 226 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OfficeCryptReader/source/ECMACryptFile.cpp
View File

@ -134,7 +134,7 @@ void ReadMapEntry(POLE::Stream *pStream, ECMACryptFile::_mapEntry & m)
_UINT32 refCount = 0;
pStream->read((unsigned char*)&refCount, 4);
for (int i = 0 ; i < refCount; i++)
for (_UINT32 i = 0 ; i < refCount; i++)
{
ECMACryptFile::_refComponent r;
pStream->read((unsigned char*)&r.type, 4);
@ -151,7 +151,7 @@ std::string DecodeBase64(const std::string & value)
unsigned char *pData = NULL;
std::string result;
NSFile::CBase64Converter::Decode(value.c_str(), value.length(), pData, nLength);
NSFile::CBase64Converter::Decode(value.c_str(), (int)value.length(), pData, nLength);
if (pData)
{
result = std::string((char*)pData, nLength);
@ -165,7 +165,7 @@ std::string EncodeBase64(const std::string & value)
char *pData = NULL;
std::string result;
NSFile::CBase64Converter::Encode((BYTE*)value.c_str(), value.length(), pData, nLength, NSBase64::B64_BASE64_FLAG_NOCRLF);
NSFile::CBase64Converter::Encode((BYTE*)value.c_str(), (int)value.length(), pData, nLength, NSBase64::B64_BASE64_FLAG_NOCRLF);
if (pData)
{
result = std::string(pData, nLength);
@ -530,7 +530,7 @@ bool WriteStandartEncryptionInfo(unsigned char* data, int &size, _ecmaCryptData
mem_stream.WriteUInt32((_UINT32)cryptData.hashSize);
//int szEncryptedVerifierHash = (ProviderType == 0x0001) ? 0x14 : 0x20; //RC4 | AES(DES) .. md5?
mem_stream.WriteBytes((unsigned char*)cryptData.encryptedVerifierValue.c_str(), cryptData.encryptedVerifierValue.length()/*szEncryptedVerifierHash*/);
mem_stream.WriteBytes((unsigned char*)cryptData.encryptedVerifierValue.c_str(), (int)cryptData.encryptedVerifierValue.length()/*szEncryptedVerifierHash*/);
size = mem_stream.GetPosition();