Christian Mehlmauer
7dac21f58c
do not fail on old class name
2016-01-22 23:36:37 +01:00
Christian Mehlmauer
51eb79adc7
first try in changing class names
2016-01-22 23:36:37 +01:00
Brent Cook
91700f17e3
tidy up the ruby style while we're in here testing
2016-01-22 14:43:19 -06:00
Brent Cook
ac8b483d32
don't break the accept loop just because we got a client connection that closed early
2016-01-22 13:52:00 -06:00
Christian Mehlmauer
0871fe25e8
change text
2016-01-22 07:38:44 +01:00
Christian Mehlmauer
e0de78280d
move SSL to the default options
2016-01-22 07:05:23 +01:00
wchen-r7
216986f7af
Do API documentation, rspec, and other small changes
2016-01-21 17:22:14 -06:00
Christian Mehlmauer
5a0e11fb72
revert file check
2016-01-21 20:21:41 +01:00
Adam Cammack
d544488409
Land #6461 , backport net-ssh ECDH kex algorithms
2016-01-20 14:05:39 -06:00
James Lee
0f7e3e954e
HttpServer's print prefix with... wait for it...
...
print_prefix
2016-01-20 13:44:18 -06:00
wchen-r7
d46ab29186
Don't name the method #send
2016-01-19 20:03:02 -06:00
Christian Mehlmauer
390b46dd25
also check file for existance
2016-01-19 23:55:49 +01:00
Christian Mehlmauer
b45e22b64d
use .any?
2016-01-19 23:16:10 +01:00
Christian Mehlmauer
aaa1174ca5
fix rspec errors without database
2016-01-19 20:28:58 +01:00
OJ
6c2391ed0d
Fix typo in random xor key generator
2016-01-19 15:37:10 +10:00
OJ
d92ca8f6b0
Merge branch 'upstream/master' into default-xor
2016-01-17 09:47:05 +10:00
nixawk
98cfd2de90
remove PING authentication
2016-01-16 12:42:15 +08:00
Metasploit
a030179577
Bump version of framework to 4.11.8
2016-01-15 15:17:13 -08:00
Brent Cook
59660dd6d0
Land #6465 , remove unneeded meterpreter extension post-installation copies
2016-01-15 17:04:14 -06:00
OJ
e7e63d92be
Land #6467 : fix missing requires in payloads
...
Fixes #6460
2016-01-15 07:42:14 +10:00
Brent Cook
e1be57d658
Land #6458 , Backport net-ssh AES CTR ciphers
2016-01-14 14:44:49 -06:00
Brent Cook
544b681981
Land #6451 , Backport net-ssh Diffie-Hellman Group Exchange SHA-256 key exchange
2016-01-14 14:43:52 -06:00
Brent Cook
28cf943bcb
Fix a couple of missing requires in payloads.
...
This pops up occasionally. This fixes a couple of anecdotal reports of missing
requires that cause the loader to fail, depending on the directory sort order.
It also fixes the problem as reported in #6460
2016-01-14 13:17:26 -06:00
Brent Cook
8479d01029
Land #6450 , add TLS support to MSSQL
2016-01-14 12:17:40 -06:00
Brent Cook
37178cda06
Land #6449 , properly handle HttpServer resource collisions
2016-01-14 12:15:18 -06:00
James Lee
a7869975d8
Remove useless variable
2016-01-14 10:04:23 -06:00
James Lee
1f61eb50be
Sort methods
2016-01-14 09:09:29 -06:00
OJ
18fe9bd96f
Merge branch 'upstream/master' into default-xor
2016-01-13 10:05:59 +10:00
David Maloney
f7ce0dfedf
remove the merge extension intialiser
...
this initialiser conflicts with the gemfication
of framework and causes permissions issues
MS-972
2016-01-12 14:08:54 -06:00
Tim
c76389629a
receive startActivity result
2016-01-12 07:49:37 +00:00
Tim
f48e4363f5
activity_start
2016-01-12 07:22:55 +00:00
Manuel Mancera
4ab58caa93
Fix the help option for vulns command
2016-01-11 22:19:44 +01:00
Christopher Moore
8102fc2af2
add support for ECDH SHA2 NIST key exchanges
2016-01-10 18:01:49 +00:00
Christopher Moore
96b6eb6b06
remove extraneous comma
2016-01-10 17:13:15 +00:00
Christopher Moore
b7e3d97935
remove extra spacing
2016-01-10 17:12:41 +00:00
Christopher Moore
b3e42c3611
add missing coding preamble
2016-01-10 17:10:23 +00:00
Christopher Moore
8f72166f66
add missing coding preamble
2016-01-10 17:08:58 +00:00
Christopher Moore
9ff5ffd1ac
fix erroneous comment
2016-01-09 17:56:11 +00:00
Christopher Moore
888be6133c
KEx availability depends on OpenSSL support
2016-01-09 13:45:23 +00:00
nixawk
dceb0f5ea9
check dns labels size limits
2016-01-09 11:39:56 +08:00
nixawk
ed99f2bc01
Fix dns labels/names size limits
2016-01-08 22:22:00 +08:00
Christopher Moore
3a5805faaf
add CTR mode to support the new ciphers
2016-01-08 01:43:21 +00:00
Christopher Moore
5a710e4969
add aes128-ctr encryption algorithm
2016-01-08 01:15:17 +00:00
Christopher Moore
f82e32372e
add aes192-ctr encryption algorithm
2016-01-08 01:14:09 +00:00
Christopher Moore
3dc822588f
add aes256-ctr encryption algorithm
2016-01-08 01:12:27 +00:00
Christopher Moore
77cd28c136
add dh group exchange sha256 kex to net-ssh lib
2016-01-08 00:58:48 +00:00
Louis Sato
192505fe2d
killing threads and closing sockets more elegantly
2016-01-07 17:57:32 -06:00
Metasploit
dea4f35b0e
Bump to 4.11.7
2016-01-07 15:56:59 -08:00
Jonathan Harms
5266860cec
Squashed more commits back into 1
2016-01-07 17:53:49 -06:00
Jonathan Harms
675100946b
Initial SSL working OK
2016-01-07 17:53:48 -06:00