OJ 83fbd41970 Merge branch 'upstream/master' into multi-transport-support ...

Conflicts:
	Gemfile.lock
	modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb

2015-05-14 14:50:25 +10:00

..

bsd

Fix require order issue.

2015-04-14 23:23:02 -05:00

linux

Various code format, style changes, file moves

2015-05-12 09:43:41 +10:00

osx

Merge branch 'rapid7' into cleanup/remove-id-tags

2013-09-17 10:55:02 -05:00

windows

Merge branch 'upstream/master' into multi-transport-support

2015-05-14 14:50:25 +10:00

aix.rb

Retab lib

2013-08-30 16:28:33 -05:00

bsd.rb

Fix require order issue.

2015-04-14 23:23:02 -05:00

dalvik.rb

Fix grammer in comments

2015-04-13 13:21:41 +05:00

firefox.rb

Go ahead and trim whitespace on all commands coming in.

2015-02-02 16:56:22 -06:00

generic.rb

Retab lib

2013-08-30 16:28:33 -05:00

java.rb

Use single quotes consistently

2015-05-07 22:39:36 -05:00

jsp.rb

Restructure parts of Author, fix some doc bugs.

2014-11-26 13:54:23 -06:00

linux.rb

Fix OSX prepends and implement x64 setreuid.

2015-04-11 20:04:21 -05:00

netware.rb

Retab lib

2013-08-30 16:28:33 -05:00

nodejs.rb

Add SSL support to #nodejs_reverse_tcp.

2013-10-12 03:32:52 -05:00

osx.rb

The setres* stubs are not implemented in OSX.

2015-04-14 23:33:16 -05:00

php.rb

Retab lib

2013-08-30 16:28:33 -05:00

ruby.rb

Retab lib

2013-08-30 16:28:33 -05:00

single.rb

Retab lib

2013-08-30 16:28:33 -05:00

solaris.rb

Retab lib

2013-08-30 16:28:33 -05:00

stager.rb

Change StageEncoder behaviour

2015-01-05 16:49:50 +01:00

transport_config.rb

Various code format, style changes, file moves

2015-05-12 09:43:41 +10:00

uuid_options.rb

Fix grammer in comments

2015-04-13 13:21:41 +05:00

uuid.rb

fix some yarddoc issues

2015-04-20 00:06:59 +02:00

windows.rb

Add nil default to exit_types, transport param order swap

2015-05-12 09:05:58 +10:00