psptool 3.2.dev1__tar.gz → 3.4__tar.gz

{psptool-3.2.dev1 → psptool-3.4}/.github/workflows/gha-metrics.yml

@@ -13,6 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+           ref: ${{ github.event.pull_request.head.sha }}
            submodules: recursive
            ssh-key: ${{ secrets.PSPTOOL_FIXTURES_NEW_PRIVATE_KEY }}
       - name: Set up Python ${{ matrix.python-version }}

{psptool-3.2.dev1 → psptool-3.4}/.github/workflows/publish.yml

@@ -49,26 +49,3 @@ jobs:
         path: dist/
     - name: Publish distribution to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
-
-  publish-to-testpypi:
-    name: >-
-      Publish Python distribution to TestPyPI
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    environment:
-      name: testpypi
-      url: https://test.pypi.org/p/psptool/
-    permissions:
-      id-token: write  # important for trusted publishing
-    steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@v4
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish distribution to TestPyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        repository-url: https://test.pypi.org/legacy/
-        verbose: true

{psptool-3.2.dev1 → psptool-3.4}/.github/workflows/python-tests.yml

@@ -1,6 +1,6 @@
 name: Python tests
 
-on: [push]
+on: [push, pull_request_target]
 
 jobs:
   test:
@@ -13,6 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
+          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
           ssh-key: ${{ secrets.PSPTOOL_FIXTURES_NEW_PRIVATE_KEY }}
       - name: Set up Python ${{ matrix.python-version }}

{psptool-3.2.dev1 → psptool-3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psptool
-Version: 3.2.dev1
+Version: 3.4
 Summary: PSPTool is a tool for dealing with AMD binary blobs
 Author-email: Christian Werling <cwerling@posteo.de>
 License-File: LICENSE

{psptool-3.2.dev1 → psptool-3.4}/psptool/__main__.py

@@ -193,7 +193,7 @@ def main():
                         if args.decompress and type(file) is HeaderFile:
                             out_bytes = file.get_signed_bytes()
                         elif args.decrypt and type(file) is HeaderFile:
-                            out_bytes = file.get_decrypted()
+                            out_bytes = file.get_decrypted_body()
                         elif args.pem_key and type(file) is PubkeyFile:
                             out_bytes = file.get_pem_encoded()
                         else:
@@ -216,7 +216,7 @@ def main():
                     if args.decompress and type(file) is HeaderFile:
                         out_bytes = file.get_signed_bytes()
                     elif args.decrypt and type(file) is HeaderFile:
-                        out_bytes = file.get_decrypted()
+                        out_bytes = file.get_decrypted_body()
                     elif args.pem_key and type(file) is PubkeyFile:
                         out_bytes = file.get_pem_encoded()
                     else:

{psptool-3.2.dev1 → psptool-3.4}/psptool/blob.py

@@ -179,13 +179,6 @@ class Blob(NestedBuffer):
             found_pkes += self._find_inline_pubkeys(key_id)
         return found_pkes
 
-    def get_entries_by_type(self, type_) -> List[File]:
-        entries = []
-
-        for rom in self.roms:
-            for _dir in rom.directories:
-                for entry in _dir.entries:
-                    if entry.type == type_:
-                        entries.append(entry)
-
-        return entries
+    def get_files_by_type(self, type_) -> List[File]:
+        all_files = self.unique_files()
+        return list(filter(lambda f: f.type == type_, all_files))

{psptool-3.2.dev1 → psptool-3.4}/psptool/directory.py

@@ -31,6 +31,22 @@ class Directory(NestedBuffer):
     ENTRY_SIZE = DirectoryEntry.ENTRY_SIZE
     FILE_CLASS = File
 
+    ZEN_GENERATION_IDS = {'Zen 1'  : [b'\x00\x09\xBC', b'\x00\x0A\xBC'],
+                          'Zen 2'  : [b'\x05\x0B\xBC', b'\x01\x0A\xBC'],
+                          'Zen 3'  : [b'\x01\x0C\xBC', b'\x00\x0C\xBC'],
+                          'Zen 4'  : [b'\x04\x0D\xBC', b'\x0B\x0D\xBC'],
+                          'Zen 4/5': [b'\x03\x0D\xBC']
+                         }
+
+    @classmethod
+    def get_possible_zen_generation(cls, zen_generation_id):
+        zen_generation = 'unknown'
+        for possible_zen_generation in cls.ZEN_GENERATION_IDS:
+            if zen_generation_id in cls.ZEN_GENERATION_IDS[possible_zen_generation]:
+                zen_generation = possible_zen_generation
+
+        return zen_generation
+
     class ParseError(Exception):
         pass
 
@@ -43,6 +59,7 @@ class Directory(NestedBuffer):
         # Recursively return or create and return found directories
 
         if offset in fet.psptool.directories_by_offset:
+            fet.psptool.directories_by_offset[offset].update_zen_generation(fet, zen_generation)
             return [fet.psptool.directories_by_offset[offset]]
         else:
             # 1. Create the immediate directory in front of us
@@ -69,6 +86,14 @@ class Directory(NestedBuffer):
             for tertiary_directory_offset in directory.tertiary_directory_offsets:
                 directory_body = fet.rom.get_bytes(tertiary_directory_offset, 32)
                 actual_tertiary_offset = int.from_bytes(directory_body[16:20], 'little')
+                zen_generation_id = directory_body[21:24]
+                zen_generation = cls.get_possible_zen_generation(zen_generation_id)
+                if zen_generation == 'unknown':
+                    fet.psptool.ph.print_warning(f"Unknown {zen_generation_id=}")
+
+                zen_generation_id = hex(int.from_bytes(directory_body[20:24], 'little'))
+                zen_generation += f' (PSP ID {zen_generation_id})'
+
                 # Resolve one more indirection
                 tertiary_directories = cls.create_directories_if_not_exist(actual_tertiary_offset, fet, zen_generation)
                 created_directories += tertiary_directories
@@ -198,6 +223,14 @@ class Directory(NestedBuffer):
         # 3. Update checksum
         self.update_checksum()
 
+    def update_zen_generation(self, fet, zen_generation):
+        if zen_generation is not None:
+            if zen_generation not in self.zen_generation:
+                self.zen_generation += '\n' + zen_generation
+                for offset in self.secondary_directory_offsets:
+                    dir = fet.psptool.directories_by_offset[offset]
+                    dir.update_zen_generation(fet, zen_generation)
+
 
 class BiosDirectory(Directory):
     DIRECTORY_MAGICS = [b'$BHD', b'$BL2']

{psptool-3.2.dev1 → psptool-3.4}/psptool/fet.py

@@ -19,12 +19,6 @@ from .directory import Directory
 
 from typing import List
 
-
-ZEN_GENERATION_IDS = {'Zen 1': [b'\x00\x09\xBC', b'\x00\x0A\xBC'],
-                      'Zen 2': [b'\x05\x0B\xBC', b'\x01\x0A\xBC'],
-                      'Zen 3': [b'\x01\x0C\xBC', b'\x00\x0C\xBC']}
-
-
 class EmptyFet(Exception):
     pass
 
@@ -121,13 +115,13 @@ class Fet(NestedBuffer):
 
             # entry_addr += self.blob_offset
             zen_generation_id = combo_dir[i*16+5:i*16+8]
-            zen_generation = 'unknown'
-            for possible_zen_generation in ZEN_GENERATION_IDS:
-                if zen_generation_id in ZEN_GENERATION_IDS[possible_zen_generation]:
-                    zen_generation = possible_zen_generation
+            zen_generation = Directory.get_possible_zen_generation(zen_generation_id)
             if zen_generation == 'unknown':
                 self.psptool.ph.print_warning(f"Unknown {zen_generation_id=}")
 
+            zen_generation_id = hex(int.from_bytes(combo_dir[i*16+4:i*16+8], byteorder='little'))
+            zen_generation += f' (PSP ID {zen_generation_id})'
+
             results.append((entry_addr, zen_generation))
 
         return results

{psptool-3.2.dev1 → psptool-3.4}/psptool/file.py

@@ -229,6 +229,7 @@ class File(NestedBuffer):
         0x6F: 'OEM_LOGO_IMAGE',
         0x77: 'DDRPHY_PCU_FW',
         0x7B: 'MPRAS_TRUSTRED_APP_IMG',
+        0x7C: 'OC_SWEET_SPOT_PROFILE',
     }
 
     PUBKEY_ENTRY_TYPES = [0x0, 0x9, 0xa, 0x5, 0xd, 0x43, 0x4e, 0x53, 0x81, 0x97, 0xad ]
@@ -237,7 +238,7 @@ class File(NestedBuffer):
     # TODO: Find a better way to identify those entries
     NO_HDR_ENTRY_TYPES = [0x4, 0xb, 0x21, 0x40, 0x48, 0x49, 0x4a, 0x70, 0x6, 0x61, 0x60, 0x68, 0x5f,
                           0x1a, 0x22, 0x63, 0x67, 0x66, 0x6d, 0x62, 0x61, 0x7, 0x38, 0x46, 0x54,
-                          0x82, 0x84, 0x8d, 0x69 ]
+                          0x82, 0x84, 0x8d, 0x69, 0x7c, 0x98 ]
 
     NO_SIZE_ENTRY_TYPES = [0xb]
     KEY_STORE_TYPES = [0x50, 0x51]

{psptool-3.2.dev1 → psptool-3.4}/psptool/header_file.py

@@ -132,7 +132,7 @@ class HeaderFile(File):
         return '.'.join([hex(b)[2:].upper() for b in self.version])
 
     def get_ikek_md5sum(self) -> bytes:
-        ikek = self.parent_buffer.get_entries_by_type(0x21)[0]
+        ikek = self.parent_buffer.get_files_by_type(0x21)[0]
         m = md5()
         m.update(ikek.get_bytes())
         return m.digest()