Cleanup pki.c, fix readme.md, fix usage statement.

This commit is contained in:
Michael Scire 2018-04-26 00:18:34 -06:00
parent 42bae8d256
commit 9276b1c09b
3 changed files with 3 additions and 8 deletions

View file

@ -19,7 +19,7 @@ Options:
-y, --verify Verify hashes and signatures.
-d, --dev Decrypt with development keys instead of retail.
-k, --keyset Load keys from an external file.
-t, --intype=type Specify input file type [nca, xci, pfs0, romfs, hfs0, npdm, pk11, pk21, ini1, kip1]
-t, --intype=type Specify input file type [nca, xci, pfs0, romfs, hfs0, npdm, pk11, pk21, ini1, kip1, nax0, keygen]
--titlekey=key Set title key for Rights ID crypto titles.
--contentkey=key Set raw key for NCA body decryption.
NCA options:

2
main.c
View file

@ -31,7 +31,7 @@ static void usage(void) {
" -y, --verify Verify hashes and signatures.\n"
" -d, --dev Decrypt with development keys instead of retail.\n"
" -k, --keyset Load keys from an external file.\n"
" -t, --intype=type Specify input file type [nca, xci, pfs0, romfs, hfs0, npdm, pk11, pk21, ini1, kip1, keygen]\n"
" -t, --intype=type Specify input file type [nca, xci, pfs0, romfs, hfs0, npdm, pk11, pk21, ini1, kip1, nax0, keygen]\n"
" --titlekey=key Set title key for Rights ID crypto titles.\n"
" --contentkey=key Set raw key for NCA body decryption.\n"
"NCA options:\n"

7
pki.c
View file

@ -1065,13 +1065,8 @@ void pki_print_keys(nca_keyset_t *keyset) {
}
printf("\n");
/*
unsigned char titlekeks[0x20][0x10];
unsigned char key_area_keys[0x20][3][0x10];
*/
#undef PRINT_KEY_WITH_NAME_IDX
#undef PRINT_KEY_WITH_NAME
#undef PRINT_KEY
}
void pki_initialize_keyset(nca_keyset_t *keyset, keyset_variant_t variant) {