Merge remote-tracking branch 'upstream/master'

modules/auxiliary/dos/scada/igss9_dataserver.rb

@@ -16,7 +16,7 @@ class Metasploit3 < Msf::Auxiliary
 		super(update_info(info,
 			'Name'           => '7-Technologies IGSS 9 IGSSdataServer.exe DoS',
 			'Description'    => %q{
-				The 7-Technologies SCADA IGSS Data Server (IGSSdataServer.exe) <= 9.0.0.10306 can be 
+				The 7-Technologies SCADA IGSS Data Server (IGSSdataServer.exe) <= 9.0.0.10306 can be
 				brought down by sending a crafted TCP packet to port 12401.  This should also work
 				for version <= 9.0.0.1120, but that version hasn't been tested.
 			},

modules/auxiliary/gather/corpwatch_lookup_name.rb

@@ -63,7 +63,7 @@ class Metasploit3 < Msf::Auxiliary
 		{
 			'uri'      => uri,
 			'method'   => 'GET',
-			'vars_get' => 
+			'vars_get' =>
 			{
 				'company_name' => datastore['COMPANY_NAME'],
 				'limit'        => datastore['LIMIT'],
@@ -132,8 +132,8 @@ class Metasploit3 < Msf::Auxiliary
 	end
 
 	def grab_text(e, name)
-		(e.get_elements(name) && e.get_elements(name)[0] && 
-		e.get_elements(name)[0].get_text ) ? 
+		(e.get_elements(name) && e.get_elements(name)[0] &&
+		e.get_elements(name)[0].get_text ) ?
 		e.get_elements(name)[0].get_text.to_s  : ""
 	end
 

modules/auxiliary/scanner/http/httpbl_lookup.rb

@@ -44,7 +44,7 @@ class Metasploit3 < Msf::Auxiliary
 	def support_ipv6?
 		false
 	end
-	
+
 	def resolve(ip)
 		results = ''
 		apikey = datastore['HTTPBL_APIKEY']

modules/auxiliary/scanner/vmware/vmauthd_login.rb

@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Auxiliary
 			'Version'     => '$Revision$',
 			'Description' => %q{
 				This module will test vmauthd logins on a range of machines and
-				report successful logins. 
+				report successful logins.
 			},
 			'Author'      => ['TheLightCosine <thelightcosine[at]metasploit.com>'],
 			'References'     =>

modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb

@@ -78,7 +78,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 
 		cmd = "C:\\windows\\system32\\attrib.exe -r " +
-		      "C:\\windows\\system32\\wbem\\mof\\good\\" + @var_mof_name + ".mof"
+					"C:\\windows\\system32\\wbem\\mof\\good\\" + @var_mof_name + ".mof"
 
 		client.sys.process.execute(cmd, nil, {'Hidden' => true })
 

modules/exploits/windows/fileformat/adobe_reader_u3d.rb

@@ -321,7 +321,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		return xml
 	end
 
-   def u3d_pad(str, char="\x00")
+	def u3d_pad(str, char="\x00")
 		len = str.length % 4
 		if (len > 0)
 			#puts "Adding %d pad bytes" % (4 - len)
@@ -385,7 +385,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			3,          # Bone Index (no Quantized Weight)
 			# 2
 			0x55550000, # Bone Weight Count
-			0x4c1df36e, # Bone Index 
+			0x4c1df36e, # Bone Index
 			0x0200d002, # Quantized Weight
 			# 3
 			0x95000074, # Bone Weight Count
@@ -397,7 +397,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		#bone_weight = [0xffffff44,bone_weight_data.length,0].pack('VVV')
 		bone_weight << bone_weight_data
 
-		new_objtype1_data = 
+		new_objtype1_data =
 			"\x05\x00\x52\x52\x52\x52\x52\x01\x00\x00\x00\xa6\x04\xa8\x96\xb9\x3f\xc5\x43\xb2\xdf\x2a"+
 			"\x31\xb5\x56\x93\x40\x00\x01\x00\x00\x00\x00\x00\x00\x05\x00\x52\x52\x52\x52\x52\x01\x00"+
 			"\x00\x00\x01\x00\x2e\x01\x00\x76\x00\x00\x00\x00"
@@ -651,4 +651,4 @@ class Metasploit3 < Msf::Exploit::Remote
 		pdf << "%%EOF" << eol
 	end
 
-end
+end