pwntools 1.1.0 → 1.2.0

data/test/util/cyclic_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/util/fiddling_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -104,4 +105,11 @@ class FiddlingTest < MiniTest::Test
     assert_equal('test', b64d('dGVzdA=='))
     assert_equal("\xb2\x18\xa4" * 100, b64d('shik' * 100))
   end
+
+  def test_xor
+    assert_equal('happy', xor("\xE8\xE1\xF0\xF0\xF9", "\x80"))
+    assert_equal('happy', xor("\x80", "\xE8\xE1\xF0\xF0\xF9"))
+    assert_equal("\x04\x04\x04\x02\v\r\x11\x10\x11", xor('plaintext', 'thekey'))
+    assert_equal('2172172172', xor('217', "\x00" * 10))
+  end
 end

data/test/util/getdents_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/util/hexdump_test.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 # This test use UTF-8 encoding for strings since the output for hexdump contains lots of UTF-8 characters.
 
@@ -153,7 +154,7 @@ class HexDumpTest < MiniTest::Test
       assert_lines_equal(<<-'EOS', hexdump('abcdefghi', highlight: 'aeiou'))
 00000000  61! 62 63 64  65! 66 67 68  69!                        │a!bcd│e!fgh│i!│
 00000009
-        EOS
+      EOS
     ensure
       ::Pwnlib::Util::HexDump.const_set(:HIGHLIGHT_STYLE, orig_style)
       $VERBOSE = orig_verbose

data/test/util/lists_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/util/packing_test.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -116,8 +117,8 @@ class PackingTest < MiniTest::Test
   def test_up_rand
     srand(217)
     [8, 16, 32, 64].each do |sz|
-      u = ->(*x) { ::Pwnlib::Util::Packing.public_send("u#{sz}", *x) }
-      p = ->(*x) { ::Pwnlib::Util::Packing.public_send("p#{sz}", *x) }
+      u = ->(*x, **k) { ::Pwnlib::Util::Packing.public_send("u#{sz}", *x, **k) }
+      p = ->(*x, **k) { ::Pwnlib::Util::Packing.public_send("p#{sz}", *x, **k) }
       100.times do
         limit = (1 << sz)
         val = rand(0...limit)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwntools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - peter50216@gmail.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crabstone
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: dentaku
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
         version: 2.0.11
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,21 +45,27 @@ dependencies:
         version: 2.0.11
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: elftools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: keystone-engine
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +94,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: one_gadget
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +196,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0.63'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0.63'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +294,7 @@ files:
 - lib/pwnlib/memleak.rb
 - lib/pwnlib/pwn.rb
 - lib/pwnlib/reg_sort.rb
+- lib/pwnlib/runner.rb
 - lib/pwnlib/shellcraft/generators/amd64/common/common.rb
 - lib/pwnlib/shellcraft/generators/amd64/common/infloop.rb
 - lib/pwnlib/shellcraft/generators/amd64/common/memcpy.rb
@@ -285,10 +312,12 @@ files:
 - lib/pwnlib/shellcraft/generators/amd64/linux/ls.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/open.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/sh.rb
+- lib/pwnlib/shellcraft/generators/amd64/linux/sleep.rb
 - lib/pwnlib/shellcraft/generators/amd64/linux/syscall.rb
 - lib/pwnlib/shellcraft/generators/helper.rb
 - lib/pwnlib/shellcraft/generators/i386/common/common.rb
 - lib/pwnlib/shellcraft/generators/i386/common/infloop.rb
+- lib/pwnlib/shellcraft/generators/i386/common/memcpy.rb
 - lib/pwnlib/shellcraft/generators/i386/common/mov.rb
 - lib/pwnlib/shellcraft/generators/i386/common/nop.rb
 - lib/pwnlib/shellcraft/generators/i386/common/pushstr.rb
@@ -301,9 +330,11 @@ files:
 - lib/pwnlib/shellcraft/generators/i386/linux/ls.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/open.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/sh.rb
+- lib/pwnlib/shellcraft/generators/i386/linux/sleep.rb
 - lib/pwnlib/shellcraft/generators/i386/linux/syscall.rb
 - lib/pwnlib/shellcraft/generators/x86/common/common.rb
 - lib/pwnlib/shellcraft/generators/x86/common/infloop.rb
+- lib/pwnlib/shellcraft/generators/x86/common/memcpy.rb
 - lib/pwnlib/shellcraft/generators/x86/common/mov.rb
 - lib/pwnlib/shellcraft/generators/x86/common/pushstr.rb
 - lib/pwnlib/shellcraft/generators/x86/common/pushstr_array.rb
@@ -315,6 +346,7 @@ files:
 - lib/pwnlib/shellcraft/generators/x86/linux/ls.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/open.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/sh.rb
+- lib/pwnlib/shellcraft/generators/x86/linux/sleep.rb
 - lib/pwnlib/shellcraft/generators/x86/linux/syscall.rb
 - lib/pwnlib/shellcraft/registers.rb
 - lib/pwnlib/shellcraft/shellcraft.rb
@@ -324,6 +356,7 @@ files:
 - lib/pwnlib/tubes/serialtube.rb
 - lib/pwnlib/tubes/sock.rb
 - lib/pwnlib/tubes/tube.rb
+- lib/pwnlib/ui.rb
 - lib/pwnlib/util/cyclic.rb
 - lib/pwnlib/util/fiddling.rb
 - lib/pwnlib/util/getdents.rb
@@ -337,6 +370,17 @@ files:
 - test/constants/constant_test.rb
 - test/constants/constants_test.rb
 - test/context_test.rb
+- test/data/assembly/aarch64.s
+- test/data/assembly/amd64.s
+- test/data/assembly/arm.s
+- test/data/assembly/i386.s
+- test/data/assembly/mips.s
+- test/data/assembly/mips64.s
+- test/data/assembly/powerpc.s
+- test/data/assembly/powerpc64.s
+- test/data/assembly/sparc.s
+- test/data/assembly/sparc64.s
+- test/data/assembly/thumb.s
 - test/data/echo.rb
 - test/data/elfs/Makefile
 - test/data/elfs/amd64.frelro.elf
@@ -364,10 +408,12 @@ files:
 - test/logger_test.rb
 - test/memleak_test.rb
 - test/reg_sort_test.rb
+- test/runner_test.rb
 - test/shellcraft/infloop_test.rb
 - test/shellcraft/linux/cat_test.rb
 - test/shellcraft/linux/ls_test.rb
 - test/shellcraft/linux/sh_test.rb
+- test/shellcraft/linux/sleep_test.rb
 - test/shellcraft/linux/syscalls/execve_test.rb
 - test/shellcraft/linux/syscalls/exit_test.rb
 - test/shellcraft/linux/syscalls/open_test.rb
@@ -389,6 +435,7 @@ files:
 - test/tubes/serialtube_test.rb
 - test/tubes/sock_test.rb
 - test/tubes/tube_test.rb
+- test/ui_test.rb
 - test/util/cyclic_test.rb
 - test/util/fiddling_test.rb
 - test/util/getdents_test.rb
@@ -407,79 +454,92 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: pwntools
 test_files:
-- test/data/elfs/amd64.frelro.pie.elf
-- test/data/elfs/Makefile
+- test/full_file_test.rb
+- test/tubes/sock_test.rb
+- test/tubes/tube_test.rb
+- test/tubes/serialtube_test.rb
+- test/tubes/process_test.rb
+- test/tubes/buffer_test.rb
+- test/files/use_pwnlib.rb
+- test/files/use_pwn.rb
+- test/timer_test.rb
 - test/data/elfs/amd64.frelro.elf
-- test/data/elfs/i386.frelro.pie.elf
-- test/data/elfs/amd64.nrelro.elf
+- test/data/elfs/source.cpp
+- test/data/elfs/amd64.frelro.pie.elf
 - test/data/elfs/i386.prelro.elf
+- test/data/elfs/Makefile
 - test/data/elfs/amd64.static.elf
+- test/data/elfs/amd64.nrelro.elf
+- test/data/elfs/i386.frelro.pie.elf
 - test/data/elfs/amd64.prelro.elf
-- test/data/elfs/source.cpp
-- test/data/victim32
-- test/data/victim.c
-- test/data/victim64
+- test/data/flag
 - test/data/lib32/ld.so.2
 - test/data/lib32/libc.so.6
+- test/data/echo.rb
+- test/data/victim64
 - test/data/lib64/ld.so.2
 - test/data/lib64/libc.so.6
-- test/data/flag
-- test/data/echo.rb
-- test/asm_test.rb
-- test/test_helper.rb
+- test/data/assembly/powerpc64.s
+- test/data/assembly/arm.s
+- test/data/assembly/thumb.s
+- test/data/assembly/i386.s
+- test/data/assembly/amd64.s
+- test/data/assembly/mips.s
+- test/data/assembly/powerpc.s
+- test/data/assembly/sparc.s
+- test/data/assembly/mips64.s
+- test/data/assembly/aarch64.s
+- test/data/assembly/sparc64.s
+- test/data/victim.c
+- test/data/victim32
+- test/runner_test.rb
+- test/dynelf_test.rb
+- test/util/getdents_test.rb
+- test/util/packing_test.rb
+- test/util/fiddling_test.rb
+- test/util/hexdump_test.rb
+- test/util/lists_test.rb
+- test/util/cyclic_test.rb
+- test/ext_test.rb
+- test/abi_test.rb
+- test/logger_test.rb
+- test/memleak_test.rb
+- test/elf/elf_test.rb
+- test/ui_test.rb
 - test/context_test.rb
-- test/shellcraft/pushstr_array_test.rb
-- test/shellcraft/memcpy_test.rb
+- test/shellcraft/mov_test.rb
+- test/shellcraft/setregs_test.rb
 - test/shellcraft/registers_test.rb
-- test/shellcraft/ret_test.rb
 - test/shellcraft/popad_test.rb
-- test/shellcraft/nop_test.rb
-- test/shellcraft/linux/cat_test.rb
 - test/shellcraft/linux/ls_test.rb
-- test/shellcraft/linux/sh_test.rb
-- test/shellcraft/linux/syscalls/open_test.rb
 - test/shellcraft/linux/syscalls/syscall_test.rb
-- test/shellcraft/linux/syscalls/exit_test.rb
 - test/shellcraft/linux/syscalls/execve_test.rb
-- test/shellcraft/shellcraft_test.rb
+- test/shellcraft/linux/syscalls/open_test.rb
+- test/shellcraft/linux/syscalls/exit_test.rb
+- test/shellcraft/linux/sleep_test.rb
+- test/shellcraft/linux/cat_test.rb
+- test/shellcraft/linux/sh_test.rb
 - test/shellcraft/pushstr_test.rb
-- test/shellcraft/setregs_test.rb
+- test/shellcraft/shellcraft_test.rb
+- test/shellcraft/pushstr_array_test.rb
+- test/shellcraft/nop_test.rb
+- test/shellcraft/ret_test.rb
+- test/shellcraft/memcpy_test.rb
 - test/shellcraft/infloop_test.rb
-- test/shellcraft/mov_test.rb
 - test/constants/constants_test.rb
 - test/constants/constant_test.rb
 - test/reg_sort_test.rb
-- test/logger_test.rb
-- test/memleak_test.rb
-- test/util/fiddling_test.rb
-- test/util/hexdump_test.rb
-- test/util/getdents_test.rb
-- test/util/packing_test.rb
-- test/util/cyclic_test.rb
-- test/util/lists_test.rb
-- test/timer_test.rb
-- test/tubes/sock_test.rb
-- test/tubes/serialtube_test.rb
-- test/tubes/buffer_test.rb
-- test/tubes/process_test.rb
-- test/tubes/tube_test.rb
-- test/abi_test.rb
-- test/files/use_pwnlib.rb
-- test/files/use_pwn.rb
-- test/ext_test.rb
-- test/full_file_test.rb
-- test/dynelf_test.rb
-- test/elf/elf_test.rb
+- test/asm_test.rb
+- test/test_helper.rb