style compliance fixes

git-svn-id: file:///home/svn/framework3/trunk@9460 4d416f70-5f16-0410-b530-b9f4589650da

modules/encoders/x86/context_cpuid.rb

@@ -1,3 +1,7 @@
+##
+# $Id$
+##
+
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -89,6 +93,7 @@ protected
 			"\x75\xe6" +     # jne cpuid_loop
 			"\x89\xf0"       # mov %esi,%eax
 	end
+
 	#
 	# Returns the set of FPU instructions that can be used for the FPU block of
 	# the decoder stub.
@@ -130,8 +135,7 @@ protected
 		# FPU blocks
 		fpu = Rex::Poly::LogicalBlock.new('fpu',
 			*fpu_instructions)
-		fnstenv = Rex::Poly::LogicalBlock.new('fnstenv',
+		fnstenv = Rex::Poly::LogicalBlock.new('fnstenv', "\xd9\x74\x24\xf4")
-			"\xd9\x74\x24\xf4")
 
 		# Get EIP off the stack
 		popeip = Rex::Poly::LogicalBlock.new('popeip',

modules/encoders/x86/context_stat.rb

@@ -1,3 +1,7 @@
+##
+# $Id$
+##
+
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -94,6 +98,7 @@ protected
 			"\x8b\x41\x2c" +        # mov 0x2c(%ecx),%eax
 			"\x33\x41\x48"          # xor 0x48(%ecx),%eax
 	end
+
 	#
 	# Returns the set of FPU instructions that can be used for the FPU block of
 	# the decoder stub.
@@ -133,10 +138,8 @@ protected
 		endb = Rex::Poly::SymbolicBlock::End.new
 
 		# FPU blocks
-		fpu = Rex::Poly::LogicalBlock.new('fpu',
+		fpu = Rex::Poly::LogicalBlock.new('fpu', *fpu_instructions)
-			*fpu_instructions)
+		fnstenv = Rex::Poly::LogicalBlock.new('fnstenv', "\xd9\x74\x24\xf4")
-		fnstenv = Rex::Poly::LogicalBlock.new('fnstenv',
-			"\xd9\x74\x24\xf4")
 
 		# Get EIP off the stack
 		popeip = Rex::Poly::LogicalBlock.new('popeip',

modules/encoders/x86/context_time.rb

@@ -1,3 +1,7 @@
+##
+# $Id$
+##
+
 ##
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
@@ -18,7 +22,7 @@ class Metasploit3 < Msf::Encoder::XorAdditiveFeedback
 	def initialize
 		super(
 			'Name'             => 'time(2)-based Context Keyed Payload Encoder',
-			'Version'          => '$Revision: 1$',
+			'Version'          => '$Revision$',
 			'Description'      => %q{
 				This is a Context-Keyed Payload Encoder based on time(2)
 				and Shikata Ga Nai.
@@ -79,6 +83,7 @@ protected
 			"\xcd\x80" +      # int $0x80
 			"\x66\x31\xc0"    # xor %ax,%ax
 	end
+
 	#
 	# Returns the set of FPU instructions that can be used for the FPU block of
 	# the decoder stub.
@@ -118,10 +123,8 @@ protected
 		endb = Rex::Poly::SymbolicBlock::End.new
 
 		# FPU blocks
-		fpu = Rex::Poly::LogicalBlock.new('fpu',
+		fpu = Rex::Poly::LogicalBlock.new('fpu', *fpu_instructions)
-			*fpu_instructions)
+		fnstenv = Rex::Poly::LogicalBlock.new('fnstenv', "\xd9\x74\x24\xf4")
-		fnstenv = Rex::Poly::LogicalBlock.new('fnstenv',
-			"\xd9\x74\x24\xf4")
 
 		# Get EIP off the stack
 		popeip = Rex::Poly::LogicalBlock.new('popeip',

plugins/editor.rb

@@ -1,3 +1,8 @@
+#
+# $Id$
+# $Revision$
+#
+
 module Msf
 
 ###

plugins/wmap.rb

@@ -2,6 +2,9 @@
 # Web assessment for the metasploit framework
 # Efrain Torres    - et[ ] metasploit.com  2010
 #
+# $Id$
+# $Revision$
+#
 
 require 'rabal/tree'
 require 'rexml/document'