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
Brandon Turner 05f0d09828
Merge branch staging/electro-release into master 
On August 15, shuckins-r7 merged the Metasploit 4.10.0 branch
(staging/electro-release) into master.  Rather than merging with
history, he squashed all history into two commits (see
149c3ecc63 and
82760bf5b3).

We want to preserve history (for things like git blame, git log, etc.).
So on August 22, we reverted the commits above (see
19ba7772f3).

This merge commit merges the staging/electro-release branch
(62b81d6814) into master
(48f0743d1b).  It ensures that any changes
committed to master since the original squashed merge are retained.

As a side effect, you may see this merge commit in history/blame for the
time period between August 15 and August 22.
 		2014-08-22 10:50:38 -05:00
..
arch removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
assembly removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
elfparsey removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
elfscan Add disasm option to msfelfscan 2013-12-26 16:26:45 -02:00
encoder Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
encoders removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
encoding No need for that kind of language 2014-03-04 14:34:50 -06:00
exploitation Fix load_js when opts[:newobfu] and add specs 2014-08-18 13:50:19 -05:00
image_source removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
io removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
logging Retab lib 2013-08-30 16:28:33 -05:00
machparsey removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
machscan removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
mime Fix some yarddoc issues 2014-05-05 22:45:41 +02:00
nop Retab lib 2013-08-30 16:28:33 -05:00
ole Fix improper use of host-endian or signed pack/unpack 2014-06-30 02:50:10 -05:00
parser Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
payloads Retab lib 2013-08-30 16:28:33 -05:00
peparsey removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
pescan Retab lib 2013-08-30 16:28:33 -05:00
platforms Retab lib 2013-08-30 16:28:33 -05:00
poly Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
post Land #3612, Windows Local Kernel exploits refactor 2014-08-10 22:05:06 +01:00
proto Merge branch staging/electro-release into master 2014-08-22 10:50:38 -05:00
registry Fix improper use of host-endian or signed pack/unpack 2014-06-30 02:50:10 -05:00
ropbuilder Retab lib 2013-08-30 16:28:33 -05:00
script Retab lib 2013-08-30 16:28:33 -05:00
services Retab lib 2013-08-30 16:28:33 -05:00
socket Fix improper use of host-endian or signed pack/unpack 2014-06-30 02:50:10 -05:00
sslscan Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
struct2 removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
sync Get rid of callcc 2013-09-23 19:36:26 -05:00
ui Merge branch staging/electro-release into master 2014-08-22 10:50:38 -05:00
zip Add support for spoofed zip Central Dir names at Entry level 2014-04-07 09:21:26 -05:00
LICENSE Rapid7 Comma Inc 2014-03-13 09:46:20 -05:00
arch.rb Fix host-endian related pack errors. See below for details. 2014-06-30 02:46:36 -05:00
codepage.map
…
compat.rb That's funny I changed the wrong method 2014-02-13 16:41:18 -06:00
constants.rb Add firefox platform, architecture, and payload. 2014-01-02 10:48:28 -06:00
elfparsey.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
elfscan.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
exceptions.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
file.rb Retab lib 2013-08-30 16:28:33 -05:00
image_source.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
job_container.rb Retab lib 2013-08-30 16:28:33 -05:00
logging.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
mac_oui.rb Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
machparsey.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
machscan.rb removed shebangs from files within rex 2013-11-07 18:51:59 -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 removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
pescan.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
platforms.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
poly.rb Retab lib 2013-08-30 16:28:33 -05:00
post.rb removed shebangs from files within rex 2013-11-07 18:51:59 -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 Add 'coding: binary' to all msf/rex library files 2014-08-17 17:31:53 -05:00
registry.rb Retab lib 2013-08-30 16:28:33 -05:00
ropbuilder.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
script.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
service.rb Retab lib 2013-08-30 16:28:33 -05:00
service_manager.rb Retab lib 2013-08-30 16:28:33 -05:00
socket.rb reverting port 0 behaviour in portspec 2014-06-25 13:07:22 -05:00
struct2.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
sync.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00
text.rb Merge remote-tracking branch 'upstream/master' into pr2075 2014-07-16 20:34:34 +01:00
thread_factory.rb Retab lib 2013-08-30 16:28:33 -05:00
time.rb Retab lib 2013-08-30 16:28:33 -05:00
transformer.rb Retab lib 2013-08-30 16:28:33 -05:00
ui.rb Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
zip.rb removed shebangs from files within rex 2013-11-07 18:51:59 -05:00