librex 0.0.65 → 0.0.66

data/lib/rex/encoder/alpha2/unicode_mixed.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoder/alpha2/generic'
 
@@ -7,12 +8,6 @@ module Encoder
 module Alpha2
 
 class UnicodeMixed < Generic
-
-	def self.gen_base_set(max)
-		Rex::Text.shuffle_a(
-			[* ( (0..(max-1)).map { |i| i *= 0x10 } ) ]
-		)
-	end
 	
 	def self.gen_second(block, base)
 		# unicode uses additive encoding
@@ -20,8 +15,8 @@ class UnicodeMixed < Generic
 	end
 	
 	def self.gen_decoder_prefix(reg, offset)
-		if (offset > 28)
-			 raise "Critical: Offset is greater than 28"
+		if (offset > 21)
+			 raise "Critical: Offset is greater than 21"
 		end
 
 		# offset untested for unicode :(
@@ -114,4 +109,4 @@ class UnicodeMixed < Generic
 		return decoder
 	end
 
-end end end end
+end end end end

data/lib/rex/encoder/alpha2/unicode_upper.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoder/alpha2/generic'
 
@@ -8,12 +9,6 @@ module Alpha2
 
 class UnicodeUpper < Generic
 	def self.default_accepted_chars ; ('B' .. 'Z').to_a + ('0' .. '9').to_a ; end
-
-	def self.gen_base_set(max)
-		Rex::Text.shuffle_a(
-			[* ( (0..(max-1)).map { |i| i *= 0x10 } ) ]
-		)
-	end
 	
 	def self.gen_second(block, base)
 		# unicode uses additive encoding
@@ -21,8 +16,8 @@ class UnicodeUpper < Generic
 	end
 
 	def self.gen_decoder_prefix(reg, offset)
-		if (offset > 8)
-			raise "Critical: Offset is greater than 8"
+		if (offset > 6)
+			raise "Critical: Offset is greater than 6"
 		end
 
 		# offset untested for unicode :(
@@ -126,4 +121,4 @@ class UnicodeUpper < Generic
 		return decoder
 	end
 
-end end end end
+end end end end

data/lib/rex/encoder/ndr.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require "rex/text"
 
 module Rex

data/lib/rex/encoder/ndr.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -41,4 +42,4 @@ class Rex::Encoder::NDR::UnitTest < Test::Unit::TestCase
         assert_equal(16, Klass.wstring_prebuilt('aa' + "\x00\x00").length, 'wstring_prebuilt length')
     end
 
-end
+end

data/lib/rex/encoder/nonalpha.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/text'
 

data/lib/rex/encoder/nonupper.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/text'
 

data/lib/rex/encoder/xdr.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Encoder
 
@@ -8,22 +9,22 @@ module Encoder
 ###
 module XDR
 	MAX_ARG = 0xffffffff
-	
+
 	# Also: unsigned int, bool, enum
 	def XDR.encode_int(int)
 		return [int].pack('N')
 	end
-	
+
 	def XDR.decode_int!(data)
 		  return data.slice!(0..3).unpack('N')[0] if data
       data = 0
 	end
-	
+
 	def XDR.encode_lchar(char)
 		char |= 0xffffff00 if char & 0x80 != 0
 		return encode_int(char)
 	end
-	
+
 	def XDR.decode_lchar!(data)
 		return (decode_int!(data) & 0xff).chr
 	end
@@ -53,11 +54,11 @@ module XDR
 		1.upto(decode_int!(data)) { buf.push(yield(data)) }
 		return buf
 	end
-	
+
 	# encode(0, [0, 1], "foo", ["bar", 4]) does:
-	#   encode_int(0) + 
+	#   encode_int(0) +
 	#   encode_varray([0, 1]) { |i| XDR.encode_int(i) } +
-	#   encode_string("foo") + 
+	#   encode_string("foo") +
 	#   encode_string("bar", 4)
 	def XDR.encode(*data)
 		data.collect do |var|
@@ -103,4 +104,4 @@ module XDR
 end
 
 end
-end
+end

data/lib/rex/encoder/xdr.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -26,4 +27,4 @@ class Rex::Encoder::XDR::UnitTest < Test::Unit::TestCase
 		assert_equal([1,2,3], Rex::Encoder::XDR.decode_varray!("\000\000\000\003\000\000\000\001\000\000\000\002\000\000\000\003") { |i| Rex::Encoder::XDR.decode_int!(i) } , 'decode_varray!')
 		assert_equal(1234, Rex::Encoder::XDR.decode_lchar!("\377\377\377\322"), 'decode_lchar!')
 	end
-end
+end

data/lib/rex/encoder/xor.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Encoder

data/lib/rex/encoder/xor/dword.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoder/xor'
 require 'rex/encoding/xor/dword'
@@ -10,4 +11,4 @@ require 'rex/encoding/xor/dword'
 ###
 class Rex::Encoder::Xor::Dword < Rex::Encoder::Xor
 	EncoderKlass = Rex::Encoding::Xor::Dword
-end
+end

data/lib/rex/encoder/xor/dword_additive.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoder/xor'
 require 'rex/encoding/xor/dword_additive'
@@ -10,4 +11,4 @@ require 'rex/encoding/xor/dword_additive'
 ###
 class Rex::Encoder::Xor::DwordAdditive < Rex::Encoder::Xor
 	EncoderKlass = Rex::Encoding::Xor::DwordAdditive
-end
+end

data/lib/rex/encoders/xor_dword.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/arch/x86'
 require 'rex/encoder/xor/dword'

data/lib/rex/encoders/xor_dword_additive.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoder/xor/dword_additive'
 
@@ -50,4 +51,4 @@ class XorDwordAdditive < Rex::Encoder::Xor::DwordAdditive
 	include Backend
 end
 
-end end
+end end

data/lib/rex/encoders/xor_dword_additive.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..', 'dev', 'machinetest'))
@@ -9,4 +10,4 @@ require 'rex/encoders/xor_dword.rb.ut'
 
 class Rex::Encoders::XorDwordAdditive::UnitTest < Rex::Encoders::XorDword::UnitTest
 	Klass = Rex::Encoders::XorDwordAdditive
-end
+end

data/lib/rex/encoding/xor.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 #
 # make sure the namespace is created
@@ -17,4 +18,4 @@ require 'rex/encoding/xor/generic'
 require 'rex/encoding/xor/byte'
 require 'rex/encoding/xor/word'
 require 'rex/encoding/xor/dword'
-require 'rex/encoding/xor/qword'
+require 'rex/encoding/xor/qword'

data/lib/rex/encoding/xor.rb.ts.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -11,4 +12,4 @@ require 'rex/encoding/xor/generic.rb.ut'
 require 'rex/encoding/xor/byte.rb.ut'
 require 'rex/encoding/xor/word.rb.ut'
 require 'rex/encoding/xor/dword.rb.ut'
-require 'rex/encoding/xor/dword_additive.rb.ut'
+require 'rex/encoding/xor/dword_additive.rb.ut'

data/lib/rex/encoding/xor/byte.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/generic'
 
@@ -12,4 +13,4 @@ class Byte < Generic
 		1
 	end
 
-end end end end # Byte/Xor/Encoding/Rex
+end end end end # Byte/Xor/Encoding/Rex

data/lib/rex/encoding/xor/byte.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -18,4 +19,4 @@ class Byte::UnitTest < Generic::UnitTest
 		Byte
 	end
 end
-end
+end

data/lib/rex/encoding/xor/dword.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/generic'
 
@@ -18,4 +19,4 @@ class Dword < Generic
 		4
 	end
 
-end end end end # Dword/Xor/Encoding/Rex
+end end end end # Dword/Xor/Encoding/Rex

data/lib/rex/encoding/xor/dword.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -12,4 +13,4 @@ class Dword::UnitTest < Byte::UnitTest
 		Dword
 	end
 end
-end
+end

data/lib/rex/encoding/xor/dword_additive.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/exceptions'
 require 'rex/encoding/xor/generic'

data/lib/rex/encoding/xor/dword_additive.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -12,4 +13,4 @@ class DwordAdditive::UnitTest < Byte::UnitTest
 		DwordAdditive
 	end
 end
-end
+end

data/lib/rex/encoding/xor/exceptions.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 module Encoding

data/lib/rex/encoding/xor/generic.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/exceptions'
 require 'rex/text'

data/lib/rex/encoding/xor/generic.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -117,4 +118,4 @@ class Generic::UnitTest < ::Test::Unit::TestCase
 		]
 	end
 end
-end
+end

data/lib/rex/encoding/xor/qword.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/generic'
 
@@ -12,4 +13,4 @@ class Qword < Generic
 		8
 	end
 
-end end end end
+end end end end

data/lib/rex/encoding/xor/word.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/encoding/xor/generic'
 
@@ -18,4 +19,4 @@ class Word < Generic
 		2
 	end
 
-end end end end # Word/Xor/Encoding/Rex
+end end end end # Word/Xor/Encoding/Rex

data/lib/rex/encoding/xor/word.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -10,4 +11,4 @@ class Rex::Encoding::Xor::Word::UnitTest < Rex::Encoding::Xor::Byte::UnitTest
 	def enc
 		Rex::Encoding::Xor::Word
 	end
-end
+end

data/lib/rex/exceptions.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 module Rex
 

data/lib/rex/exceptions.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..'))
 
@@ -41,4 +42,4 @@ class UnitTest < Test::Unit::TestCase
 end
 
 end
-end
+end

data/lib/rex/exploitation/cmdstager.rb

@@ -1,5 +1,6 @@
+# -*- coding: binary -*-
 ##
-# $Id: cmdstager.rb 9375 2010-05-26 22:39:56Z jduck $
+# $Id: cmdstager.rb 15548 2012-06-29 06:08:20Z rapid7 $
 ##
 
 require 'rex/exploitation/cmdstager/base'

data/lib/rex/exploitation/cmdstager/base.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/text'
 require 'rex/arch'
 require 'msf/core/framework'

data/lib/rex/exploitation/cmdstager/debug_asm.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 ##
 # $Id: debug_asm.rb 12595 2011-05-12 18:33:49Z jduck $
 ##
@@ -12,7 +13,7 @@ module Exploitation
 ###
 #
 # This class provides the ability to create a sequence of commands from an executable.
-# When this sequence is ran via command injection or a shell, the resulting exe will 
+# When this sequence is ran via command injection or a shell, the resulting exe will
 # be written to disk and executed.
 #
 # This particular version uses debug.exe to assemble a small COM file. The COM will

data/lib/rex/exploitation/cmdstager/debug_write.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 ##
 # $Id: debug_write.rb 12595 2011-05-12 18:33:49Z jduck $
 ##
@@ -12,7 +13,7 @@ module Exploitation
 ###
 #
 # This class provides the ability to create a sequence of commands from an executable.
-# When this sequence is ran via command injection or a shell, the resulting exe will 
+# When this sequence is ran via command injection or a shell, the resulting exe will
 # be written to disk and executed.
 #
 # This particular version uses debug.exe to write a small .NET binary. That binary will