Skip to content

Commit 1754b23

Browse files
author
Tod Beardsley
committed
Datastore options should default to TLS1, not SSL3
Otherwise, we risk getting our connections killed by particularly aggressive DPI devices (IPS, firewalls, etc) Squashed commit of the following: commit 5e203851d5c9dce1fe984b106ce3031a3653e54b Author: Tod Beardsley <[email protected]> Date: Wed Oct 15 10:19:04 2014 -0500 Whoops missed one commit 477b15a08e06e74d725f1c45486b37e4b403e3c2 Author: Tod Beardsley <[email protected]> Date: Wed Oct 15 10:16:59 2014 -0500 Other datastore options also want TLS1 as default commit 8d397bd9b500ff6a8462170b4c39849228494795 Author: Tod Beardsley <[email protected]> Date: Wed Oct 15 10:12:06 2014 -0500 TCP datastore opts default to TLS1 Old encryption is old. See also: POODLE
1 parent 0937f32 commit 1754b23

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

lib/msf/core/auxiliary/crawler.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def initialize(info = {})
4444
OptString.new('HTTPAdditionalHeaders', [false, "A list of additional headers to send (separated by \\x01)"]),
4545
OptString.new('HTTPCookie', [false, "A HTTP cookie header to send with each request"]),
4646
OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]),
47-
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'SSL3', ['SSL2', 'SSL23', 'SSL3', 'TLS1']]),
47+
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'TLS1', ['SSL2', 'SSL23', 'SSL3', 'TLS1']]),
4848
], self.class
4949
)
5050

lib/msf/core/exploit/http/client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def initialize(info = {})
5050
OptString.new('PASSWORD', [false, 'The HTTP password to specify for authentication', '']),
5151
OptBool.new('DigestAuthIIS', [false, 'Conform to IIS, should work for most servers. Only set to false for non-IIS servers', true]),
5252
OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]),
53-
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'SSL3', ['SSL2', 'SSL3', 'TLS1']]),
53+
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'TLS1', ['SSL2', 'SSL3', 'TLS1']]),
5454
OptBool.new('FingerprintCheck', [ false, 'Conduct a pre-exploit fingerprint verification', true]),
5555
OptString.new('DOMAIN', [ true, 'The domain to use for windows authentification', 'WORKSTATION'])
5656
], self.class

lib/msf/core/exploit/tcp.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def initialize(info = {})
6262
register_advanced_options(
6363
[
6464
OptBool.new('SSL', [ false, 'Negotiate SSL for outgoing connections', false]),
65-
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'SSL3', ['SSL2', 'SSL3', 'TLS1']]),
65+
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'TLS1', ['SSL2', 'SSL3', 'TLS1']]),
6666
OptEnum.new('SSLVerifyMode', [ false, 'SSL verification method', 'PEER', %W{CLIENT_ONCE FAIL_IF_NO_PEER_CERT NONE PEER}]),
6767
OptString.new('SSLCipher', [ false, 'String for SSL cipher - "DHE-RSA-AES256-SHA" or "ADH"']),
6868
Opt::Proxies,
@@ -290,7 +290,7 @@ def initialize(info = {})
290290
register_options(
291291
[
292292
OptBool.new('SSL', [ false, 'Negotiate SSL for incoming connections', false]),
293-
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'SSL3', ['SSL2', 'SSL3', 'TLS1']]),
293+
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'TLS1', ['SSL2', 'SSL3', 'TLS1']]),
294294
OptPath.new('SSLCert', [ false, 'Path to a custom SSL certificate (default is randomly generated)']),
295295
OptAddress.new('SRVHOST', [ true, "The local host to listen on. This must be an address on the local machine or 0.0.0.0", '0.0.0.0' ]),
296296
OptPort.new('SRVPORT', [ true, "The local port to listen on.", 8080 ]),

lib/rex/socket/parameters.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def self.from_hash(hash)
5656
# @option hash [Bool] 'Bool' Create a bare socket
5757
# @option hash [Bool] 'Server' Whether or not this should be a server
5858
# @option hash [Bool] 'SSL' Whether or not SSL should be used
59-
# @option hash [String] 'SSLVersion' Specify SSL2, SSL3, or TLS1 (SSL3 is
59+
# @option hash [String] 'SSLVersion' Specify SSL2, SSL3, or TLS1 (TLS1 is
6060
# default)
6161
# @option hash [String] 'SSLCert' A file containing an SSL certificate (for
6262
# server sockets)

0 commit comments

Comments
 (0)