Updated tools to encrypt EBOOT. Also fixed PSP GO bug

src/Makefile.signed

@@ -1,12 +1,13 @@
 UNAME := $(shell uname)
 release: all
 ifeq ($(UNAME), Linux)
-	WINEPREFIX=$(shell pwd)/prefix wine bin/prxEncrypter.exe $(TARGET).prx
+	bin/psptools/pack_ms_game.py --vanity "$(PSP_EBOOT_TITLE)" EBOOT.PBP EBOOT.PBP
 else
-	bin\prxEncrypter.exe $(TARGET).prx
+	bin\\psptools\\pack_ms_game.py --vanity "$(PSP_EBOOT_TITLE)" EBOOT.PBP EBOOT.PBP
 endif
-	pack-pbp $(EXTRA_TARGETS) PARAM.SFO icon0.png NULL NULL NULL NULL data.psp NULL
-	rm -f data.psp
+	unpack-pbp EBOOT.PBP
+	pack-pbp $(EXTRA_TARGETS) PARAM.SFO icon0.png NULL NULL NULL NULL DATA.PSP NULL
+	rm -f DATA.PSP
 	rm -f downgrade_ctrl.h
 	rm -f downgrade660_ctrl.h
 	@mkdir -p PSP/GAME/ChronoSwitch
@@ -26,7 +27,7 @@ LIBS = -lpsppower
 PSP_FW_VERSION = 271
 
 EXTRA_TARGETS = EBOOT.PBP
-PSP_EBOOT_TITLE = Chronoswitch Downgrader v7.4
+PSP_EBOOT_TITLE = Chronoswitch Downgrader v7.5
 
 BUILD_PRX = 1
 

src/bin/psptools/pack_btcnf.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import argparse
+
+from psptool.pack import pack_btcnf
+from psptool.prx import encrypt
+
+parser = argparse.ArgumentParser(description="Infinity Boot Config Packer")
+parser.add_argument('input', type=argparse.FileType('rb'),
+                    help='The raw text file to pack')
+parser.add_argument('--vanity', type=str,
+                    help='Some vanity text in the executable header')
+parser.add_argument('output', type=str,
+                    help='The output to write the packed text')
+args = parser.parse_args()
+
+executable = args.input.read()
+executable = encrypt(pack_btcnf(executable,
+                              psptag=0x00000000), vanity=args.vanity)
+
+with open(args.output, 'wb') as f:
+    f.write(executable)

src/bin/psptools/pack_kernel_module.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import argparse
+
+from psptool.pack import pack_prx
+from psptool.prx import encrypt
+
+parser = argparse.ArgumentParser(description="Infinity Kernel Module Packer")
+parser.add_argument('input', type=argparse.FileType('rb'),
+                    help='The raw kernel PRX to pack')
+parser.add_argument('--vanity', type=str,
+                    help='Some vanity text in the executable header')
+parser.add_argument('output', type=str,
+                    help='The output to write the packed PRX')
+args = parser.parse_args()
+
+executable = args.input.read()
+executable = encrypt(pack_prx(executable, is_pbp=False,
+                              psptag=lambda x: 0x00000000), vanity=args.vanity)
+
+with open(args.output, 'wb') as f:
+    f.write(executable)

src/bin/psptools/pack_ms_game.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import argparse
+
+from psptool.pbp import is_pbp, PBP
+from psptool.pack import pack_prx
+from psptool.prx import encrypt
+
+parser = argparse.ArgumentParser(description="Infinity Game Packer")
+parser.add_argument('input', type=argparse.FileType('rb'),
+                    help='The raw PBP to pack')
+parser.add_argument('--vanity', type=str,
+                    help='Some vanity text in the executable header')
+parser.add_argument('output', type=str,
+                    help='The output to write the packed PBP')
+args = parser.parse_args()
+
+executable = args.input.read()
+
+if not is_pbp(executable):
+    raise ValueError("not a PBP")
+
+# Although there are several tags for MS demos, 0x0C000000 is the most
+# portable as it exists in every firmware
+pbp = PBP(executable)
+pbp.prx = encrypt(pack_prx(pbp.prx, is_pbp=True,
+                           psptag=lambda x: 0x0C000000), vanity=args.vanity)
+
+with open(args.output, 'wb') as f:
+    f.write(pbp.pack())

src/bin/psptools/pack_updater.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+import argparse
+
+from psptool.pbp import is_pbp, PBP
+from psptool.pack import pack_prx
+from psptool.prx import encrypt
+
+parser = argparse.ArgumentParser(description="Infinity Updater Packer")
+parser.add_argument('input', type=argparse.FileType('rb'),
+                    help='The raw PBP to pack')
+parser.add_argument('--vanity', type=str,
+                    help='Some vanity text in the executable header')
+parser.add_argument('output', type=str,
+                    help='The output to write the packed PBP')
+args = parser.parse_args()
+
+executable = args.input.read()
+
+if not is_pbp(executable):
+    raise ValueError("not a PBP")
+
+pbp = PBP(executable)
+pbp.prx = encrypt(pack_prx(pbp.prx, is_pbp=True,
+                           psptag=lambda x: 0x0B000000), vanity=args.vanity)
+
+with open(args.output, 'wb') as f:
+    f.write(pbp.pack())

src/bin/psptools/pack_user_fw_module.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+import argparse
+
+from psptool.pack import pack_prx
+from psptool.prx import encrypt
+
+parser = argparse.ArgumentParser(
+    description="Infinity User Firmware Module Packer")
+parser.add_argument('input', type=argparse.FileType('rb'),
+                    help='The raw user PRX to pack')
+parser.add_argument('--id', type=str, help='The btcnf id to set')
+parser.add_argument('output', type=str,
+                    help='The output to write the packed PRX')
+args = parser.parse_args()
+
+executable = args.input.read()
+executable = encrypt(pack_prx(executable, is_pbp=False,
+                              psptag=lambda x: 0x457B8AF0), id=bytes.fromhex(args.id))
+
+with open(args.output, 'wb') as f:
+    f.write(executable)