Merge branch 'change-to-v3' of github.com:ptr-yudai/ptrlib into change-to-v3

Author: ptr-yudai

.github/workflows/test-on-pr-ubuntu.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/test-on-pr-windows.yml

@@ -11,6 +11,7 @@ on:
       - 'ptrlib/**'
       - 'tests/**'
   pull_request:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -31,6 +32,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         if( Test-Path .\requirements.txt ){ pip install -r requirements.txt }
+        pip install capstone keystone-engine
     - name: Test with pytest
       run: |
         '```' >> $env:GITHUB_STEP_SUMMARY

ptrlib/debugger/__init__.py

@@ -1,2 +1,7 @@
-from .unix import *
-#from .windows import *
+import os
+
+if os.name == 'nt':
+    #from .windows import *
+    pass
+else:
+    from .unix import *

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='ptrlib',
-    version='2.5.0',
+    version='3.0.0',
     description='CTF library',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -19,14 +19,14 @@
     author_email='ptr.yudai+dev@gmail.com',
     classifiers=[
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     keywords='pwn crypto algorithm',
     packages=find_packages(exclude=['examples', 'tests']),
-    python_requires='>=3.8',
+    python_requires='>=3.10',
     install_requires=['pycryptodome', "pywin32; platform_system=='Windows'"],
     entry_points={
         'console_scripts': [

tests/cpu/intel/test_assembler.py

@@ -1,20 +1,23 @@
+import os
 import unittest
-from ptrlib.cpu import CPU
 from logging import getLogger, FATAL
+from ptrlib.cpu import CPU
+
+_is_windows = os.name == 'nt'
 
 # TODO: Test AT&T syntax
 
-const_gcc = '.byte 0; .word 1; .long 2; .quad 3; .asciz "/bin/sh"; .ascii "/bin/sh"'
-const_gcc_bytes = \
+CONST_GCC = '.byte 0; .word 1; .long 2; .quad 3; .asciz "/bin/sh"; .ascii "/bin/sh"'
+CONST_GCC_BYTES = \
     b'\x00\x01\x00\x02\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00' \
     b'/bin/sh\0/bin/sh'
 
-const_nasm = 'db 0; dw 1; dd 2; dq 3; db "/bin/sh", 0; db "/bin/sh"'
-const_nasm_bytes = \
+CONST_NASM = 'db 0; dw 1; dd 2; dq 3; db "/bin/sh", 0; db "/bin/sh"'
+CONST_NASM_BYTES = \
     b'\x00\x01\x00\x02\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00' \
     b'/bin/sh\0/bin/sh'
 
-shellcode_32 = """
+SHELLCODE_32 = """
     push 0x30
     pop eax
     xor al, 0x30 // omit eax, ecx
@@ -27,9 +30,9 @@
     popad
     dec edx   /* edx = 0xffffffff */
 """
-shellcode_32_bytes = b'j0X40PPPPQPaJ'
+SHELLCODE_32_BYTES = b'j0X40PPPPQPaJ'
 
-shellcode_64 = """
+SHELLCODE_64 = """
     movabs rax, qword ptr gs:[0x188]    // Prcb.CurrentThread
     mov rax, qword ptr [rax + 0xb8]     // ApcState.Process
     mov rcx, rax
@@ -63,7 +66,7 @@
     swapgs
     sysretq
 """
-shellcode_64_bytes = \
+SHELLCODE_64_BYTES = \
     b"\x65\x48\xa1\x88\x01\x00\x00\x00\x00\x00\x00" \
     b"\x48\x8b\x80\xb8\x00\x00\x00" \
     b"\x48\x89\xc1" \
@@ -92,12 +95,17 @@
     b"\x48\x0f\x07"
 
 class TestIntelAssembler(unittest.TestCase):
+    """Test Intel assembler
+    """
     def setUp(self):
         getLogger("ptrlib").setLevel(FATAL)
 
     def test_32bit_gcc(self):
         """Test assembler for Intel 32-bit GCC
         """
+        if _is_windows:
+            return # Skip windows
+
         cpu = CPU('intel', 32)
         cpu.assembler = 'gcc'
 
@@ -116,10 +124,10 @@ def test_32bit_gcc(self):
         self.assertEqual(cpu.assemble('call far [esp]'), b'\xff\x94$\x06\xff\x00\x00')
 
         # Test long code
-        self.assertEqual(cpu.assemble(shellcode_32), shellcode_32_bytes)
+        self.assertEqual(cpu.assemble(SHELLCODE_32), SHELLCODE_32_BYTES)
 
         # Test constant
-        self.assertEqual(cpu.assemble(const_gcc), const_gcc_bytes)
+        self.assertEqual(cpu.assemble(CONST_GCC), CONST_GCC_BYTES)
 
         # Test exception
         with self.assertRaises(OSError):
@@ -130,6 +138,9 @@ def test_32bit_gcc(self):
     def test_64bit_gcc(self):
         """Test assembler for Intel 64-bit GCC
         """
+        if _is_windows:
+            return # Skip windows
+
         cpu = CPU('intel', 64)
         cpu.assembler = 'gcc'
 
@@ -148,10 +159,10 @@ def test_64bit_gcc(self):
         self.assertEqual(cpu.assemble('call far [rsp]'), b'\xff\x94$\x06\xff\x00\x00')
 
         # Test long code
-        self.assertEqual(cpu.assemble(shellcode_64), shellcode_64_bytes)
+        self.assertEqual(cpu.assemble(SHELLCODE_64), SHELLCODE_64_BYTES)
 
         # Test constant
-        self.assertEqual(cpu.assemble(const_gcc), const_gcc_bytes)
+        self.assertEqual(cpu.assemble(CONST_GCC), CONST_GCC_BYTES)
 
         # Test exception
         with self.assertRaises(OSError):
@@ -179,10 +190,10 @@ def test_32bit_keystone(self):
         self.assertEqual(cpu.assemble('A: /* infinite call */ call A'), b'\xe8\xfb\xff\xff\xff')
 
         # Test long code
-        self.assertEqual(cpu.assemble(shellcode_32), shellcode_32_bytes)
+        self.assertEqual(cpu.assemble(SHELLCODE_32), SHELLCODE_32_BYTES)
 
         # Test constant
-        self.assertEqual(cpu.assemble(const_gcc), const_gcc_bytes)
+        self.assertEqual(cpu.assemble(CONST_GCC), CONST_GCC_BYTES)
 
         # Test exception
         with self.assertRaises(OSError):
@@ -211,7 +222,7 @@ def test_64bit_keystone(self):
         self.assertEqual(cpu.assemble('A: /* infinite call */ call A'), b'\xe8\xfb\xff\xff\xff')
 
         # Test constant
-        self.assertEqual(cpu.assemble(const_gcc), const_gcc_bytes)
+        self.assertEqual(cpu.assemble(CONST_GCC), CONST_GCC_BYTES)
 
         # Test exception
         with self.assertRaises(OSError):
@@ -222,6 +233,9 @@ def test_64bit_keystone(self):
     def test_32bit_nasm(self):
         """Test assembler for Intel 32-bit nasm
         """
+        if _is_windows:
+            return # Skip windows
+
         cpu = CPU('intel', 32)
         cpu.assembler = 'nasm'
 
@@ -238,10 +252,10 @@ def test_32bit_nasm(self):
         self.assertEqual(cpu.assemble('A: /* infinite call */ call A'), b'\xe8\xfb\xff\xff\xff')
 
         # Test long code
-        self.assertEqual(cpu.assemble(shellcode_32), shellcode_32_bytes)
+        self.assertEqual(cpu.assemble(SHELLCODE_32), SHELLCODE_32_BYTES)
 
         # Test constant
-        self.assertEqual(cpu.assemble(const_nasm), const_nasm_bytes)
+        self.assertEqual(cpu.assemble(CONST_NASM), CONST_NASM_BYTES)
 
         # Test exception
         with self.assertRaises(OSError):
@@ -252,6 +266,9 @@ def test_32bit_nasm(self):
     def test_64bit_nasm(self):
         """Test assembler for Intel 64-bit nasm
         """
+        if _is_windows:
+            return # Skip windows
+
         cpu = CPU('intel', 64)
         cpu.assembler = 'nasm'
 
@@ -269,7 +286,7 @@ def test_64bit_nasm(self):
         self.assertEqual(cpu.assemble('A: /* infinite call */ call A'), b'\xe8\xfb\xff\xff\xff')
 
         # Test constant
-        self.assertEqual(cpu.assemble(const_nasm), const_nasm_bytes)
+        self.assertEqual(cpu.assemble(CONST_NASM), CONST_NASM_BYTES)
 
         # Test exception
         with self.assertRaises(OSError):