Brandon Turner 91bb0b6e10 Merge tag '2014072301' into staging/electro-release ...

Conflicts:
	Gemfile.lock
	modules/post/windows/gather/credentials/gpp.rb

This removes the active flag in the gpp.rb module.  According to Lance,
the active flag is no longer used.

2014-08-06 15:58:12 -05:00

..

android

Add the updated bins from timwr.

2014-03-25 09:39:53 -07:00

cpuinfo

Undeleting cpuinfo.ia64.bin

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

exploits

Land #3403 - MS13-097 Registry Symlink IE Sandbox Escape

2014-06-26 13:48:28 -05: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

add common root words wordlist

2014-06-14 14:13:59 -05:00

js

Land #3086, Android Java Meterpreter updates

2014-06-02 17:28:38 -05:00

lab

Permission changes (to sync)

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

meterpreter

Land #3520 : Update Linux Meterpreter Binaries

2014-07-15 09:27:30 +10:00

msfcrawler

Replace hpricot by nokogiri

2014-07-17 00:14:07 +02: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 master for testing of #2809

2014-07-06 22:27:58 -05:00

post

Fix race condition

2014-03-03 23:41:25 +00:00

ropdb

Add module for CVE-2013-3346

2013-12-16 14:13:47 -06: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

MEM_RESERVE too

2014-06-08 17:37:57 +01:00

webcam

Fix transparent background, add VISIBLE option.

2014-06-06 16:52:00 -05:00

wmap

First step on module cleaning.

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

wordlists

Comments dont work with auth_brute.rb

2014-05-18 21:14:17 +02: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.x64.dll

Update project VS 2013, clean CLI build

2013-12-20 09:49:15 +10:00

vncdll.x86.dll

Update project VS 2013, clean CLI build

2013-12-20 09:49:15 +10:00