Commit 1fb27ca9 authored by ElenaSubbotina's avatar ElenaSubbotina

->utf8

parent 3c43b372
/* /*
* (c) Copyright Ascensio System SIA 2010-2016 * (c) Copyright Ascensio System SIA 2010-2016
* *
* This program is a free software product. You can redistribute it and/or * This program is a free software product. You can redistribute it and/or
...@@ -150,7 +150,7 @@ void CorrectHashSize(_buf & hashBuf, int size, unsigned char padding) ...@@ -150,7 +150,7 @@ void CorrectHashSize(_buf & hashBuf, int size, unsigned char padding)
} }
_buf HashAppend(_buf & hashBuf, _buf & block, CRYPT_METHOD::_hashAlgorithm algorithm) _buf HashAppend(_buf & hashBuf, _buf & block, CRYPT_METHOD::_hashAlgorithm algorithm)
{//todooo {//todooo переделать
if (algorithm == CRYPT_METHOD::SHA1) if (algorithm == CRYPT_METHOD::SHA1)
{ {
CryptoPP::SHA1 hash; CryptoPP::SHA1 hash;
......
/* /*
* (c) Copyright Ascensio System SIA 2010-2016 * (c) Copyright Ascensio System SIA 2010-2016
* *
* This program is a free software product. You can redistribute it and/or * This program is a free software product. You can redistribute it and/or
......
/* /*
* (c) Copyright Ascensio System SIA 2010-2016 * (c) Copyright Ascensio System SIA 2010-2016
* *
* This program is a free software product. You can redistribute it and/or * This program is a free software product. You can redistribute it and/or
...@@ -203,7 +203,7 @@ bool ECMACryptReader::DecryptOfficeFile(std::wstring file_name_inp, std::wstring ...@@ -203,7 +203,7 @@ bool ECMACryptReader::DecryptOfficeFile(std::wstring file_name_inp, std::wstring
if (!decryptor.SetPassword(password)) if (!decryptor.SetPassword(password))
return false; return false;
//pStream = new POLE::Stream(pStorage, "DataSpaces/DataSpaceMap"); // //pStream = new POLE::Stream(pStorage, "DataSpaces/DataSpaceMap"); // савершенно ненужная инфа
//if (pStream) //if (pStream)
//{ //{
// _UINT32 size = 0; // _UINT32 size = 0;
...@@ -235,7 +235,7 @@ bool ECMACryptReader::DecryptOfficeFile(std::wstring file_name_inp, std::wstring ...@@ -235,7 +235,7 @@ bool ECMACryptReader::DecryptOfficeFile(std::wstring file_name_inp, std::wstring
pStream->read(data, lengthRead); pStream->read(data, lengthRead);
decryptor.Decrypt(data, lengthRead, data_out);//todoo decryptor.Decrypt(data, lengthRead, data_out);//todoo сделать покусочное чтение декриптование
delete pStream; delete pStream;
if (data_out) if (data_out)
......
/* /*
* (c) Copyright Ascensio System SIA 2010-2016 * (c) Copyright Ascensio System SIA 2010-2016
* *
* This program is a free software product. You can redistribute it and/or * This program is a free software product. You can redistribute it and/or
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment