Merge branch 'WinRM_piecemeal' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal

Author: sinn3r

lib/msf/core/exploit/winrm.rb

@@ -49,7 +49,7 @@ def winrm_poke(timeout = 20)
 				'method' => 'POST',
 				'ctype'     => ctype,
 				'data'        => opts['data']
-			}))
+			}), to)
 			return resp
 		end
 

modules/auxiliary/scanner/winrm/winrm_auth_methods.rb

@@ -41,7 +41,8 @@ def initialize
 
 	def run_host(ip)
 		resp = winrm_poke
-		if resp.code == 401 and resp.headers['Server'].include? "Microsoft-HTTPAPI"
+		return nil if resp.nil?
+		if  resp.code == 401 and resp.headers['Server'].include? "Microsoft-HTTPAPI"
 			methods = parse_auth_methods(resp)
 			desc = resp.headers['Server'] + " Authentication Methods: " + methods.to_s
 			report_service(
@@ -53,8 +54,8 @@ def run_host(ip)
 			)
 			print_good "Negotiate protocol supported" if methods.include? "Negotiate"
 			print_good "Kerberos protocol supported" if methods.include? "Kerberos"
-			print_good "Basic protocol supported" if methods.include? "Basic"	
-		else 
+			print_good "Basic protocol supported" if methods.include? "Basic"
+		else
 			print_error "#{ip}:#{rport} Does not appear to be a WinRM server"
 		end
 	end