Mirrors/hactool
2
0
Fork 0
mirror of https://github.com/SciresM/hactool synced 2025-02-16 19:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #62 from roblabla/master

Browse source 
Properly derive the package1_keys and master_keks
This commit is contained in:
SciresM 2018-11-30 15:13:27 -08:00 • committed by GitHub
commit 5c70f5c193
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pki.c
View file

@ -1118,6 +1118,9 @@ void pki_derive_keys(nca_keyset_t *keyset) {
aes_ctx_t *keyblob_ctx = new_aes_ctx(&keyset->keyblob_keys[i], 0x10, AES_MODE_CTR);
aes_setiv(keyblob_ctx, &keyset->encrypted_keyblobs[i][0x10], 0x10);
aes_decrypt(keyblob_ctx, &keyset->keyblobs[i], &keyset->encrypted_keyblobs[i][0x20], sizeof(keyset->keyblobs[i]));
free_aes_ctx(keyblob_ctx);
}
for (unsigned int i = 0; i < 0x6; i++) {
/* Set package1 key as relevant. */
if (memcmp(keyset->keyblobs[i] + 0x80, zeroes, 0x10) != 0) {
memcpy(&keyset->package1_keys[i], &keyset->keyblobs[i][0x80], 0x10);
@ -1126,7 +1129,6 @@ void pki_derive_keys(nca_keyset_t *keyset) {
if (memcmp(keyset->keyblobs[i] + 0x00, zeroes, 0x10) != 0) {
memcpy(&keyset->master_keks[i], &keyset->keyblobs[i][0x00], 0x10);
}
free_aes_ctx(keyblob_ctx);
}
for (unsigned int i = 0x6; i < 0x20; i++) {
/* Do new keygen for 6.2.0+. */