infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
metasploit-framework/lib/msf/core
History
Tod Beardsley 7e539332db Reverting disaster merge to 593363c5f with diff 
There was a disaster of a merge at 6f37cf22eb that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).

What this commit does is simulate a hard reset, by doing thing:

 git checkout -b reset-hard-ohmu
 git reset --hard 593363c5f9
 git checkout upstream-master
 git checkout -b revert-via-diff
 git diff --no-prefix upstream-master..reset-hard-ohmy > patch
 patch -p0 < patch

Since there was one binary change, also did this:

 git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf

Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.
 		2013-07-29 21:47:52 -05:00
..
auxiliary Land #1215, creds reuse for AuthBrute modules 2013-07-25 16:54:44 -05:00
db_manager Reset column information after running migrations 2013-05-20 13:08:07 -05:00
encoder Make stage encoding possible 2013-01-13 21:07:39 -06:00
encoding Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
exploit Fix payload corruption 2013-07-24 19:08:02 +01:00
handler remove metsrv.dll 2013-07-15 17:16:21 +01:00
module Add support for CWE 2013-07-22 12:13:56 -05:00
module_manager Update documentation 2013-07-24 19:04:47 -05:00
modules Refactor msfcli 2013-07-28 12:40:50 -05:00
payload Land #1708, android meterpreter 2013-05-28 12:19:45 -05:00
post Reverting disaster merge to 593363c5f with diff 2013-07-29 21:47:52 -05:00
rpc/v10 "fix" indentation to make egypt happy 2013-06-27 17:16:13 -05:00
session Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
auxiliary.rb DRY: Move check things to the common module level 2013-05-23 11:42:41 -05:00
constants.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
data_store.rb Whitespace at EOL 2013-03-07 18:20:08 -06:00
db.rb Land #2157, @wvu and @averagesecurityguy patch for OpenVAS XML Reports importing 2013-07-25 12:04:38 -05:00
db_export.rb Update to metasploit_data_models 0.11.0 2013-05-09 13:25:26 -05:00
db_manager.rb Use a LIKE test instead of equality 2013-05-29 16:27:33 -05:00
encoded_payload.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
encoder.rb Make stage encoding possible 2013-01-13 21:07:39 -06:00
event_dispatcher.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
exceptions.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
exploit.rb Factorize and remove includes 2013-05-28 15:46:06 -05:00
exploit_driver.rb Whitespace at EOL 2013-03-07 18:20:08 -06:00
framework.rb Bump version to 4.8.0-dev, -rls is so fleeting 2013-07-17 16:43:24 -05:00
handler.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
module.rb Remove unnecessary whitespace. 2013-07-18 13:43:30 -05:00
module_manager.rb Reuse appropriate terminology in docs 2013-05-21 08:19:47 -05:00
module_set.rb Reuse appropriate terminology in docs 2013-05-21 08:19:47 -05:00
modules.rb Refactor Msf::ModuleManager 2012-10-01 13:09:30 -05:00
nop.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
option_container.rb OptRegexp specs 2013-07-20 18:44:55 -05:00
payload.rb Land #1708, android meterpreter 2013-05-28 12:19:45 -05:00
payload_set.rb Payload compatible cache_in_memory 2013-05-22 16:06:02 -05:00
plugin.rb Add print_warning() 2012-10-12 21:48:15 -05:00
plugin_manager.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
post.rb Move PostMixin to its own file 2013-05-28 15:46:06 -05:00
post_mixin.rb Factorize and remove includes 2013-05-28 15:46:06 -05:00
rpc.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
session.rb Report on TaskSession associations 2013-06-04 13:42:36 -05:00
session_manager.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
task_manager.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
thread_manager.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00