James Lee 8c259fb779 Merge branch 'rapid7' into feature/4905 ...

Conflicts:
	data/meterpreter/ext_server_stdapi.jar
	data/meterpreter/meterpreter.jar
	external/source/meterpreter/java/src/meterpreter/com/metasploit/meterpreter/Meterpreter.java
	modules/auxiliary/server/browser_autopwn.rb

2012-05-01 15:35:44 -06:00

..

armitage

fix a compatability issue with latest msf changes.

2012-04-17 01:04:12 -04:00

cpuinfo

Undeleting cpuinfo.ia64.bin

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

exploits

Permission change, ignore

2012-04-23 13:42:18 -05:00

gui

Permission changes

2012-01-31 00:33:21 -06:00

ipwn

Support for embedded autorun commands

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

java

Squashed commit of the following:

2012-04-16 13:15:33 -06:00

john

Permission changes (to sync)

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

lab

Permission changes (to sync)

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

meterpreter

Merge branch 'rapid7' into feature/4905

2012-05-01 15:35:44 -06:00

msfcrawler

Permission changes (to sync)

2011-11-10 19:48:32 -06: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

snmp/mibs

Permission changes (to sync)

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

sounds

Permission changes (to sync)

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

sql/migrate

Lift a migration from Pro -- workspace_members

2012-04-16 12:45:05 -05:00

svn/auth/svn.ssl.server

Permission changes (to sync)

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

templates

Adjusted the function pointer to the right offset

2012-02-06 16:39:10 +02:00

wmap

First step on module cleaning.

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

wordlists

Added new pass for tomcat

2012-04-05 11:18:41 +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.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