More dead code and tweaks.

lib/msf/core/exploit/tcp.rb

@@ -98,15 +98,15 @@ module Exploit::Remote::Tcp
     end
 
     nsock = Rex::Socket::Tcp.create(
-      'PeerHost'       =>  opts['RHOST'] || rhost,
-      'PeerPort'       => (opts['RPORT'] || rport).to_i,
-      'LocalHost'      =>  opts['CHOST'] || chost || "0.0.0.0",
-      'LocalPort'      => (opts['CPORT'] || cport || 0).to_i,
-      'SSL'            =>  dossl,
-      'SSLVersion'     =>  opts['SSLVersion'] || ssl_version,
-      'Proxies'        => proxies,
-      'Timeout'        => (opts['ConnectTimeout'] || connect_timeout || 10).to_i,
-      'Context'        =>
+      'PeerHost'   =>  opts['RHOST'] || rhost,
+      'PeerPort'   => (opts['RPORT'] || rport).to_i,
+      'LocalHost'  =>  opts['CHOST'] || chost || "0.0.0.0",
+      'LocalPort'  => (opts['CPORT'] || cport || 0).to_i,
+      'SSL'        =>  dossl,
+      'SSLVersion' =>  opts['SSLVersion'] || ssl_version,
+      'Proxies'    => proxies,
+      'Timeout'    => (opts['ConnectTimeout'] || connect_timeout || 10).to_i,
+      'Context'    =>
         {
           'Msf'        => framework,
           'MsfExploit' => self,

lib/rex/socket/ssl_tcp.rb

@@ -89,12 +89,6 @@ begin
       self.sslctx.ciphers = params.ssl_cipher
     end
 
-    if params.ssl_compression
-      self.sslctx.options &= ~OpenSSL::SSL::OP_NO_COMPRESSION
-    else
-      self.sslctx.options |= OpenSSL::SSL::OP_NO_COMPRESSION
-    end
-
     # Set the verification callback
     self.sslctx.verify_callback = Proc.new do |valid, store|
       self.peer_verified = valid