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

[nstool] Replaced printf with cout pipes.

Browse source
This commit is contained in:
jakcron 2018-07-29 21:01:11 +09:00
parent 3a4259d2cc
commit 29ecd03471
2 changed files with 73 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
programs/nstool/source/EsTikProcess.cpp
View file

@ -1,7 +1,12 @@
#include <iostream>
#include <iomanip>
#include <fnd/SimpleTextOutput.h> #include <fnd/SimpleTextOutput.h>
#include "OffsetAdjustedIFile.h" #include "OffsetAdjustedIFile.h"
#include "EsTikProcess.h" #include "EsTikProcess.h"
EsTikProcess::EsTikProcess() : EsTikProcess::EsTikProcess() :
mFile(nullptr), mFile(nullptr),
mOwnIFile(false), mOwnIFile(false),
@ -65,51 +70,56 @@ void EsTikProcess::displayTicket()
const es::TicketBody_V2& body = mTik.getBody(); const es::TicketBody_V2& body = mTik.getBody();
printf("[ES Ticket]\n"); std::cout << "[ES Ticket]" << std::endl;
printf(" SignType: 0x%" PRIx32 " (%s)\n", mTik.getSignature().getSignType(), mTik.getSignature().isLittleEndian()? "LittleEndian" : "BigEndian");
printf(" Issuer: %s\n", body.getIssuer().c_str()); std::cout << " SignType: " << getSignTypeStr(mTik.getSignature().getSignType());
printf(" Title Key:\n"); if (_HAS_BIT(mCliOutputMode, OUTPUT_EXTENDED))
printf(" EncMode: %s\n", getTitleKeyPersonalisationStr(body.getTitleKeyEncType())); std::cout << " (0x" << std::hex << mTik.getSignature().getSignType() << ")";
printf(" CommonKeyId: %02X\n", body.getCommonKeyId()); std::cout << std::endl;
printf(" EncData:\n");
std::cout << " Issuer: " << body.getIssuer() << std::endl;
std::cout << " Title Key:" << std::endl;
std::cout << " EncMode: " << getTitleKeyPersonalisationStr(body.getTitleKeyEncType()) << std::endl;
std::cout << " KeyGeneration: " << std::dec << (uint32_t)body.getCommonKeyId() << std::endl;
std::cout << " Data:" << std::endl;
size_t size = body.getTitleKeyEncType() == es::ticket::RSA2048 ? crypto::rsa::kRsa2048Size : crypto::aes::kAes128KeySize; size_t size = body.getTitleKeyEncType() == es::ticket::RSA2048 ? crypto::rsa::kRsa2048Size : crypto::aes::kAes128KeySize;
fnd::SimpleTextOutput::hexDump(body.getEncTitleKey(), size, 0x10, 6); fnd::SimpleTextOutput::hexDump(body.getEncTitleKey(), size, 0x10, 6);
/* printf(" Version: v%d.%d.%d", _SPLIT_VER(body.getTicketVersion()));
if (body.getTitleKeyEncType() == es::ticket::AES128_CBC && body.getCommonKeyId() == 0) if (_HAS_BIT(mCliOutputMode, OUTPUT_EXTENDED))
{ printf(" (%d)", body.getTicketVersion());
byte_t iv[crypto::aes::kAesBlockSize]; printf("\n");
byte_t key[crypto::aes::kAes128KeySize];
memcpy(iv, body.getRightsId(), crypto::aes::kAesBlockSize); std::cout << " License Type: " << getLicenseTypeStr(body.getLicenseType()) << std::endl;
crypto::aes::AesCbcDecrypt(body.getEncTitleKey(), crypto::aes::kAes128KeySize, eticket_common_key, iv, key);
size = crypto::aes::kAes128KeySize;
printf(" TitleKey:\n");
fnd::SimpleTextOutput::hexDump(key, size, 0x10, 6);
}
*/
printf(" Version: v%d.%d.%d (%d)\n", _SPLIT_VER(body.getTicketVersion()), body.getTicketVersion());
printf(" License Type: %s\n", getLicenseTypeStr(body.getLicenseType()));
if (body.getPropertyFlags().size() > 0) if (body.getPropertyFlags().size() > 0)
{ {
printf(" Flags:\n"); std::cout << " Flags:" << std::endl;
for (size_t i = 0; i < body.getPropertyFlags().size(); i++) for (size_t i = 0; i < body.getPropertyFlags().size(); i++)
{ {
printf(" %s\n", getPropertyFlagStr(body.getPropertyFlags()[i])); std::cout << " " << getPropertyFlagStr(body.getPropertyFlags()[i]) << std::endl;
} }
} }
printf(" Reserved Region:\n"); if (_HAS_BIT(mCliOutputMode, OUTPUT_EXTENDED))
fnd::SimpleTextOutput::hexDump(body.getReservedRegion(), 8, 0x10, 4); {
printf(" TicketId: 0x%016" PRIx64 "\n", body.getTicketId()); std::cout << " Reserved Region:" << std::endl;
printf(" DeviceId: 0x%016" PRIx64 "\n", body.getDeviceId()); fnd::SimpleTextOutput::hexDump(body.getReservedRegion(), 8, 0x10, 4);
printf(" RightsId: "); }
if (body.getTicketId() != 0 || _HAS_BIT(mCliOutputMode, OUTPUT_EXTENDED))
std::cout << " TicketId: 0x" << std::hex << std::setw(16) << std::setfill('0') << body.getTicketId() << std::endl;
if (body.getDeviceId() != 0 || _HAS_BIT(mCliOutputMode, OUTPUT_EXTENDED))
std::cout << " DeviceId: 0x" << std::hex << std::setw(16) << std::setfill('0') << body.getDeviceId() << std::endl;
std::cout << " RightsId: " << std::endl << " ";
fnd::SimpleTextOutput::hexDump(body.getRightsId(), 16); fnd::SimpleTextOutput::hexDump(body.getRightsId(), 16);
printf(" SectionTotalSize: 0x%x\n", body.getSectionTotalSize()); std::cout << " SectionTotalSize: 0x" << std::hex << body.getSectionTotalSize() << std::endl;
printf(" SectionHeaderOffset: 0x%x\n", body.getSectionHeaderOffset()); std::cout << " SectionHeaderOffset: 0x" << std::hex << body.getSectionHeaderOffset() << std::endl;
printf(" SectionNum: 0x%x\n", body.getSectionNum()); std::cout << " SectionNum: 0x" << std::hex << body.getSectionNum() << std::endl;
printf(" SectionEntrySize: 0x%x\n", body.getSectionEntrySize()); std::cout << " SectionEntrySize: 0x" << std::hex << body.getSectionEntrySize() << std::endl;
#undef _HEXDUMP_L #undef _HEXDUMP_L
@ -117,6 +127,36 @@ void EsTikProcess::displayTicket()
#undef _SPLIT_VER #undef _SPLIT_VER
} }
const char* EsTikProcess::getSignTypeStr(uint32_t type) const
{
const char* str = nullptr;
switch(type)
{
case (es::sign::SIGN_RSA4096_SHA1):
str = "RSA4096_SHA1";
break;
case (es::sign::SIGN_RSA2048_SHA1):
str = "RSA2048_SHA1";
break;
case (es::sign::SIGN_ECDSA240_SHA1):
str = "ECDSA240_SHA1";
break;
case (es::sign::SIGN_RSA4096_SHA256):
str = "RSA4096_SHA256";
break;
case (es::sign::SIGN_RSA2048_SHA256):
str = "RSA2048_SHA256";
break;
case (es::sign::SIGN_ECDSA240_SHA256):
str = "ECDSA240_SHA256";
break;
default:
str = "Unknown";
break;
}
return str;
}
const char* EsTikProcess::getTitleKeyPersonalisationStr(byte_t flag) const const char* EsTikProcess::getTitleKeyPersonalisationStr(byte_t flag) const
{ {
const char* str = nullptr; const char* str = nullptr;

1
programs/nstool/source/EsTikProcess.h
View file

@ -32,6 +32,7 @@ private:
es::SignedData<es::TicketBody_V2> mTik; es::SignedData<es::TicketBody_V2> mTik;
void displayTicket(); void displayTicket();
const char* getSignTypeStr(uint32_t type) const;
const char* getTitleKeyPersonalisationStr(byte_t flag) const; const char* getTitleKeyPersonalisationStr(byte_t flag) const;
const char* getLicenseTypeStr(byte_t flag) const; const char* getLicenseTypeStr(byte_t flag) const;
const char* getPropertyFlagStr(byte_t flag) const; const char* getPropertyFlagStr(byte_t flag) const;