Merge pull request #516 from ninp0/master

PWN::Plugins::Assembly module - more #bugfixes

Author: ninp0

README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.21]:001 >>> PWN.help
+pwn[v0.5.22]: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.21]:001 >>> PWN.help
+pwn[v0.5.22]: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.21]:001 >>> PWN.help
+pwn[v0.5.22]: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:

lib/pwn/plugins/assembly.rb

@@ -8,15 +8,17 @@ module Plugins
     module Assembly
       # Supported Method Parameters::
       # PWN::Plugins::Assembly.opcodes_to_asm(
-      #   opcodes: 'required - hex escaped opcode(s) (e.g. "\x90\x90\x90")'
+      #   opcodes: 'required - hex escaped opcode(s) (e.g. "\x90\x90\x90")',
+      #   arch: 'optional - objdump -i architecture (defaults to i386)'
       # )
 
       public_class_method def self.opcodes_to_asm(opts = {})
         opcodes = opts[:opcodes]
+        arch = opts[:arch] || 'i386'
 
         opcodes_tmp = Tempfile.new('pwn_opcodes')
         File.binwrite(opcodes_tmp.path, opcodes)
-        `objdump -D #{opcodes_tmp.path}`
+        `objdump --disassemble-all --target binary --architecture #{arch} #{opcodes_tmp.path}`
       rescue StandardError => e
         raise e
       ensure
@@ -39,7 +41,7 @@ module Assembly
 
         asm_tmp_o = "#{asm_tmp.path}.o"
         system('as', '-o', asm_tmp_o, asm_tmp.path)
-        `objdump -D #{asm_tmp.path}.o`
+        `objdump --disassemble-all #{asm_tmp.path}.o`
       rescue StandardError => e
         raise e
       ensure
@@ -60,7 +62,8 @@ module Assembly
       public_class_method def self.help
         puts "USAGE:
           #{self}.opcodes_to_asm(
-            opcodes: 'required - hex escaped opcode(s) (e.g. \"\\x90\\x90\\x90\")'
+            opcodes: 'required - hex escaped opcode(s) (e.g. \"\\x90\\x90\\x90\")',
+            arch: 'optional - objdump -i architecture (defaults to i386)'
           )
 
           #{self}.asm_to_opcodes(

lib/pwn/version.rb

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