Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2024-09-20 06:21:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Aligned memory for encryption to not corrupt nsz files compressed with zstd 1.5.0 and later

Browse source
This commit is contained in:
HookedBehemoth 2022-12-15 22:56:39 +01:00
parent 664d9f3c6e
commit b9304c8579
1 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
source/nx/nca_writer.cpp
View file

@ -179,6 +179,7 @@ public:
processChunk(m_buffer.data(), m_buffer.size()); processChunk(m_buffer.data(), m_buffer.size());
} }
encrypt(m_deflateBuffer.data(), m_deflateBuffer.size(), m_offset);
flush(); flush();
return true; return true;
@ -235,40 +236,48 @@ public:
return true; return true;
} }
u64 processChunk(const u8* ptr, u64 sz) u64 processChunk(const u8* ptr, u64 sz)
{ {
ZSTD_inBuffer input = { ptr, sz, 0 }; while(sz > 0)
m_deflateBuffer.resize(sz);
m_deflateBuffer.resize(0);
while (input.pos < input.size)
{ {
ZSTD_outBuffer output = { buffOut, buffOutSize, 0 }; const size_t readChunkSz = std::min(sz, buffInSize);
size_t const ret = ZSTD_decompressStream(dctx, &output, &input); ZSTD_inBuffer input = { ptr, readChunkSz, 0 };
if (ZSTD_isError(ret)) while(input.pos < input.size)
{ {
LOG_DEBUG("%s\n", ZSTD_getErrorName(ret)); ZSTD_outBuffer output = { buffOut, buffOutSize, 0 };
return false; size_t const ret = ZSTD_decompressStream(dctx, &output, &input);
}
if (ZSTD_isError(ret))
append(m_deflateBuffer, (const u8*)buffOut, output.pos); {
LOG_DEBUG("%s\n", ZSTD_getErrorName(ret));
if (m_deflateBuffer.size() >= 0x1000000) // 16 MB return 0;
{ }
encrypt(m_deflateBuffer.data(), m_deflateBuffer.size(), m_offset);
size_t len = output.pos;
flush(); u8* p = (u8*)buffOut;
while(len)
{
const size_t writeChunkSz = std::min(0x1000000 - m_deflateBuffer.size(), len);
append(m_deflateBuffer, p, writeChunkSz);
if(m_deflateBuffer.size() >= 0x1000000)
{
encrypt(m_deflateBuffer.data(), m_deflateBuffer.size(), m_offset);
flush();
}
p += writeChunkSz;
len -= writeChunkSz;
}
} }
sz -= readChunkSz;
ptr += readChunkSz;
} }
if (m_deflateBuffer.size())
{
encrypt(m_deflateBuffer.data(), m_deflateBuffer.size(), m_offset);
flush();
}
return 1; return 1;
} }