From 8fb6bedd947c194468ce4ffebbac6b075caec663 Mon Sep 17 00:00:00 2001
From: jvazquez-r7 <juan_vazquez@rapid7.com>
Date: Mon, 13 Jul 2015 18:23:39 -0500
Subject: [PATCH] Delete as3 detecotr

---
 data/flash_detector/detector.swf              | Bin 801 -> 0 bytes
 external/source/flash_detector/Detector.as    |  36 ------------------
 .../exploit/remote/browser_exploit_server.rb  |   2 +-
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 data/flash_detector/detector.swf
 delete mode 100755 external/source/flash_detector/Detector.as

diff --git a/data/flash_detector/detector.swf b/data/flash_detector/detector.swf
deleted file mode 100644
index e7a48d93691d0907316c7141d864790570b99d71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 801
zcmV++1K#{vS5qC`1ONaK0{{SB001BW06YKujv4yj=Vl0?JwAo?b#KsqVKo~Xixy4a
z1v37mOh!q!duw(1D_l1z3z0VgHxB9Y;ryOt+H4UaGwq-bc5tB0m@amJ@Zeci1_<fO
z>!QZnT84W^-kDu!b~qNjlRVSVp3_xhTH3JNC+2)1J*>=-p>|kv2*_BK)@TdzxW~s5
zRX~U5S-?);A+G44YL3M0*f=<)^i{biPBGOIR$l<Z>YO&{zPAusrYQ+MNi=aD#T4!$
zPkS*y<NE;B@xS6PzC>6Mr~&jb2>K)qny&rD&(ESY3$E?lK{?1zUms&{I3Vb0<VS_*
zF1j}Q^8?U=u{T<{ehV~&A$V*KJnI^`%Kh0}0?H#*zs>PAfZnw)6Q3%5yC1XyKaFMW
zh();^#l%$yYUu1F6xNLje$A1ok9CORez%6DkmYl83$w83pe+7>tTq6gI*Z<$H1=`b
zuAKe}IlLQ<S8o~m_Fg^&Q-VScLb8hzkv#ZuU3d!%5LVOXiT-lyBGF+YBc$|qCo+#;
zUEAX*FyO-MdtWgzHzKLP*yA5!9tI(cMYsNRCJQ9|?0=Z3R{T2<t7@XzeC3~&<6-})
zFB+}F3|%({se3M9=I#OC5Qdpk8*}$>z*K{>h}f%=FRX71&F=|ENB4n{I3MQS;6FB;
z%w2iKvPqvxFbM5*%MOZ9@|W~$RwJ}aOUKSO<xv1~IO#bnV#30~vj&fQ5+Fn(vZM=-
z8KqA6k?jeD*M93r7#uSNXRJ=MYM|C$=%Wd^SxLq*gj#dN#!|0ug{UrNk*+ehX0rvP
zpQ_7?krROD4ZImF#pYMSaHk>iSLaT<vm~_kkN#U!h~h?&B#3?R%e4H(^eJy-k#ccn
zPL#3(malZs1#iRb(=?xOiOCHk;evL0BQszQBdaA|W5f6f@Fn;u&2#LsX~0VmZHcwT
z)hRG^aPlwv33$`FaY30}Ky9&fmjB9lYWYXl3TW*1kJdKcHxN77*d`GcbGtx74G_wW
fR%9(~StVC8dl-w$UO~H-tSNtxQXYVx{vnQkW;cXF

diff --git a/external/source/flash_detector/Detector.as b/external/source/flash_detector/Detector.as
deleted file mode 100755
index 664ed66dd6..0000000000
--- a/external/source/flash_detector/Detector.as
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
-Code to do flash version detection from ActionScript
-
-* How to build:
-    1. Use Flex SDK 4.6 / AIRSDK 18 
-    2. Build with: mxmlc -o msf.swf Exploit.as
-*/
-
-package
-{
-    import flash.display.Sprite
-    import flash.external.ExternalInterface
-    import flash.system.Capabilities
-
-    public class Detector extends Sprite
-	{
-                
-        public function Detector()
-        {
-            var version:String = getVersion()
-            ExternalInterface.call("setFlashVersion", version)
-        }
-        
-        private function getVersion():String
-        {
-            try {
-                var version:String = flash.system.Capabilities.version
-                version = version.split(/ /)[1]
-                version = version.replace(/,/g, ".")
-                return version
-            } catch (err:Error) {
-                return ""
-            }
-        }
-    }
-}
diff --git a/lib/msf/core/exploit/remote/browser_exploit_server.rb b/lib/msf/core/exploit/remote/browser_exploit_server.rb
index 38cdcc9151..b2773491a0 100644
--- a/lib/msf/core/exploit/remote/browser_exploit_server.rb
+++ b/lib/msf/core/exploit/remote/browser_exploit_server.rb
@@ -547,7 +547,7 @@ module Msf
     end
 
     def load_swf_detection
-      path = ::File.join(Msf::Config.data_directory, 'flash_detector', 'detector.swf')
+      path = ::File.join(Msf::Config.data_directory, 'flash_detector', 'flashdetector.swf')
       swf =  ::File.open(path, 'rb') { |f| swf = f.read }
 
       swf