pwn 0.5.34 → 0.5.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f879ebdd5ad454c5a57dab480906a255c1a1c9551c33895b346417f26b320784
-  data.tar.gz: e78218a0680ed4982aad8a13e5368bfac5fc5b04b548a1bd2410389ce2945c0a
+  metadata.gz: 8f41a4c6cbab245a2f57337769fd1ea372c76c23e4a6201f5537ebe7b0490d11
+  data.tar.gz: 331cdf2b24514db9a043d86d0694973320fbcebed6b2921e25287ca196c3d9b6
 SHA512:
-  metadata.gz: d94948a701a5716491c3c058168c34ffd16038e07c048a4284f4471c47a00b8a79122c4562e47a068ff249c24fbcd4575bc8df7b81518c589c9648ca2f8d6c03
-  data.tar.gz: 1b9d36a3f3ee1f4a54a7cb7cce7a40ecbd47eff55593dd38f479604d7ed21c8bc8a17e4fcdd4db1f252b87052d985eac468d31420a14b51df0eb6fae47c7e191
+  metadata.gz: 7c3c16d7e8e78092772c587dcb25203d33fc56d055f436e11683c255281ff7c26073d1abf1dde98cb4a89c8f9ca244431d0cf7d740af90e05b2324de274b9b2c
+  data.tar.gz: 8150d8a01bd4c416a34910e1d52c431362232e1b1f1f22252e60ffbece533ad8809f9e8a4b2b93e607a7ae9c54dd031ab01b38057480c7da3daf07d84062b56b

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.34]:001 >>> PWN.help
+pwn[v0.5.35]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.3.0@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.34]:001 >>> PWN.help
+pwn[v0.5.35]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.3.0@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.34]:001 >>> PWN.help
+pwn[v0.5.35]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/lib/pwn/plugins/assembly.rb

@@ -33,15 +33,20 @@ module PWN
           raise "Unsupported architecture: #{arch}"
         end
 
-        #  TOOD: Fix this
-        # If opcodes appear to be '"90", "90", "90"' then convert to "\x90\x90\x90"
-        # opcodes = opcodes.split(',').map { |x| format('\x%02x', x.gsub('"', '').to_i(16)) }.join if opcodes.include?('"') && opcodes.include?(',')
-
-        # If opcodes appear to be '90 90 90' then convert to "\x90\x90\x90"
-        # opcodes = opcodes.split.map { |x| format('\x%02x', x.to_i(16)) }.join if opcodes.include?(' ')
-
-        # If opcodes appear to be '909090' then convert to "\x90\x90\x90"
-        # opcodes = opcodes.chars.each_slice(2).map(&:join).map { |x| format('\x%02x', x.to_i(16)) }.join if opcodes.length.even?
+        # TOOD: Still needs a fix if opcodes is passed in as:
+        # '\x90\x90\x90' (not to be confused w/ "\x90\x90\x90")
+        # '909090'
+        opcodes_orig_len = opcodes.length
+        opcodes = opcodes.map { |code| [code].pack('H*') }.join if opcodes.is_a?(Array)
+        opcodes.delete!('\x') if opcodes.include?('\x')
+        opcodes.delete!('"') if opcodes.include?('"')
+        opcodes.delete!("'") if opcodes.include?("'")
+        opcodes.delete!(',') if opcodes.include?(',')
+        opcodes.delete!("\s") if opcodes.include?("\s")
+
+        # puts opcodes.inspect
+        opcodes = [opcodes].pack('H*') if opcodes.length.even? && opcodes.length != opcodes_orig_len
+        # puts opcodes.inspect
 
         Metasm::Shellcode.disassemble(arch_obj, opcodes).to_s
       rescue StandardError => e

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.34'
+  VERSION = '0.5.35'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.34
+  version: 0.5.35
 platform: ruby
 authors:
 - 0day Inc.