infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,009 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

47 Commits (f6731f115f0844f15b9ac22d9255993150a3c611)

Author SHA1 Message Date
HD Moore a762d871bf Autonegotiate SSL/TLS versions when not explicit 2014-10-15 13:26:40 -05:00
Tod Beardsley c4d1a4c7dc
Revert #4022, as the solution is incomplete 
Revert "Land 4022, datastore should default TLS1 vs SSL3"

This reverts commit 4c8662c6c1, reversing
changes made to 0937f32ff9.
 2014-10-15 12:32:08 -05:00
Tod Beardsley 1754b23ffb
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 <tod_beardsley@rapid7.com>
Date:   Wed Oct 15 10:19:04 2014 -0500

    Whoops missed one

commit 477b15a08e06e74d725f1c45486b37e4b403e3c2
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Wed Oct 15 10:16:59 2014 -0500

    Other datastore options also want TLS1 as default

commit 8d397bd9b500ff6a8462170b4c39849228494795
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Wed Oct 15 10:12:06 2014 -0500

    TCP datastore opts default to TLS1

    Old encryption is old. See also: POODLE
 2014-10-15 10:28:53 -05:00
Tod Beardsley 0b6e03df75
More comment docs on SSLCompression 2014-01-21 16:48:26 -06:00
Joe Vennix 109fc5a834 Add SSLCompression datastore option. 
Also disables the compression by default. TLS-level compression is almost
never used by browsers, and openssl seems to be the only one that enables
it by default.

This also kills some ruby < 1.9.3 code.
 2013-11-19 22:34:39 -06:00
Tab Assassin 7e5e0f7fc8 Retab lib 2013-08-30 16:28:33 -05:00
James Lee 3827b14103 Land #1726, ssl verify mode 
Conflicts:
	lib/rex/socket/parameters.rb
Fix doc strings
 2013-08-12 17:57:10 -05:00
James Lee 2c8ec656ca Typo 2013-04-11 22:36:08 -05:00
RageLtMan 1e93ae65e3 fix typo in parameters 2013-04-11 19:12:32 -04:00
RageLtMan 5ac18e9156 commant update 2013-04-11 19:11:25 -04:00
RageLtMan 6eb33ae5ed Rex::Socket::SslTcp set cipher and verify_mode 
Update Rex::Socket::SslTcp to accept verification mode string from
Rex::Socket::Parameters, which has been modified accordingly.
Add SSLVerifyMode and SSLCipher options (params and socket work
were done before, but the option was not exposed) to
Msf::Exploit::Tcp.

Testing:
```
>> sock = Rex::Socket::Tcp.create('PeerHost'=>'10.1.1.1','PeerPort'
=>443,'SSL' => true, 'SSLVerifyMode' => 'NONE')
>> sock.sslctx.verify_mode
=> 0
>> sock.close
=> nil
>> sock = Rex::Socket::Tcp.create('PeerHost'=>'10.1.1.1','PeerPort'
=>443,'SSL' => true, 'SSLVerifyMode' => 'PEER')
=> #<Socket:fd 13>
>> sock.sslctx.verify_mode
=> 1
```

Note: this should be able to resolve the recent SSL socket hackery
of exploit/linux/misc/nagios_nrpe_arguments.
 2013-04-11 18:00:33 -04:00
James Lee 6a0b240d10 Add some better docs for Rex::Socket 2013-04-10 12:41:41 -05:00
David Maloney ebb0f166ca Accept propper formats for SSL version 
we were only accepting sloppy string values and not accepting input of
the actual symbols that OpenSSL expects in the first place. Allow the
user to enter it right themselves to be compat with OpenSSL
 2013-02-09 00:40:58 -06:00
David Maloney ebd03ccceb Allow user to set ssl cipher 
Rex::Socket::Tcp now allows the user to specify a cipher or ciphers to
try and use for the ssl connection in addition to the version.
 2013-02-06 16:57:47 -06:00
James Lee c9ccb02aae Clean up rdoc 2012-07-17 17:32:27 -06:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
James Lee 7c85a2796a Whitespace cleanup 2012-05-24 17:10:26 -06:00
James Lee d1e2f274f9 add ability to use arbitrary certs with SSL server sockets. 
git-svn-id: file:///home/svn/framework3/trunk@12675 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-20 23:12:35 +00:00
Stephen Fewer 6335fde3e1 Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock. 
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-09 16:45:46 +00:00
Stephen Fewer fd2469db24 Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter. 
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-06 17:59:25 +00:00
HD Moore 5e137e92fd Fixes #381. To scan for TLSv1 only services, set SSLVersion TLS1 
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-26 19:48:15 +00:00
HD Moore 303e4eab71 Enable broadcast support for all datagram sockets, remove the broadcast parameter entirely. 
git-svn-id: file:///home/svn/framework3/trunk@6780 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 15:24:46 +00:00
HD Moore bab394fa8f Typo fix - thanks Robin Wood! 
git-svn-id: file:///home/svn/framework3/trunk@6779 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 15:11:11 +00:00
HD Moore 9068b9a133 Adds the Broadcast parameter to the Rex::Socket class, allows udp/ip sockets to send to broadcast addresses 
git-svn-id: file:///home/svn/framework3/trunk@6778 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 13:19:31 +00:00
kris a0aa29bb18 typos 
git-svn-id: file:///home/svn/framework3/trunk@6054 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-29 07:47:37 +00:00
kris 2d1ae98917 Convert 'Retries' and 'Timeout' values to integers if given 
git-svn-id: file:///home/svn/framework3/trunk@6053 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-29 05:04:49 +00:00
kris cdcf5cf1fd add a few key descriptions 
git-svn-id: file:///home/svn/framework3/trunk@6024 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-19 09:33:16 +00:00
kris bfc23d2886 use self.peerhost (which could use 'PeerAddr') instead of 'PeerHost' 
git-svn-id: file:///home/svn/framework3/trunk@6021 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-19 06:54:22 +00:00
kris 560f2df2dd fix PeerAddr 
git-svn-id: file:///home/svn/framework3/trunk@6020 4d416f70-5f16-0410-b530-b9f4589650da
 2008-12-19 06:50:04 +00:00
Ramon de C Valle f124597a56 Code cleanups 
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
 2008-10-19 21:03:39 +00:00
HD Moore a52530f647 Raw IP socket support for Rex. Guess what this is for :-) 
git-svn-id: file:///home/svn/framework3/trunk@5565 4d416f70-5f16-0410-b530-b9f4589650da
 2008-07-22 19:03:59 +00:00
HD Moore 7498562eb5 Add proxy support to HTTP mixin using modules. Fix socks proxy support. 
git-svn-id: file:///home/svn/framework3/trunk@5113 4d416f70-5f16-0410-b530-b9f4589650da
 2007-09-24 04:44:44 +00:00
HD Moore 83a8ece022 This patch adds IPv6 support to most feartures of the framework. The major missing component is IPv6-enabled payloads. 
git-svn-id: file:///home/svn/framework3/trunk@4814 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-29 23:43:39 +00:00
HD Moore 4d1c274387 Merging all of the auxilliary/scanner related features 
git-svn-id: file:///home/svn/framework3/trunk@4749 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-24 06:27:39 +00:00
HD Moore b4ad4a5d75 Tabs vs Spaces 
git-svn-id: file:///home/svn/incoming/trunk@3453 4d416f70-5f16-0410-b530-b9f4589650da
 2006-01-27 05:33:08 +00:00
HD Moore 7a26ec55bf Proxy chaining patch from bmc 
git-svn-id: file:///home/svn/incoming/trunk@3244 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-18 02:19:21 +00:00
Matt Miller cbbce06ee0 fix for multiple exploit 
git-svn-id: file:///home/svn/incoming/trunk@3046 4d416f70-5f16-0410-b530-b9f4589650da
 2005-11-18 00:26:19 +00:00
Matt Miller fc42fef941 exploits now pass context when creating sockets 
git-svn-id: file:///home/svn/incoming/trunk@3034 4d416f70-5f16-0410-b530-b9f4589650da
 2005-11-15 21:25:23 +00:00
Matt Miller 95f8210853 major doc update 
git-svn-id: file:///home/svn/incoming/trunk@3029 4d416f70-5f16-0410-b530-b9f4589650da
 2005-11-15 05:22:13 +00:00
Matt Miller e1603ee25f fix for test suite bug and fix for SSL option being evaluated wrong 
git-svn-id: file:///home/svn/incoming/trunk@3028 4d416f70-5f16-0410-b530-b9f4589650da
 2005-11-14 18:48:21 +00:00
Matt Miller 6a5870ddcd updated comments to be more uniformed in class definition 
git-svn-id: file:///home/svn/incoming/trunk@3004 4d416f70-5f16-0410-b530-b9f4589650da
 2005-11-02 16:49:45 +00:00
Matt Miller 14e39004de switch board integrated 
git-svn-id: file:///home/svn/incoming/trunk@2919 4d416f70-5f16-0410-b530-b9f4589650da
 2005-09-30 05:48:45 +00:00
Matt Miller 2b82d4c4c4 fixed up the ol' http server 
git-svn-id: file:///home/svn/incoming/trunk@2843 4d416f70-5f16-0410-b530-b9f4589650da
 2005-08-22 02:36:09 +00:00
Spoon M 7bbae355d6 mass require moving of /lib 
git-svn-id: file:///home/svn/incoming/trunk@2690 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-09 21:18:49 +00:00
Matt Miller f76e7d307d SSL class 
git-svn-id: file:///home/svn/incoming/trunk@2551 4d416f70-5f16-0410-b530-b9f4589650da
 2005-06-03 22:51:09 +00:00
Matt Miller c9fdfc83c6 some unit tests, making shit work 
git-svn-id: file:///home/svn/incoming/trunk@2546 4d416f70-5f16-0410-b530-b9f4589650da
 2005-06-03 04:51:51 +00:00
Matt Miller 1de2dac652 unfinished shiznit 
git-svn-id: file:///home/svn/incoming/trunk@2544 4d416f70-5f16-0410-b530-b9f4589650da
 2005-06-02 07:52:17 +00:00