From e0de78280d04bd993276d6fd89cbf79869ff6e28 Mon Sep 17 00:00:00 2001 From: Christian Mehlmauer Date: Fri, 22 Jan 2016 07:05:23 +0100 Subject: [PATCH] move SSL to the default options --- lib/msf/core/auxiliary/crawler.rb | 4 ++-- lib/msf/core/exploit/http/client.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/msf/core/auxiliary/crawler.rb b/lib/msf/core/auxiliary/crawler.rb index 2517d900db..cfc9ffcf18 100644 --- a/lib/msf/core/auxiliary/crawler.rb +++ b/lib/msf/core/auxiliary/crawler.rb @@ -25,7 +25,8 @@ module Auxiliary::HttpCrawler OptInt.new('MAX_THREADS', [ true, 'The maximum number of concurrent requests', 4]), OptString.new('USERNAME', [false, 'The HTTP username to specify for authentication']), OptString.new('PASSWORD', [false, 'The HTTP password to specify for authentication']), - OptString.new('DOMAIN', [ true, 'The domain to use for windows authentication', 'WORKSTATION']) + OptString.new('DOMAIN', [ true, 'The domain to use for windows authentication', 'WORKSTATION']), + OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]) ], self.class ) @@ -43,7 +44,6 @@ module Auxiliary::HttpCrawler OptString.new('BasicAuthPass', [false, 'The HTTP password to specify for basic authentication']), OptString.new('HTTPAdditionalHeaders', [false, "A list of additional headers to send (separated by \\x01)"]), OptString.new('HTTPCookie', [false, "A HTTP cookie header to send with each request"]), - OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]), OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'Auto', ['Auto', 'SSL2', 'SSL23', 'SSL3', 'TLS1']]), ], self.class ) diff --git a/lib/msf/core/exploit/http/client.rb b/lib/msf/core/exploit/http/client.rb index 72b378980f..4b00feec3b 100644 --- a/lib/msf/core/exploit/http/client.rb +++ b/lib/msf/core/exploit/http/client.rb @@ -37,6 +37,7 @@ module Exploit::Remote::HttpClient Opt::RHOST, Opt::RPORT(80), OptString.new('VHOST', [ false, "HTTP server virtual host" ]), + OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]), Opt::Proxies ], self.class ) @@ -49,7 +50,6 @@ module Exploit::Remote::HttpClient OptString.new('USERNAME', [false, 'The HTTP username to specify for authentication', '']), OptString.new('PASSWORD', [false, 'The HTTP password to specify for authentication', '']), OptBool.new('DigestAuthIIS', [false, 'Conform to IIS, should work for most servers. Only set to false for non-IIS servers', true]), - OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]), OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'Auto', ['Auto', 'SSL2', 'SSL3', 'TLS1']]), OptBool.new('FingerprintCheck', [ false, 'Conduct a pre-exploit fingerprint verification', true]), OptString.new('DOMAIN', [ true, 'The domain to use for windows authentification', 'WORKSTATION']),