Merge branch 'spark_im.rb' of git://github.com/zeknox/metasploit-framework into zeknox-spark_im.rb

Author: sinn3r

modules/post/windows/gather/credentials/spark_im.rb

@@ -52,7 +52,7 @@ def decrypt(hash)
 		password = cipher.update encrypted
 		password << cipher.final
 
-		password = password.encode('UTF-8')
+		password = ::Rex::Text.to_utf8(password)
 
 		credentials = password.split("\u0001")
 		print_good("Decrypted Username #{credentials[0]} Password: #{credentials[1]}")
@@ -101,7 +101,8 @@ def run
 				end
 
 				# store the hash close the file
-				hash = password[1].split("password").join.chomp
+				password = password.delete_if {|e| e !~ /password.+=.+=\r/}
+				hash = password[0].split("password").join.chomp
 				print_status("Spark password hash: #{hash}") if datastore['VERBOSE']
 				config.close