Fix a merge error

2014-05-18 11:08:04 -05:00 · 2014-05-18 11:08:04 -05:00 · a8bf53479d
parent a844b5c30a
commit a8bf53479d
1 changed files with 2 additions and 1 deletions
--- a/lib/msf/core/exploit/remote/browser_exploit_server.rb
+++ b/lib/msf/core/exploit/remote/browser_exploit_server.rb
@ -57,8 +57,9 @@ module Msf
      :office      => 'office',      # Example: "2007", "2010"
      :java        => 'java',        # Example: 1.6, 1.6.0.0
      :clsid       => 'clsid',       # ActiveX clsid. Also requires the :method key
-      :method      => 'method'       # ActiveX method. Also requires the :clsid key
+      :method      => 'method',       # ActiveX method. Also requires the :clsid key
      :mshtml_build => 'mshtml_build', # mshtml build. Example: "65535"
+      :flash        => 'flash'         # Example: "12.0" (chrome/ff) or "12.0.0.77" (IE)
    }

    def initialize(info={})