rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fix_ndsheader.py being broken in Python 2 (#89)

Browse Source
This commit is contained in:
Pk11 2021-03-25 17:42:28 -05:00 committed by GitHub
parent 7463102ce0
commit fb7371de4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fix_ndsheader.py
View File

@ -49,7 +49,7 @@ def getBytes(e):
try: try:
return e.encode('ascii') return e.encode('ascii')
except: except:
print("ERROR: " + e) ; print("ERROR: {}".format(e))
# #
# CRC16 MODULE # CRC16 MODULE
# #
@ -116,7 +116,7 @@ def skipUntilAddress(f_in,f_out, caddr, taddr):
f_out.write(chunk) f_out.write(chunk)
def writeBlankuntilAddress(f_out, caddr, taddr): def writeBlankuntilAddress(f_out, caddr, taddr):
f_out.write(bytes([0])*(taddr-caddr)) f_out.write(b"\x00"*(taddr-caddr))
fname=args.file fname=args.file
@ -403,21 +403,21 @@ else:
# Fix srlSignedHeader # Fix srlSignedHeader
if not args.read: if not args.read:
srlSignedHeader=srlSignedHeader._replace( srlSignedHeader=srlSignedHeader._replace(
arm7Sha1Hmac= bytes([255])*20, arm7Sha1Hmac= b'\xff'*20,
arm9WithSecAreaSha1Hmac= bytes([255])*20, arm9WithSecAreaSha1Hmac= b'\xff'*20,
bannerSha1Hmac= bytes([255])*20, bannerSha1Hmac= b'\xff'*20,
signature= bytes([255])*128 signature= b'\xff'*128
) )
if "dsi" in args.mode : if "dsi" in args.mode :
srlSignedHeader=srlSignedHeader._replace( srlSignedHeader=srlSignedHeader._replace(
arm7Sha1Hmac= bytes([255])*20, arm7Sha1Hmac= b'\xff'*20,
arm7iSha1Hmac= bytes([255])*20, arm7iSha1Hmac= b'\xff'*20,
arm9Sha1Hmac= bytes([255])*20, arm9Sha1Hmac= b'\xff'*20,
arm9WithSecAreaSha1Hmac= bytes([255])*20, arm9WithSecAreaSha1Hmac= b'\xff'*20,
arm9iSha1Hmac= bytes([255])*20, arm9iSha1Hmac= b'\xff'*20,
bannerSha1Hmac= bytes([255])*20, bannerSha1Hmac= b'\xff'*20,
digestMasterSha1Hmac= bytes([255])*20, digestMasterSha1Hmac= b'\xff'*20,
signature= bytes([255])*128 signature= b'\xff'*128
) )
if args.verbose or args.read: if args.verbose or args.read:
pprint(dict(srlSignedHeader._asdict())) pprint(dict(srlSignedHeader._asdict()))
@ -482,7 +482,7 @@ if not args.read:
filew.write(data1) filew.write(data1)
filew.write(data2) filew.write(data2)
filew.write(data3[0:0xC80]) filew.write(data3[0:0xC80])
filew.write(bytes([255])*16*8) filew.write(b'\xff'*16*8)
writeBlankuntilAddress(filew,0x1000,0x4000) writeBlankuntilAddress(filew,0x1000,0x4000)
if arm9Footer.nitrocode != 0xDEC00621: if arm9Footer.nitrocode != 0xDEC00621: