Merge branch 'landing-7074' into upstream-master

Author: sgonzalez-r7

Gemfile.lock

@@ -36,7 +36,6 @@ PATH
       rex-text
       rex-zip
       robots
-      rubyntlm
       rubyzip
       sqlite3
       sshkey

lib/metasploit/framework/mssql/client.rb

@@ -2,6 +2,10 @@
 
 require 'uri'
 require 'digest'
+require 'rex/proto/ntlm/crypt'
+require 'rex/proto/ntlm/constants'
+require 'rex/proto/ntlm/utils'
+require 'rex/proto/ntlm/exceptions'
 module Msf
 
 ###
@@ -12,6 +16,15 @@ module Msf
 ###
 module Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
+  include Exploit::Remote::NTLM::Client
+
+  #
+  # Constants
+  #
+  NTLM_CRYPT = Rex::Proto::NTLM::Crypt
+  NTLM_CONST = Rex::Proto::NTLM::Constants
+  NTLM_UTILS = Rex::Proto::NTLM::Utils
+  NTLM_XCEPT = Rex::Proto::NTLM::Exceptions
 
   #
   # Initializes an exploit module that exploits a vulnerability in an HTTP
@@ -180,6 +193,12 @@ def connect(opts={})
       'uri_fake_end'           => datastore['HTTP::uri_fake_end'],
       'uri_fake_params_start'  => datastore['HTTP::uri_fake_params_start'],
       'header_folding'         => datastore['HTTP::header_folding'],
+      'usentlm2_session'       => datastore['NTLM::UseNTLM2_session'],
+      'use_ntlmv2'             => datastore['NTLM::UseNTLMv2'],
+      'send_lm'                => datastore['NTLM::SendLM'],
+      'send_ntlm'              => datastore['NTLM::SendNTLM'],
+      'SendSPN'                => datastore['NTLM::SendSPN'],
+      'UseLMKey'               => datastore['NTLM::UseLMKey'],
       'domain'                 => datastore['DOMAIN'],
       'DigestAuthIIS'          => datastore['DigestAuthIIS']
     )
@@ -236,6 +255,12 @@ def configure_http_login_scanner(conf)
       evade_uri_fake_end:            datastore['HTTP::uri_fake_end'],
       evade_uri_fake_params_start:   datastore['HTTP::uri_fake_params_start'],
       evade_header_folding:          datastore['HTTP::header_folding'],
+      ntlm_use_ntlmv2_session:       datastore['NTLM::UseNTLM2_session'],
+      ntlm_use_ntlmv2:               datastore['NTLM::UseNTLMv2'],
+      ntlm_send_lm:                  datastore['NTLM::SendLM'],
+      ntlm_send_ntlm:                datastore['NTLM::SendNTLM'],
+      ntlm_send_spn:                 datastore['NTLM::SendSPN'],
+      ntlm_use_lm_key:               datastore['NTLM::UseLMKey'],
       ntlm_domain:                   datastore['DOMAIN'],
       digest_auth_iis:               datastore['DigestAuthIIS']
     }.merge(conf)