remove negotiate requirements

winrm can support basic, and now these modules can too, for free

Author: David Maloney

lib/msf/core/exploit/winrm.rb

@@ -219,10 +219,6 @@ def generate_uuid
 		::Rex::Proto::DCERPC::UUID.uuid_unpack(Rex::Text.rand_text(16))
 	end
 
-	def accepts_ntlm_auth
-		parse_auth_methods(winrm_poke).include? "Negotiate"
-	end
-
 	def target_url
 		proto = "http"
 		if rport == 5986 or datastore['SSL']

modules/auxiliary/scanner/winrm/winrm_cmd.rb

@@ -40,10 +40,6 @@ def initialize
 
 
 	def run_host(ip)
-		unless accepts_ntlm_auth
-			print_error "The Remote WinRM  server  (#{ip} does not appear to allow Negotiate(NTLM) auth"
-			return
-		end
 		streams = winrm_run_cmd(datastore['CMD'])
 		return unless streams.class == Hash
 		print_error streams['stderr'] unless streams['stderr'] == ''

modules/auxiliary/scanner/winrm/winrm_login.rb

@@ -39,10 +39,6 @@ module without SSL, the 'AllowUnencrypted' winrm option must be set.
 
 
 	def run_host(ip)
-		unless accepts_ntlm_auth
-			print_error "The Remote WinRM  server  (#{ip} does not appear to allow Negotiate(NTLM) auth"
-			return
-		end
 		each_user_pass do |user, pass|
 			resp = send_winrm_request(test_request)
 			if resp.nil?

modules/auxiliary/scanner/winrm/winrm_wql.rb

@@ -42,11 +42,6 @@ def initialize
 
 
 	def run_host(ip)
-		unless accepts_ntlm_auth
-			print_error "The Remote WinRM  server  (#{ip} does not appear to allow Negotiate(NTLM) auth"
-			return
-		end
-
 		resp = send_winrm_request(winrm_wql_msg(datastore['WQL']))
 		if resp.nil?
 			print_error "Got no reply from the server"