ronin-asm 0.1.0 → 0.2.0

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+before_install:
+  - sudo apt-get install yasm
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode
+  - 2.0.0
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode

data/ChangeLog.md

@@ -1,10 +1,36 @@
+### 0.2.0 / 2013-06-17
+
+* Require [Ruby] >= 1.9.1.
+* Added {Ronin::ASM::Syntax::ATT.emit_section} and
+  {Ronin::ASM::Syntax::Intel.emit_section}.
+* Added {Ronin::ASM::Syntax::ATT.emit_prologue} and
+  {Ronin::ASM::Syntax::Intel.emit_prologue}.
+* {Ronin::ASM::Instruction} now assumes Intel operand order:
+
+      mov eax, 0x41
+
+* {Ronin::ASM::Program#byte}, {Ronin::ASM::Program#word}, 
+  {Ronin::ASM::Program#dword} and {Ronin::ASM::Program#qword} methods can now
+  accept {Ronin::ASM::MemoryOperand}s.
+
+      mov bx, word(ebp+8)
+
+* {Ronin::ASM::Program#to_asm} now emits Intel syntax by default.
+* {Ronin::ASM::Program#assemble} now uses Intel syntax by default.
+* {Ronin::ASM::Syntax::ATT} emit `.code32` directive to forcibly enable 32-bit
+  mode for the x86 architecture. [YASM][yasm] apparently defaults to 16-bit
+  mode.
+* {Ronin::ASM::Syntax::Intel} emit `BITS 32` directive to forcibly enable
+  32-bit mode for the x86 architecture.
+
 ### 0.1.0 / 2012-08-26
 
- * Initial release:
-   * Provides a Ruby DSL for writing Assembly programs.
-     * Supports X86 and AMD64 instruction sets.
-     * Supports ATT and Intel syntax.
-   * Uses [yasm] to assemble the programs.
-   * Supports assembling Shellcode.
+* Initial release:
+  * Provides a Ruby DSL for writing Assembly programs.
+    * Supports X86 and AMD64 instruction sets.
+    * Supports ATT and Intel syntax.
+  * Uses [yasm] to assemble the programs.
+  * Supports assembling Shellcode.
 
+[Ruby]: http://www.ruby-lang.org
 [yasm]: http://yasm.tortall.net/

data/Gemfile

@@ -2,10 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'jruby-openssl',	'~> 0.7', :platforms => :jruby
+gem 'jruby-openssl',	'~> 0.7', platforms: :jruby
 
 group :development do
-  gem 'rake',         '~> 0.8'
+  gem 'rake',         '~> 10.0'
   gem 'kramdown',     '~> 0.12'
 
   gem 'ripl',              '~> 0.3'

data/README.md

@@ -1,4 +1,4 @@
-# Ronin Asm
+# Ronin ASM
 
 * [Source](https://github.com/ronin-ruby/ronin-asm)
 * [Issues](https://github.com/ronin-ruby/ronin-asm/issues)
@@ -6,6 +6,8 @@
 * [Mailing List](https://groups.google.com/group/ronin-ruby)
 * [irc.freenode.net #ronin](http://ronin-ruby.github.com/irc/)
 
+[![Build Status](https://secure.travis-ci.org/ronin-ruby/ronin-asm.png?branch=master)](https://travis-ci.org/ronin-ruby/ronin-asm)
+
 ## Description
 
 {Ronin::ASM} is a Ruby DSL for crafting Assmebly programs and Shellcode.
@@ -24,28 +26,32 @@ Create a program:
 
     asm = ASM.new do
       push ebx
-      mov  ebx, eax
+      mov  eax, 0xc0ffee
       pop  ebx
       hlt
     end
 
     puts asm.to_asm
+    # BITS 32
+    # section .text
     # _start:
-    #	pushl	%ebx
-    #	movl	%ebx,	%eax
-    #	popl	%ebx
+    #	push	ebx
+    #	mov	eax,	WORD 0xc0ffee
+    #	pop	ebx
     #	hlt
 
-    puts asm.to_asm(:intel)
+    puts asm.to_asm(:att)
+    # .code32
+    # .text
     # _start:
-    #	push	ebx
-    #	mov	eax,	ebx
-    #	pop	ebx
+    #	pushl	%ebx
+    #	movl	%ebx,	%eax
+    #	popl	%ebx
     #	hlt
 
 Create shellcode:
 
-    shellcode = ASM::Shellcode.new(:arch => :x86) do
+    shellcode = ASM::Shellcode.new(arch: :x86) do
       xor   eax,  eax
       push  eax
       push  0x68732f2f
@@ -55,19 +61,19 @@ Create shellcode:
       push  ebx
       mov   esp,  ecx
       xor   edx,  edx
-      mov   0xb,  al
+      mov   al,   0xb
       int   0x80
     end
     
     shellcode.assemble
-    # => "f1\xC0fPfh//shfh/binf\x89\xE3fPfSf\x89\xE1f1\xD2\xB0\v\xCD\x80"
+    # => "1\xC0Ph//shh/bin\x89\xDCPS\x89\xCC1\xD2\xB0\v\xCD\x80"
 
 ### Immediate Operands
 
 Immediate operands can be Integers or `nil`:
 
-    mov 0xff, eax
-    mov nil, ebx
+    mov eax, 0xff
+    mov ebx, nil
 
 The size of the operand can also be specified explicitly:
 
@@ -80,10 +86,10 @@ The size of the operand can also be specified explicitly:
 
 Memory operands can be expressed as arithmatic on registers:
 
-    mov eax+8, ebx
-    mov eax-8, ebx
-    mov eax+esi, ebx
-    mov eax+(esi*4), ebx
+    mov ebx, eax+8
+    mov ebx, eax-8
+    mov ebx, eax+esi
+    mov ebx, eax+(esi*4)
 
 ### Labels
 
@@ -100,15 +106,16 @@ Labels can be expressed with blocks:
 If the `:os` option is specified, then syscall numbers can be looked up via the 
 `syscalls` Hash:
 
-    ASM.new(:os => 'Linux') do
+    ASM.new(os: 'Linux') do
       # ...
-      mov syscalls[:execve], al
+      mov al, syscalls[:execve]
       int 0x80
     end
 
 ## Requirements
 
-* [data_paths] ~> 0.3
+* [Ruby] >= 1.9.1
+* [data\_paths] ~> 0.3
 * [yasm] >= 0.6.0
 * [ruby-yasm] ~> 0.2
 
@@ -120,7 +127,7 @@ If the `:os` option is specified, then syscall numbers can be looked up via the
 
 Ronin::ASM - A Ruby DSL for crafting Assmebly programs and Shellcode.
 
-Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 
 This file is part of Ronin ASM.
 
@@ -137,6 +144,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Ronin Asm.  If not, see <http://www.gnu.org/licenses/>.
 
+[Ruby]: http://www.ruby-lang.org
 [yasm]: http://yasm.tortall.net/
 [data_paths]: https://github.com/postmodern/data_paths#readme
 [ruby-yasm]: https://github.com/sophsec/ruby-yasm#readme

data/Rakefile

@@ -19,7 +19,7 @@ end
 require 'rake'
 
 require 'rubygems/tasks'
-Gem::Tasks.new(:sign => {:checksum => true, :pgp => true}) do |tasks|
+Gem::Tasks.new(sign: {checksum: true, pgp: true}) do |tasks|
   tasks.console.command = 'ripl'
   tasks.console.options = %w[
     -rripl/multi_line
@@ -31,11 +31,12 @@ end
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 task :default => :spec
+task :test    => :spec
 
 namespace :spec do
-  RSpec::Core::RakeTask.new(:yasm) do |t|
-    t.pattern    = 'spec/program_spec.rb spec/shellcode_spec.rb'
-    t.rspec_opts = '--tag yasm'
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern    = %w[spec/program_spec.rb spec/shellcode_spec.rb]
+    t.rspec_opts = '--tag integration'
   end
 end
 

data/gemspec.yml

@@ -10,6 +10,7 @@ homepage: https://github.com/ronin-ruby/ronin-asm#readme
 has_yard: true
 
 requirements: yasm >= 0.6.0
+required_ruby_version: ">= 1.9.1"
 
 dependencies:
   data_paths: ~> 0.3

data/lib/ronin/asm.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/archs.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #

data/lib/ronin/asm/archs/amd64.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -35,58 +35,58 @@ module Ronin
 
         # AMD64 registers
         REGISTERS = X86::REGISTERS.merge(
-          :rax => Register.new(:rax, 8, true),
-          :rbx => Register.new(:rbx, 8, true),
-          :rcx => Register.new(:rcx, 8, true),
-          :rdx => Register.new(:rdx, 8, true),
-
-          :rsi => Register.new(:rsi, 8, true),
-          :rdi => Register.new(:rdi, 8, true),
-
-          :rsp => Register.new(:rsp, 8, true),
-          :rbp => Register.new(:rbp, 8, true),
-
-          :r8b => Register.new(:r8b, 1, true),
-          :r8w => Register.new(:r8w, 2, true),
-          :r8d => Register.new(:r8d, 4, true),
-          :r8  => Register.new(:r8, 8, true),
-
-          :r9b => Register.new(:r9b, 1, true),
-          :r9w => Register.new(:r9w, 2, true),
-          :r9d => Register.new(:r9d, 4, true),
-          :r9  => Register.new(:r9, 8, true),
-
-          :r10b => Register.new(:r10b, 1, true),
-          :r10w => Register.new(:r10w, 2, true),
-          :r10d => Register.new(:r10d, 4, true),
-          :r10  => Register.new(:r10, 8, true),
-
-          :r11b => Register.new(:r11b, 1, true),
-          :r11w => Register.new(:r11w, 2, true),
-          :r11d => Register.new(:r11d, 4, true),
-          :r11  => Register.new(:r11, 8, true),
-
-          :r12b => Register.new(:r12b, 1, true),
-          :r12w => Register.new(:r12w, 2, true),
-          :r12d => Register.new(:r12d, 4, true),
-          :r12  => Register.new(:r12, 8, true),
-
-          :r13b => Register.new(:r13b, 1, true),
-          :r13w => Register.new(:r13w, 2, true),
-          :r13d => Register.new(:r13d, 4, true),
-          :r13  => Register.new(:r13, 8, true),
-
-          :r14b => Register.new(:r14b, 1, true),
-          :r14w => Register.new(:r14w, 2, true),
-          :r14d => Register.new(:r14d, 4, true),
-          :r14  => Register.new(:r14, 8, true),
-
-          :r15b => Register.new(:r15b, 1, true),
-          :r15w => Register.new(:r15w, 2, true),
-          :r15d => Register.new(:r15d, 4, true),
-          :r15  => Register.new(:r15, 8, true),
-
-          :rip => Register.new(:rip, 8, true)
+          rax: Register.new(:rax, 8, true),
+          rbx: Register.new(:rbx, 8, true),
+          rcx: Register.new(:rcx, 8, true),
+          rdx: Register.new(:rdx, 8, true),
+
+          rsi: Register.new(:rsi, 8, true),
+          rdi: Register.new(:rdi, 8, true),
+
+          rsp: Register.new(:rsp, 8, true),
+          rbp: Register.new(:rbp, 8, true),
+
+          r8b: Register.new(:r8b, 1, true),
+          r8w: Register.new(:r8w, 2, true),
+          r8d: Register.new(:r8d, 4, true),
+          r8:  Register.new(:r8, 8, true),
+
+          r9b: Register.new(:r9b, 1, true),
+          r9w: Register.new(:r9w, 2, true),
+          r9d: Register.new(:r9d, 4, true),
+          r9:  Register.new(:r9, 8, true),
+
+          r10b: Register.new(:r10b, 1, true),
+          r10w: Register.new(:r10w, 2, true),
+          r10d: Register.new(:r10d, 4, true),
+          r10:  Register.new(:r10, 8, true),
+
+          r11b: Register.new(:r11b, 1, true),
+          r11w: Register.new(:r11w, 2, true),
+          r11d: Register.new(:r11d, 4, true),
+          r11:  Register.new(:r11, 8, true),
+
+          r12b: Register.new(:r12b, 1, true),
+          r12w: Register.new(:r12w, 2, true),
+          r12d: Register.new(:r12d, 4, true),
+          r12:  Register.new(:r12, 8, true),
+
+          r13b: Register.new(:r13b, 1, true),
+          r13w: Register.new(:r13w, 2, true),
+          r13d: Register.new(:r13d, 4, true),
+          r13:  Register.new(:r13, 8, true),
+
+          r14b: Register.new(:r14b, 1, true),
+          r14w: Register.new(:r14w, 2, true),
+          r14d: Register.new(:r14d, 4, true),
+          r14:  Register.new(:r14, 8, true),
+
+          r15b: Register.new(:r15b, 1, true),
+          r15w: Register.new(:r15w, 2, true),
+          r15d: Register.new(:r15d, 4, true),
+          r15:  Register.new(:r15, 8, true),
+
+          rip: Register.new(:rip, 8, true)
         )
 
         #

data/lib/ronin/asm/archs/x86.rb

@@ -1,7 +1,7 @@
 #
 # Ronin ASM - A Ruby DSL for crafting Assembly programs and Shellcode.
 #
-# Copyright (c) 2007-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2007-2013 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
 # This file is part of Ronin ASM.
 #
@@ -33,49 +33,49 @@ module Ronin
 
         # X86 registers
         REGISTERS = {
-          :al  => Register.new(:al, 1),
-          :ah  => Register.new(:ah, 1),
-          :ax  => Register.new(:ax, 2),
-          :eax => Register.new(:eax, 4, true),
-
-          :bl  => Register.new(:bl, 1),
-          :bh  => Register.new(:bh, 1),
-          :bx  => Register.new(:bx, 2),
-          :ebx => Register.new(:ebx, 4, true),
-
-          :cl  => Register.new(:cl, 1),
-          :ch  => Register.new(:ch, 1),
-          :cx  => Register.new(:cx, 2),
-          :ecx => Register.new(:ecx, 4, true),
-
-          :dl  => Register.new(:dl, 1),
-          :dh  => Register.new(:dh, 1),
-          :dx  => Register.new(:dx, 2),
-          :edx => Register.new(:edx, 4, true),
-
-          :bp  => Register.new(:bp, 2),
-          :ebp => Register.new(:ebp, 4),
-
-          :sp  => Register.new(:sp, 2),
-          :esp => Register.new(:esp, 4),
-
-          :ip  => Register.new(:ip, 2),
-          :eip => Register.new(:eip, 4),
-
-          :sil => Register.new(:sil, 1),
-          :si  => Register.new(:si, 2),
-          :esi => Register.new(:esi, 4, true),
-
-          :dil => Register.new(:dil, 1),
-          :di  => Register.new(:di, 2),
-          :edi => Register.new(:edi, 4, true),
-
-          :cs => Register.new(:cs, 2),
-          :ds => Register.new(:ds, 2),
-          :es => Register.new(:es, 2),
-          :fs => Register.new(:fs, 2),
-          :gs => Register.new(:gs, 2),
-          :ss => Register.new(:ss, 2)
+          al:  Register.new(:al, 1),
+          ah:  Register.new(:ah, 1),
+          ax:  Register.new(:ax, 2),
+          eax: Register.new(:eax, 4, true),
+
+          bl:  Register.new(:bl, 1),
+          bh:  Register.new(:bh, 1),
+          bx:  Register.new(:bx, 2),
+          ebx: Register.new(:ebx, 4, true),
+
+          cl:  Register.new(:cl, 1),
+          ch:  Register.new(:ch, 1),
+          cx:  Register.new(:cx, 2),
+          ecx: Register.new(:ecx, 4, true),
+
+          dl:  Register.new(:dl, 1),
+          dh:  Register.new(:dh, 1),
+          dx:  Register.new(:dx, 2),
+          edx: Register.new(:edx, 4, true),
+
+          bp:  Register.new(:bp, 2),
+          ebp: Register.new(:ebp, 4),
+
+          sp:  Register.new(:sp, 2),
+          esp: Register.new(:esp, 4),
+
+          ip:  Register.new(:ip, 2),
+          eip: Register.new(:eip, 4),
+
+          sil: Register.new(:sil, 1),
+          si:  Register.new(:si, 2),
+          esi: Register.new(:esi, 4, true),
+
+          dil: Register.new(:dil, 1),
+          di:  Register.new(:di, 2),
+          edi: Register.new(:edi, 4, true),
+
+          cs: Register.new(:cs, 2),
+          ds: Register.new(:ds, 2),
+          es: Register.new(:es, 2),
+          fs: Register.new(:fs, 2),
+          gs: Register.new(:gs, 2),
+          ss: Register.new(:ss, 2)
         }
 
         #
@@ -131,13 +131,13 @@ module Ronin
         #
         # Generates the instruction to set a register.
         # 
-        # @param [ImmediateOperand, MemoryOperate, Register, Integer, Symbol] value
-        #   The value to set.
-        #
         # @param [Symbol] name
         #   The name of the register.
         #
-        def register_set(value,name)
+        # @param [ImmediateOperand, MemoryOperate, Register, Integer, Symbol] value
+        #   The value to set.
+        #
+        def register_set(name,value)
           instruction(:mov,value,register(name))
         end