Merge pull request #66 from jakcron/v1.2.0-development

Fix bug and print ACID KeyGeneration.
This commit is contained in:
Jack 2020-02-29 16:06:56 +08:00 committed by GitHub
commit 10558837cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -210,7 +210,7 @@ void KeyConfiguration::clearGeneralKeyConfiguration()
for (size_t j = 0; j < kNcaKeakNum; j++) for (size_t j = 0; j < kNcaKeakNum; j++)
{ {
mNcaKeyAreaEncryptionKey[j][i] = kNullAesKey; mNcaKeyAreaEncryptionKey[j][i] = kNullAesKey;
mNcaKeyAreaEncryptionKey[j][i] = kNullAesKey; mNcaKeyAreaEncryptionKeyHw[j][i] = kNullAesKey;
} }
} }
} }

View file

@ -296,6 +296,7 @@ void MetaProcess::validateAciFromAcid(const nn::hac::AccessControlInfo& aci, con
void MetaProcess::displayMetaHeader(const nn::hac::Meta& hdr) void MetaProcess::displayMetaHeader(const nn::hac::Meta& hdr)
{ {
std::cout << "[Meta Header]" << std::endl; std::cout << "[Meta Header]" << std::endl;
std::cout << " ACID KeyGeneration: " << std::dec << hdr.getAcidKeyGeneration() << std::endl;
std::cout << " Process Architecture Params:" << std::endl; std::cout << " Process Architecture Params:" << std::endl;
std::cout << " Ins. Type: " << nn::hac::MetaUtil::getInstructionTypeAsString(hdr.getInstructionType()) << std::endl; std::cout << " Ins. Type: " << nn::hac::MetaUtil::getInstructionTypeAsString(hdr.getInstructionType()) << std::endl;
std::cout << " Addr Space: " << nn::hac::MetaUtil::getProcAddressSpaceTypeAsString(hdr.getProcAddressSpaceType()) << std::endl; std::cout << " Addr Space: " << nn::hac::MetaUtil::getProcAddressSpaceTypeAsString(hdr.getProcAddressSpaceType()) << std::endl;