infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More dead code and tweaks.

bug/bundler_fix
Joe Vennix 2013-11-20 14:44:53 -06:00
parent 3ff9da5643
commit 739c7b4ca2
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/msf/core/exploit/tcp.rb
View File

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

6
lib/rex/socket/ssl_tcp.rb
View File

@ -89,12 +89,6 @@ begin
self.sslctx.ciphers = params.ssl_cipher self.sslctx.ciphers = params.ssl_cipher
end 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 # Set the verification callback
self.sslctx.verify_callback = Proc.new do |valid, store| self.sslctx.verify_callback = Proc.new do |valid, store|
self.peer_verified = valid self.peer_verified = valid