update SSLVersion to support all options for rex TCP sockets, add 'TLS' alias

bug/bundler_fix
Brent Cook 2015-10-02 15:26:49 -05:00
parent 4a9ef30e9e
commit 40cb13609a
2 changed files with 3 additions and 2 deletions

View File

@ -64,7 +64,7 @@ module Exploit::Remote::Tcp
register_advanced_options(
[
OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]),
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'TLS1', ['SSL2', 'SSL3', 'TLS1']]),
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL/TLS to be used (TLS and SSL23 are auto-negotiate)', 'TLS1', ['SSL2', 'SSL3', 'SSL23', 'TLS', 'TLS1', 'TLS1.1', 'TLS1.2']]),
OptEnum.new('SSLVerifyMode', [ false, 'SSL verification method', 'PEER', %W{CLIENT_ONCE FAIL_IF_NO_PEER_CERT NONE PEER}]),
OptString.new('SSLCipher', [ false, 'String for SSL cipher - "DHE-RSA-AES256-SHA" or "ADH"']),
Opt::Proxies,

View File

@ -64,7 +64,8 @@ begin
case params.ssl_version
when 'SSL2', :SSLv2
version = :SSLv2
when 'SSL23', :SSLv23
# 'TLS' will be the new name for autonegotation with newer versions of OpenSSL
when 'SSL23', :SSLv23, 'TLS'
version = :SSLv23
when 'SSL3', :SSLv3
version = :SSLv3