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

Merge master with merge of PR #4225

bug/bundler_fix
HD Moore 2014-12-02 11:58:30 -06:00
parent fc96d011ab 40220564a7
commit b29e53984e
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/exploits/windows/browser/ie_setmousecapture_uaf.rb
View File

@ -54,10 +54,9 @@ class Metasploit3 < Msf::Exploit::Remote
'BrowserRequirements' => 'BrowserRequirements' =>
{ {
:source => /script/i, :source => /script/i,
:os_name => OperatingSystems::WINDOWS, :os_name => 'Windows 7',
:ua_name => HttpClients::IE, :ua_name => HttpClients::IE,
:ua_ver => "9.0", :ua_ver => "9.0",
:os_flavor => "7",
:office => /2007|2010/ :office => /2007|2010/
}, },
'Targets' => 'Targets' =>

3
modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb
View File

@ -58,10 +58,9 @@ class Metasploit3 < Msf::Exploit::Remote
'BrowserRequirements' => 'BrowserRequirements' =>
{ {
:source => /script/i, :source => /script/i,
:os_name => OperatingSystems::WINDOWS, :os_name => 'Windows 7',
:ua_name => HttpClients::IE, :ua_name => HttpClients::IE,
:ua_ver => "9.0", :ua_ver => "9.0",
:os_flavor => "7",
:java => /1\.6|6\.0/, :java => /1\.6|6\.0/,
:mshtml_build => lambda { |ver| ver.to_i.between?(16446, 16490) } # May 17 mshtml to MS13-Jun :mshtml_build => lambda { |ver| ver.to_i.between?(16446, 16490) } # May 17 mshtml to MS13-Jun
}, },

3
modules/exploits/windows/browser/ms14_012_cmarkup_uaf.rb
View File

@ -44,8 +44,7 @@ class Metasploit3 < Msf::Exploit::Remote
'BrowserRequirements' => 'BrowserRequirements' =>
{ {
:source => /script|headers/i, :source => /script|headers/i,
:os_name => Msf::OperatingSystems::WINDOWS, :os_name => 'Windows 7',
:os_flavor => Msf::OperatingSystems::WindowsVersions::SEVEN,
:ua_name => Msf::HttpClients::IE, :ua_name => Msf::HttpClients::IE,
:ua_ver => '10.0', :ua_ver => '10.0',
:mshtml_build => lambda { |ver| ver.to_i < 16843 }, :mshtml_build => lambda { |ver| ver.to_i < 16843 },