Tod Beardsley c5f52ba0b1 Merge master to unstable so it's possible to merge back ...

This should also resolve the conflict introduced by #1913 (and #1062).
Unstable modules should hit the unstable directory to avoid problems like this.

Conflicts:
	unstable-modules/exploits/incomplete/multi/http/splunk_upload_app_exec.rb

2013-11-07 23:37:23 -06:00

..

android

Land #1708, android meterpreter

2013-05-28 12:19:45 -05:00

cpuinfo

Undeleting cpuinfo.ia64.bin

2011-11-17 08:47:49 -06:00

exploits

Merge master to unstable so it's possible to merge back

2013-11-07 23:37:23 -06:00

gui/lib

Drop msfgui.jar, too.

2013-04-22 16:03:38 -05:00

ipwn

Support for embedded autorun commands

2007-10-23 23:22:53 +00:00

java

Java payload bins

2013-04-11 13:08:16 -05:00

john

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

js

Add support for firefox 25.

2013-10-30 12:19:22 -05:00

lab

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

meterpreter

Meterpreter bins after Meterpreter PR 32

2013-10-24 15:15:49 -05:00

msfcrawler

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

msfpescan

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

passivex

Commit the PassiveX DLL updated to build with Visual Studio C++ 2008. Removed some compiler warnings. Use VirtualProtect to make second stage RWX. Use WSASocketA() over socket() for second stage compatibility. Seems to now work with the shell stage (Tested on XPSP2/IE7) but still not working with meterpreter.

2009-11-11 00:39:38 +00:00

php

Merge results initialization fix

2012-01-31 01:29:44 -06:00

post

Updates to enum_artifacts

2012-01-26 19:35:39 -05:00

ropdb

Use safe_negate_size for hxds

2013-10-03 23:15:29 -05:00

snmp/mibs

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

sounds

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

templates

Add MSI bins

2013-09-27 20:03:19 +01:00

wmap

First step on module cleaning.

2012-03-02 10:18:32 -06:00

wordlists

Delete newline

2013-10-28 09:01:00 -05:00

eicar.com

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

eicar.txt

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

emailer_config.yaml

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

isight.bundle

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

mime.yml

Cutting over rails3 to master.

2012-04-15 23:35:38 -05:00

vncdll.dll

Permission changes (to sync)

2011-11-10 19:48:32 -06:00

vncdll.x64.dll

Permission changes (to sync)

2011-11-10 19:48:32 -06:00