nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-22 21:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[nstool] Where not guarenteed to control file position, IFile wrappers assert their position.

Browse source
This commit is contained in:
jakcron 2018-05-22 19:45:40 +08:00
parent e1ccf81e54
commit 33313f208d
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,19 +1,16 @@
#include "AesCtrWrappedIFile.h" #include "AesCtrWrappedIFile.h"
AesCtrWrappedIFile::AesCtrWrappedIFile(fnd::IFile* file, const crypto::aes::sAes128Key& key, const crypto::aes::sAesIvCtr& ctr) : AesCtrWrappedIFile::AesCtrWrappedIFile(fnd::IFile* file, const crypto::aes::sAes128Key& key, const crypto::aes::sAesIvCtr& ctr) :
mOwnIFile(false), AesCtrWrappedIFile(file, false, key, ctr)
mFile(file),
mKey(key),
mBaseCtr(ctr)
{ {
mScratch.alloc(kAesCtrScratchAllocSize);
} }
AesCtrWrappedIFile::AesCtrWrappedIFile(fnd::IFile* file, bool ownIfile, const crypto::aes::sAes128Key& key, const crypto::aes::sAesIvCtr& ctr) : AesCtrWrappedIFile::AesCtrWrappedIFile(fnd::IFile* file, bool ownIfile, const crypto::aes::sAes128Key& key, const crypto::aes::sAesIvCtr& ctr) :
mOwnIFile(ownIfile), mOwnIFile(ownIfile),
mFile(file), mFile(file),
mKey(key), mKey(key),
mBaseCtr(ctr) mBaseCtr(ctr),
mFileOffset(0)
{ {
mScratch.alloc(kAesCtrScratchAllocSize); mScratch.alloc(kAesCtrScratchAllocSize);
} }
@ -33,13 +30,13 @@ size_t AesCtrWrappedIFile::size()
void AesCtrWrappedIFile::seek(size_t offset) void AesCtrWrappedIFile::seek(size_t offset)
{ {
mFile->seek(offset); mFileOffset = offset;
crypto::aes::AesIncrementCounter(mBaseCtr.iv, offset>>4, mCurrentCtr.iv);
mBlockOffset = offset & 0xf;
} }
void AesCtrWrappedIFile::read(byte_t* out, size_t len) void AesCtrWrappedIFile::read(byte_t* out, size_t len)
{ {
internalSeek();
for (size_t i = 0; i < (len / kAesCtrScratchSize); i++) for (size_t i = 0; i < (len / kAesCtrScratchSize); i++)
{ {
mFile->read(mScratch.getBytes() + mBlockOffset, kAesCtrScratchSize); mFile->read(mScratch.getBytes() + mBlockOffset, kAesCtrScratchSize);
@ -55,6 +52,8 @@ void AesCtrWrappedIFile::read(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());
memcpy(out + read_pos, mScratch.getBytes() + mBlockOffset, read_len); memcpy(out + read_pos, mScratch.getBytes() + mBlockOffset, read_len);
} }
seek(mFileOffset + len);
} }
void AesCtrWrappedIFile::read(byte_t* out, size_t offset, size_t len) void AesCtrWrappedIFile::read(byte_t* out, size_t offset, size_t len)
@ -65,6 +64,8 @@ void AesCtrWrappedIFile::read(byte_t* out, size_t offset, size_t len)
void AesCtrWrappedIFile::write(const byte_t* out, size_t len) void AesCtrWrappedIFile::write(const byte_t* out, size_t len)
{ {
internalSeek();
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);
@ -80,10 +81,19 @@ 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);
} }
void AesCtrWrappedIFile::write(const byte_t* out, size_t offset, size_t len) void AesCtrWrappedIFile::write(const byte_t* out, size_t offset, size_t len)
{ {
seek(offset); seek(offset);
write(out, len); write(out, len);
}
void AesCtrWrappedIFile::internalSeek()
{
mFile->seek(mFileOffset);
crypto::aes::AesIncrementCounter(mBaseCtr.iv, mFileOffset>>4, mCurrentCtr.iv);
mBlockOffset = mFileOffset & 0xf;
} }

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

@ -25,6 +25,9 @@ private:
crypto::aes::sAes128Key mKey; crypto::aes::sAes128Key mKey;
crypto::aes::sAesIvCtr mBaseCtr, mCurrentCtr; crypto::aes::sAesIvCtr mBaseCtr, mCurrentCtr;
size_t mBlockOffset; size_t mBlockOffset;
size_t mFileOffset;
fnd::MemoryBlob mScratch; fnd::MemoryBlob mScratch;
void internalSeek();
}; };

4
programs/nstool/source/OffsetAdjustedIFile.cpp
View file

@ -43,7 +43,7 @@ void OffsetAdjustedIFile::read(byte_t* out, size_t len)
// assert proper position in file // assert proper position in file
mFile->seek(mCurrentOffset + mBaseOffset); mFile->seek(mCurrentOffset + mBaseOffset);
mFile->read(out, len); mFile->read(out, len);
mCurrentOffset += len; seek(mCurrentOffset + len);
} }
void OffsetAdjustedIFile::read(byte_t* out, size_t offset, size_t len) void OffsetAdjustedIFile::read(byte_t* out, size_t offset, size_t len)
@ -57,7 +57,7 @@ void OffsetAdjustedIFile::write(const byte_t* out, size_t len)
// assert proper position in file // assert proper position in file
mFile->seek(mCurrentOffset + mBaseOffset); mFile->seek(mCurrentOffset + mBaseOffset);
mFile->write(out, len); mFile->write(out, len);
mCurrentOffset += len; seek(mCurrentOffset + len);
} }
void OffsetAdjustedIFile::write(const byte_t* out, size_t offset, size_t len) void OffsetAdjustedIFile::write(const byte_t* out, size_t offset, size_t len)