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] Fix titlekey decryption.

Browse source
This commit is contained in:
jakcron 2018-05-22 13:47:07 +08:00
parent a2aefc2827
commit c7e79b1d55
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
programs/nstool/source/NcaProcess.cpp
View file

@ -102,18 +102,16 @@ void NcaProcess::generateNcaBodyEncryptionKeys()
// if the titlekey_kek is available // if the titlekey_kek is available
if (mKeyset->ticket.titlekey_kek[masterkey_rev] != zero_aesctr_key) if (mKeyset->ticket.titlekey_kek[masterkey_rev] != zero_aesctr_key)
{ {
crypto::aes::sAesIvCtr iv;
iv.set(mHdr.getRightsId());
// the title key is provided (sourced from ticket) // the title key is provided (sourced from ticket)
if (mKeyset->nca.manual_title_key_aesctr != zero_aesctr_key) if (mKeyset->nca.manual_title_key_aesctr != zero_aesctr_key)
{ {
crypto::aes::AesCbcDecrypt(mKeyset->nca.manual_title_key_aesctr.key, 16, mKeyset->ticket.titlekey_kek[masterkey_rev].key, iv.iv, mBodyKeys.aes_ctr.var.key); nx::AesKeygen::generateKey(mBodyKeys.aes_ctr.var.key, mKeyset->nca.manual_title_key_aesctr.key, mKeyset->ticket.titlekey_kek[masterkey_rev].key);
mBodyKeys.aes_ctr.isSet = true; mBodyKeys.aes_ctr.isSet = true;
} }
if (mKeyset->nca.manual_title_key_aesxts != zero_aesxts_key) if (mKeyset->nca.manual_title_key_aesxts != zero_aesxts_key)
{ {
crypto::aes::AesCbcDecrypt(mKeyset->nca.manual_title_key_aesxts.key[0], 16, mKeyset->ticket.titlekey_kek[masterkey_rev].key, iv.iv, mBodyKeys.aes_xts.var.key[0]); nx::AesKeygen::generateKey(mBodyKeys.aes_xts.var.key[0], mKeyset->nca.manual_title_key_aesxts.key[0], mKeyset->ticket.titlekey_kek[masterkey_rev].key);
crypto::aes::AesCbcDecrypt(mKeyset->nca.manual_title_key_aesxts.key[1], 16, mKeyset->ticket.titlekey_kek[masterkey_rev].key, iv.iv, mBodyKeys.aes_xts.var.key[1]); nx::AesKeygen::generateKey(mBodyKeys.aes_xts.var.key[1], mKeyset->nca.manual_title_key_aesxts.key[1], mKeyset->ticket.titlekey_kek[masterkey_rev].key);
mBodyKeys.aes_xts.isSet = true; mBodyKeys.aes_xts.isSet = true;
} }
} }
@ -142,6 +140,19 @@ void NcaProcess::generateNcaBodyEncryptionKeys()
{ {
mBodyKeys.aes_xts = mKeyset->nca.manual_body_key_aesxts; mBodyKeys.aes_xts = mKeyset->nca.manual_body_key_aesxts;
} }
if (mBodyKeys.aes_ctr.isSet)
{
printf("AES-CTR Key: ");
fnd::SimpleTextOutput::hexDump(mBodyKeys.aes_ctr.var.key, sizeof(mBodyKeys.aes_ctr.var));
}
if (mBodyKeys.aes_xts.isSet)
{
printf("AES-XTS Key0: ");
fnd::SimpleTextOutput::hexDump(mBodyKeys.aes_xts.var.key[0], sizeof(mBodyKeys.aes_ctr.var));
printf("AES-XTS Key1: ");
fnd::SimpleTextOutput::hexDump(mBodyKeys.aes_xts.var.key[1], sizeof(mBodyKeys.aes_ctr.var));
}
} }
void NcaProcess::generatePartitionConfiguration() void NcaProcess::generatePartitionConfiguration()