Dodano wsparcie w przypadku szyfrowania bez komresji
This commit is contained in:
parent
1066a41359
commit
45b2f823c6
2 changed files with 14 additions and 8 deletions
|
|
@ -35,7 +35,19 @@ std::vector<char> ChunkManager::chunked(const std::vector<char>& raw, const bool
|
||||||
// Skopiuj fragment danych do chunka
|
// Skopiuj fragment danych do chunka
|
||||||
std::vector<char> chunk(begin, end);
|
std::vector<char> chunk(begin, end);
|
||||||
|
|
||||||
std::vector<char> outChunk = encrypt ? eman.encrypt(cman.compress(chunk)) : cman.compress(chunk);
|
std::vector<char> outChunk;
|
||||||
|
|
||||||
|
// Przetwórz chunki i przetwórz
|
||||||
|
if (compress)
|
||||||
|
{
|
||||||
|
// Zaszyfruj i skompresuj lub tylko skompresuj
|
||||||
|
outChunk = encrypt ? eman.encrypt(cman.compress(chunk)) : cman.compress(chunk);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Zaszyfruj lub skopiuj
|
||||||
|
outChunk = encrypt ? eman.encrypt(chunk) : std::move(chunk);
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t chs = chunk.size();
|
uint32_t chs = chunk.size();
|
||||||
uint32_t zch = outChunk.size();
|
uint32_t zch = outChunk.size();
|
||||||
|
|
@ -92,7 +104,7 @@ std::vector<char> ChunkManager::dechunked(const std::vector<char>& zip, const bo
|
||||||
std::vector<char> zipChunk = encrypt ? eman.decrypt(inChunk) : std::move(inChunk);
|
std::vector<char> zipChunk = encrypt ? eman.decrypt(inChunk) : std::move(inChunk);
|
||||||
|
|
||||||
// Zdeklarój pusty chunk
|
// Zdeklarój pusty chunk
|
||||||
std::vector<char> chunk = cman.decompress(zipChunk, chunkSize);
|
std::vector<char> chunk = compress ? cman.decompress(zipChunk, chunkSize) : std::move(zipChunk);
|
||||||
|
|
||||||
// Scal chunki
|
// Scal chunki
|
||||||
chunksString.insert(chunksString.end(), chunk.begin(), chunk.end());
|
chunksString.insert(chunksString.end(), chunk.begin(), chunk.end());
|
||||||
|
|
|
||||||
|
|
@ -12,12 +12,6 @@
|
||||||
|
|
||||||
#define BLOCK_SIZE 131072 // 128KB
|
#define BLOCK_SIZE 131072 // 128KB
|
||||||
|
|
||||||
struct BlockSize
|
|
||||||
{
|
|
||||||
uint32_t raw;
|
|
||||||
uint32_t zip;
|
|
||||||
};
|
|
||||||
|
|
||||||
class ChunkManager
|
class ChunkManager
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue