mirrors/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool.git synced 2024-12-22 18:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nstool] Fix bug in AesCtrWrappedIFile.

Browse source
This commit is contained in:
jakcron 2018-05-27 18:16:42 +08:00
parent 634b202b5a
commit f4d3501f8c
2 changed files with 49 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
programs/nstool/source/AesCtrWrappedIFile.cpp
View file

@ -12,7 +12,7 @@ AesCtrWrappedIFile::AesCtrWrappedIFile(fnd::IFile* file, bool ownIfile, const cr
mBaseCtr(ctr), mBaseCtr(ctr),
mFileOffset(0) mFileOffset(0)
{ {
mScratch.alloc(kAesCtrScratchAllocSize); mCache.alloc(kCacheSizeAllocSize);
} }
AesCtrWrappedIFile::~AesCtrWrappedIFile() AesCtrWrappedIFile::~AesCtrWrappedIFile()
@ -35,22 +35,27 @@ void AesCtrWrappedIFile::seek(size_t offset)
void AesCtrWrappedIFile::read(byte_t* out, size_t len) void AesCtrWrappedIFile::read(byte_t* out, size_t len)
{ {
internalSeek(); //printf("[%x] AesCtrWrappedIFile::read(offset=0x%" PRIx64 ", size=0x%" PRIx64 ")\n", this, mFileOffset, len);
for (size_t i = 0; i < (len / kAesCtrScratchSize); i++) size_t read_len;
{ size_t read_pos;
mFile->read(mScratch.getBytes() + mBlockOffset, kAesCtrScratchSize);
crypto::aes::AesCtr(mScratch.getBytes(), kAesCtrScratchAllocSize, mKey.key, mCurrentCtr.iv, mScratch.getBytes());
memcpy(out + (i * kAesCtrScratchSize), mScratch.getBytes() + mBlockOffset, kAesCtrScratchSize);
}
if (len % kAesCtrScratchSize) size_t cache_reads = (len / kCacheSize) + ((len % kCacheSize) != 0);
for (size_t i = 0; i < cache_reads; i++)
{ {
size_t read_len = len % kAesCtrScratchSize; read_len = MIN(len - (i * kCacheSize), kCacheSize);
size_t read_pos = ((len / kAesCtrScratchSize) * kAesCtrScratchSize); read_pos = ((mFileOffset >> 4) << 4) + (i * kCacheSize);
mFile->read(mScratch.getBytes() + mBlockOffset, read_len);
crypto::aes::AesCtr(mScratch.getBytes(), kAesCtrScratchAllocSize, mKey.key, mCurrentCtr.iv, mScratch.getBytes()); //printf("[%x] AesCtrWrappedIFile::read() CACHE READ: readlen=%" PRIx64 "\n", this, read_len);
memcpy(out + read_pos, mScratch.getBytes() + mBlockOffset, read_len);
mFile->seek(read_pos);
mFile->read(mCache.getBytes(), kCacheSizeAllocSize);
crypto::aes::AesIncrementCounter(mBaseCtr.iv, read_pos>>4, mCurrentCtr.iv);
crypto::aes::AesCtr(mCache.getBytes(), kCacheSizeAllocSize, mKey.key, mCurrentCtr.iv, mCache.getBytes());
memcpy(out + (i * kCacheSize), mCache.getBytes() + (mFileOffset & 0xf), read_len);
} }
seek(mFileOffset + len); seek(mFileOffset + len);
@ -62,10 +67,32 @@ void AesCtrWrappedIFile::read(byte_t* out, size_t offset, size_t len)
read(out, len); read(out, len);
} }
void AesCtrWrappedIFile::write(const byte_t* out, size_t len) void AesCtrWrappedIFile::write(const byte_t* in, size_t len)
{ {
internalSeek(); size_t write_len;
size_t write_pos;
size_t cache_writes = (len / kCacheSize) + ((len % kCacheSize) != 0);
for (size_t i = 0; i < cache_writes; i++)
{
write_len = MIN(len - (i * kCacheSize), kCacheSize);
write_pos = ((mFileOffset >> 4) << 4) + (i * kCacheSize);
//printf("[%x] AesCtrWrappedIFile::read() CACHE READ: readlen=%" PRIx64 "\n", this, read_len);
memcpy(mCache.getBytes() + (mFileOffset & 0xf), in + (i * kCacheSize), write_len);
crypto::aes::AesIncrementCounter(mBaseCtr.iv, write_pos>>4, mCurrentCtr.iv);
crypto::aes::AesCtr(mCache.getBytes(), kCacheSizeAllocSize, mKey.key, mCurrentCtr.iv, mCache.getBytes());
mFile->seek(write_pos);
mFile->write(mCache.getBytes(), kCacheSizeAllocSize);
}
seek(mFileOffset + len);
/*
for (size_t i = 0; i < (len / kAesCtrScratchSize); i++) for (size_t i = 0; i < (len / kAesCtrScratchSize); i++)
{ {
memcpy(mScratch.getBytes() + mBlockOffset, out + (i * kAesCtrScratchSize), kAesCtrScratchSize); memcpy(mScratch.getBytes() + mBlockOffset, out + (i * kAesCtrScratchSize), kAesCtrScratchSize);
@ -81,19 +108,12 @@ void AesCtrWrappedIFile::write(const byte_t* out, size_t len)
crypto::aes::AesCtr(mScratch.getBytes(), kAesCtrScratchAllocSize, mKey.key, mCurrentCtr.iv, mScratch.getBytes()); crypto::aes::AesCtr(mScratch.getBytes(), kAesCtrScratchAllocSize, mKey.key, mCurrentCtr.iv, mScratch.getBytes());
mFile->write(mScratch.getBytes() + mBlockOffset, write_len); mFile->write(mScratch.getBytes() + mBlockOffset, write_len);
} }
*/
seek(mFileOffset + len); seek(mFileOffset + len);
} }
void AesCtrWrappedIFile::write(const byte_t* out, size_t offset, size_t len) void AesCtrWrappedIFile::write(const byte_t* in, size_t offset, size_t len)
{ {
seek(offset); seek(offset);
write(out, len); write(in, len);
}
void AesCtrWrappedIFile::internalSeek()
{
mFile->seek(mFileOffset);
crypto::aes::AesIncrementCounter(mBaseCtr.iv, mFileOffset>>4, mCurrentCtr.iv);
mBlockOffset = mFileOffset & 0xf;
} }

7
programs/nstool/source/AesCtrWrappedIFile.h
View file

@ -17,17 +17,16 @@ public:
void write(const byte_t* out, size_t offset, size_t len); void write(const byte_t* out, size_t offset, size_t len);
private: private:
const std::string kModuleName = "AesCtrWrappedIFile"; const std::string kModuleName = "AesCtrWrappedIFile";
static const size_t kAesCtrScratchSize = 0x1000000; static const size_t kCacheSize = 0x10000;
static const size_t kAesCtrScratchAllocSize = kAesCtrScratchSize + crypto::aes::kAesBlockSize; static const size_t kCacheSizeAllocSize = kCacheSize + crypto::aes::kAesBlockSize;
bool mOwnIFile; bool mOwnIFile;
fnd::IFile* mFile; fnd::IFile* mFile;
crypto::aes::sAes128Key mKey; crypto::aes::sAes128Key mKey;
crypto::aes::sAesIvCtr mBaseCtr, mCurrentCtr; crypto::aes::sAesIvCtr mBaseCtr, mCurrentCtr;
size_t mBlockOffset;
size_t mFileOffset; size_t mFileOffset;
fnd::MemoryBlob mScratch; fnd::MemoryBlob mCache;
void internalSeek(); void internalSeek();
}; };