Remove the old MS-TDS SSL Proxy code

Author: zeroSteiner

lib/metasploit/framework/mssql/tdssslproxy.rb

@@ -1,5 +1,4 @@
 require 'metasploit/framework/tcp/client'
-require 'metasploit/framework/mssql/tdssslproxy'
 require 'rex/proto/mssql/client_mixin'
 require 'rex/text'
 require 'msf/core/exploit'
@@ -242,10 +241,6 @@ def mssql_prelogin(enc_error=false)
           data
         end
 
-        def mssql_ssl_send_recv(req, tdsproxy, timeout=15, check_status=true)
-          tdsproxy.send_recv(req)
-        end
-
         def query(sqla, doprint=false, opts={})
           info = { :sql => sqla }
           opts[:timeout] ||= 15
@@ -415,6 +410,10 @@ def login_kerberos(user, pass, db, domain_name)
           pkt_hdr.packet_length += pkt_body.num_bytes
           pkt = pkt_hdr.to_binary_s + pkt_body.to_binary_s
 
+          if tdsencryption == true
+            @mstds_channel.starttls
+          end
+
           # Rem : One have to set check_status to false here because sql server sp0 (and maybe above)
           # has a strange behavior that differs from the specifications
           # upon receiving the ntlm_negociate request it send an ntlm_challenge but the status flag of the tds packet header
@@ -467,12 +466,11 @@ def login_ntlm(user, pass, db, domain_name)
           # upon receiving the ntlm_negotiate request it send an ntlm_challenge but the status flag of the tds packet header
           # is set to STATUS_NORMAL and not STATUS_END_OF_MESSAGE, then internally it waits for the ntlm_authentification
           if tdsencryption == true
-            #proxy = TDSSSLProxy.new(sock, sslkeylogfile: sslkeylogfile)
-            #proxy.setup_ssl
-            #resp = proxy.send_recv(pkt)
             @mstds_channel.starttls
           end
 
+          resp = mssql_send_recv(pkt)
+
           # Strip the TDS header
           resp = resp[3..-1]
           type3 = ntlm_client.init_context([resp].pack('m'))
@@ -516,15 +514,12 @@ def login_sql(user, pass, db, _domain_name)
           pkt_hdr.packet_length += pkt_body.num_bytes
           pkt = pkt_hdr.to_binary_s + pkt_body.to_binary_s
 
-          if self.tdsencryption == true
-            proxy = TDSSSLProxy.new(sock, sslkeylogfile: sslkeylogfile)
-            proxy.setup_ssl
-            resp = mssql_ssl_send_recv(pkt, proxy)
-            proxy.cleanup
-          else
-            resp = mssql_send_recv(pkt)
+          if tdsencryption == true
+            @mstds_channel.starttls
           end
 
+          resp = mssql_send_recv(pkt)
+
           info = {:errors => []}
           info = mssql_parse_reply(resp, info)
           self.initial_connection_info = info