HD Moore 27974c4c27 Merge branch 'master' of github.com:rapid7/metasploit-framework into fastlib ...

Conflicts:
	modules/auxiliary/scanner/http/axis_login.rb
	modules/exploits/multi/http/axis2_deployer.rb
	modules/post/multi/gather/thunderbird_creds.rb
	modules/post/windows/gather/credentials/imvu.rb
	msfopcode

2011-12-03 14:07:09 -06:00

..

auxiliary

Allow hyphens for fnames and ltypes for fileformat exploits

2011-11-28 19:16:30 -06:00

encoder

more spaces at EOL

2011-11-20 12:01:19 +11:00

encoding

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

exploit

Change the encapsulation method to allow multiple methods without

2011-12-02 02:02:55 -06:00

handler

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

model

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

module

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

payload

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

post

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

rpc

Revert "Merge pull request #22 from scriptjunkie/multithread"

2011-12-02 13:35:43 -05:00

session

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

auxiliary.rb

This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up

2011-05-03 03:59:02 +00:00

constants.rb

make the constant match what os normalization is doing

2011-05-19 16:54:33 +00:00

data_store.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

db_export.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

db_manager.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

db_objects.rb

Officially remove sqlite3 support (its been deprecated for approximately a year). SQLite3 has not been usable for a long time due to thread concurrency and stability issues. This is the final nail in the coffin now that the DB backend has gone through an overhaul.

2011-04-29 17:22:53 +00:00

db.rb

Typo in report_auth_info

2011-11-26 17:57:46 -08:00

encoded_payload.rb

typo.. was working on some java sploit and found it.

2011-08-30 22:23:00 +00:00

encoder.rb

rename/clarify PrintfUtil encoder, fixes #2308

2010-10-18 15:41:13 +00:00

event_dispatcher.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

exceptions.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

exceptions.rb.ut.rb

Code cleanups

2008-10-19 21:03:39 +00:00

exploit_driver.rb

un-revert another piece of r12600's overzealousness. see r12574

2011-05-17 17:16:47 +00:00

exploit.rb

A couple bug fixes to enable cmd_interact and a new module for the VSFTPD backdoor

2011-07-04 20:09:32 +00:00

exploit.rb.ut.rb

Code cleanups

2008-10-19 21:03:39 +00:00

framework.rb

This tweak allows a hash of options to be passed to console.create() and for this to bubble up to the WebConsole driver initialization

2011-11-04 20:38:12 +00:00

handler.rb

Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).

2011-06-28 21:26:43 +00:00

model.rb

Add profiles table

2011-07-17 21:39:21 +00:00

module_manager.rb

Merge in updated module_manager that loads all .fastlibs

2011-11-28 22:24:27 -06:00

module.rb

Purge the new version code, it triggers a stack and is a massive performance hit

2011-11-23 23:05:51 -06:00

nop.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

option_container.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

option_container.rb.ut.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

payload_set.rb

check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477

2011-01-17 17:15:43 +00:00

payload.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

plugin_manager.rb

Code cleanups

2008-10-19 21:03:39 +00:00

plugin.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

post.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

rpc.rb

Add plugin support to rpc. Fixes #2292

2010-08-28 18:21:17 +00:00

session_manager.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00

session_manager.rb.ut.rb

Fix other occurrences of on_session_close not taking a second parameter. See #1075

2010-03-11 13:54:10 +00:00

session.rb

Handle closed_at in a consistent way as it applies to UTC (closes #5572)

2011-10-16 19:03:59 +00:00

task_manager.rb

massive removal of spaces at EOL and some bad tabs

2011-11-20 12:32:06 +11:00

thread_manager.rb

spaces at EOL in core stuff

2011-11-20 12:10:08 +11:00