James Lee a65ee6cf30 Land #3373, recog ... Conflicts: Gemfile Gemfile.lock data/js/detect/os.js lib/msf/core/exploit/remote/browser_exploit_server.rb modules/exploits/android/browser/webview_addjavascriptinterface.rb		2014-10-03 18:05:58 -05:00
..
android	Recompiled again.	2014-07-27 22:23:26 -07:00
cpuinfo	Undeleting cpuinfo.ia64.bin	2011-11-17 08:47:49 -06:00
exploits	Add some common UXSS scripts.	2014-09-09 02:31:27 -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	Revert "Various merge resolutions from master <- staging"	2014-08-22 10:17:44 -05:00
js	Land #3373, recog	2014-10-03 18:05:58 -05:00
lab	Permission changes (to sync)	2011-11-10 19:48:32 -06:00
meterpreter	Land #3501, @AnwarMohamed's android meterpreter commands.	2014-08-09 16:29:59 -05: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	Add the 'guest' IPMI user	2014-09-01 07:01:06 -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.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