NinjaCheetah/WiiPy
1
0
Fork 0
mirror of https://github.com/NinjaCheetah/WiiPy.git synced 2025-04-26 13:21:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Signing information now presented much more clearly

Browse Source
This commit is contained in:
Campbell 2024-12-24 00:37:21 -05:00
parent 9ad0f8412c
commit 514deb6b6c
Signed by: NinjaCheetah
GPG Key ID: 670C282B3291D63D
2 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
commands/title/info.py
View File

@ -8,7 +8,7 @@ import libWiiPy
from modules.core import fatal_error
def _print_tmd_info(tmd: libWiiPy.title.TMD, signed=None):
def _print_tmd_info(tmd: libWiiPy.title.TMD, signing_cert=None):
# Get all important keys from the TMD and print them out nicely.
print("Title Info")
ascii_tid = ""
@ -69,9 +69,23 @@ def _print_tmd_info(tmd: libWiiPy.title.TMD, signed=None):
print(f" vWii Title: {bool(tmd.vwii)}")
print(f" DVD Video Access: {tmd.get_access_right(tmd.AccessFlags.DVD_VIDEO)}")
print(f" AHB Access: {tmd.get_access_right(tmd.AccessFlags.AHB)}")
if signed is not None:
print(f" Signed: {signed}")
print(f" Fakesigned: {tmd.get_is_fakesigned()}")
if signing_cert is not None:
try:
signed = libWiiPy.title.verify_tmd_sig(signing_cert, tmd)
if signed:
signing_str = "Valid (Unmodified)"
elif tmd.get_is_fakesigned():
signing_str = "Fakesigned"
else:
signing_str = "Invalid (Modified)"
except ValueError:
if tmd.get_is_fakesigned():
signing_str = "Fakesigned"
else:
signing_str = "Invalid (Modified)"
print(f" Signing Status: {signing_str}")
else:
print(f" Fakesigned: {tmd.get_is_fakesigned()}")
# Iterate over the content and print their details.
print("\nContent Info")
print(f" Total Contents: {tmd.num_contents}")
@ -85,7 +99,7 @@ def _print_tmd_info(tmd: libWiiPy.title.TMD, signed=None):
print(f" Content Hash: {content.content_hash.decode()}")
def _print_ticket_info(ticket: libWiiPy.title.Ticket, signed=None):
def _print_ticket_info(ticket: libWiiPy.title.Ticket, signing_cert=None):
# Get all important keys from the TMD and print them out nicely.
print(f"Ticket Info")
ascii_tid = ""
@ -131,9 +145,23 @@ def _print_ticket_info(ticket: libWiiPy.title.Ticket, signed=None):
print(f" Decryption Key: {key}")
print(f" Title Key (Encrypted): {binascii.hexlify(ticket.title_key_enc).decode()}")
print(f" Title Key (Decrypted): {binascii.hexlify(ticket.get_title_key()).decode()}")
if signed is not None:
print(f" Signed: {signed}")
print(f" Fakesigned: {ticket.get_is_fakesigned()}")
if signing_cert is not None:
try:
signed = libWiiPy.title.verify_ticket_sig(signing_cert, ticket)
if signed:
signing_str = "Valid (Unmodified)"
elif ticket.get_is_fakesigned():
signing_str = "Fakesigned"
else:
signing_str = "Invalid (Modified)"
except ValueError:
if ticket.get_is_fakesigned():
signing_str = "Fakesigned"
else:
signing_str = "Invalid (Modified)"
print(f" Signing Status: {signing_str}")
else:
print(f" Fakesigned: {ticket.get_is_fakesigned()}")
def _print_wad_info(title: libWiiPy.title.Title):
@ -168,18 +196,25 @@ def _print_wad_info(title: libWiiPy.title.Title):
print(f" Installed Size (MB): {min_size}-{max_size} MB")
print(f" Has Meta/Footer: {bool(title.wad.wad_meta_size)}")
print(f" Has CRL: {bool(title.wad.wad_crl_size)}")
signed = title.get_is_signed()
if signed:
signing_str = "Valid (Unmodified)"
elif title.get_is_fakesigned():
signing_str = "Fakesigned"
else:
tmd_cert = None
ticket_cert = None
try:
signed = title.get_is_signed()
tmd_cert = title.cert_chain.tmd_cert
ticket_cert = title.cert_chain.ticket_cert
if signed:
signing_str = "Valid (Unmodified)"
elif title.get_is_fakesigned():
signing_str = "Fakesigned"
else:
signing_str = "Invalid (Modified)"
except ValueError:
signing_str = "Invalid (Modified)"
print(f" Signing Status: {signing_str}")
print("")
_print_ticket_info(title.ticket, signed)
_print_ticket_info(title.ticket, ticket_cert)
print("")
_print_tmd_info(title.tmd, signed)
_print_tmd_info(title.tmd, tmd_cert)
def handle_info(args):

2
commands/title/wad.py
View File

@ -253,7 +253,7 @@ def handle_wad_pack(args):
title = libWiiPy.title.Title()
title.load_tmd(tmd_file.read_bytes())
title.load_ticket(ticket_file.read_bytes())
title.wad.set_cert_data(cert_file.read_bytes())
title.load_cert_chain(cert_file.read_bytes())
# Footers are not super common and are not required, so we don't care about one existing until we get to
# the step where we'd pack it.
footer_file = pathlib.Path(list(input_path.glob("*.[fF][oO][oO][tT][eE][rR]"))[0])