nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-15 02:06:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ncatool] Update API changes.

Browse source
This commit is contained in:
jakcron 2017-07-06 13:30:50 +10:00
parent 337a5eff25
commit c15ab66262
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
programs/ncatool/main.cpp
View file

@ -1,12 +1,12 @@
#include <cstdio>
#include <crypto/aes.h>
#include <fnd/file_io.h>
#include <fnd/io.h>
#include <fnd/memory_blob.h>
#include <nx/NXCrypto.h>
#include <nx/NcaHeader.h>
#include <inttypes.h>
const size_t kNcaSectorSize = 0x200;
const size_t kNcaSectorSize = NcaHeader::kDefaultBlockSize;
void initNcaCtr(u8 ctr[crypto::aes::kAesBlockSize], u32 generation)
{
@ -29,7 +29,7 @@ void decryptNcaSectorXts(const fnd::MemoryBlob& nca, u8 out[kNcaSectorSize], siz
{
u8 tweak[crypto::aes::kAesBlockSize];
crypto::aes::AesXtsMakeTweak(tweak, sector);
crypto::aes::AesXtsDecryptSector(nca.data() + sector*kNcaSectorSize, kNcaSectorSize, key1, key2, tweak, out);
crypto::aes::AesXtsDecryptSector(nca.getBytes() + sector*kNcaSectorSize, kNcaSectorSize, key1, key2, tweak, out);
}
void decryptNcaSectorCtr(const fnd::MemoryBlob& nca, u8 out[kNcaSectorSize], size_t sector, const u8* key)
@ -37,7 +37,7 @@ void decryptNcaSectorCtr(const fnd::MemoryBlob& nca, u8 out[kNcaSectorSize], siz
u8 ctr[crypto::aes::kAesBlockSize];
initNcaCtr(ctr, 0);
crypto::aes::AesIncrementCounter(ctr, (sector*kNcaSectorSize)/crypto::aes::kAesBlockSize, ctr);
crypto::aes::AesCtr(nca.data() + sector*kNcaSectorSize, kNcaSectorSize, key, ctr, out);
crypto::aes::AesCtr(nca.getBytes() + sector*kNcaSectorSize, kNcaSectorSize, key, ctr, out);
}
void dumpNcaSector(u8 out[kNcaSectorSize])
@ -58,7 +58,7 @@ int main(int argc, char** argv)
}
fnd::MemoryBlob nca;
fnd::FileIO::ReadFile(argv[1], nca);
fnd::io::readFile(argv[1], nca);
u8 sector[kNcaSectorSize];