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/rex
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
..
arch Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
assembly Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
elfparsey Remove $Id tags 2013-05-20 16:21:03 -05:00
elfscan Remove $Id tags 2013-05-20 16:21:03 -05:00
encoder Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
encoders Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
encoding Also remove *.ts.rb files 2013-05-28 17:05:44 -05:00
exploitation Land #2135 - Update FF detection 2013-07-20 13:10:14 -05:00
image_source Remove $Id tags 2013-05-20 16:21:03 -05:00
io Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
logging Whitespace at EOL 2013-03-07 18:16:57 -06:00
machparsey Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
machscan Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
mime Whitespace at EOL 2013-03-07 18:16:57 -06:00
nop Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
ole Remove $Id tags 2013-05-20 16:21:03 -05:00
parser Kill stray character in whitespace gutter. 2013-07-16 10:14:41 -05:00
payloads Whitespace at EOL 2013-03-07 18:16:57 -06:00
peparsey Remove $Id tags 2013-05-20 16:21:03 -05:00
pescan Whitespace at EOL 2013-03-07 18:16:57 -06:00
platforms Whitespace at EOL 2013-03-07 18:16:57 -06:00
poly Improved docs and partial specs for Rex::Text 2013-04-23 17:24:03 -05:00
post Reverting disaster merge to 593363c5f with diff 2013-07-29 21:47:52 -05:00
proto Fix potential nil in last_filename 2013-07-09 12:50:19 -05:00
registry Whitespace at EOL 2013-03-07 18:16:57 -06:00
ropbuilder Add back the tmp include check according to bannedit's feedback 2013-05-31 16:26:52 -05:00
script Add print_warning() 2012-10-12 21:48:15 -05:00
services Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
socket Another Error Type needs caught 2013-07-23 15:47:42 -05:00
sslscan Param name goes before type 2013-03-07 12:50:43 -06:00
struct2 Whitespace at EOL 2013-03-07 18:16:57 -06:00
sync Whitespace at EOL 2013-03-07 18:16:57 -06:00
ui Inline unit tests are so last decade 2013-05-23 12:41:14 -05:00
zip Remove $Id tags 2013-05-20 16:21:03 -05:00
LICENSE
…
arch.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
codepage.map
…
compat.rb Revert the default call to firefox 2013-07-23 16:13:02 -05:00
constants.rb android meterpreter 2013-04-12 18:57:04 +01:00
elfparsey.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
elfscan.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
exceptions.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
file.rb Keep the trailing slash if the user wishes 2013-07-22 20:46:18 -05:00
image_source.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
job_container.rb Whitespace at EOL 2013-03-07 18:16:57 -06:00
logging.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
mac_oui.rb Whitespace at EOL 2013-03-07 18:16:57 -06:00
machparsey.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
machscan.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
mime.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
ole.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
payloads.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
peparsey.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
pescan.rb Remove $Id tags 2013-05-20 16:21:03 -05:00
platforms.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
poly.rb open up the bloxor encoder. 2013-01-10 17:39:40 +00:00
post.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
proto.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
random_identifier_generator.rb Store inverted hash for better lookups 2013-07-10 12:38:42 -05:00
registry.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
ropbuilder.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
script.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
service.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
service_manager.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
socket.rb Whitespace at EOL 2013-03-07 18:16:57 -06:00
struct2.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
sync.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
test.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
text.rb to_addr_hex_dump is never used and is too similar to to_hex_dump 2013-07-10 11:09:47 -05:00
thread_factory.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
time.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
transformer.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
ui.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
zip.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00