Updating MSXML module with more targets

Remove trailing space
Merge branch 'master' into release
2012-06-20 15:07:47 -05:00 · 2012-06-19 16:43:37 -05:00 · 2012-06-18 20:06:01 -05:00 · 2012-06-15 15:11:04 -05:00 · 2012-06-14 10:36:33 -05:00 · 2012-06-13 14:34:15 -05:00
17729 changed files with 2056434 additions and 927428 deletions
@@ -1,41 +0,0 @@
-## Steps to reproduce
-
-How'd you do it?
-
-1. ...
-2. ...
-
-This section should also tell us any relevant information about the
-environment; for example, if an exploit that used to work is failing,
-tell us the victim operating system and service versions.
-
-## Expected behavior
-
-What should happen?
-
-## Current behavior
-
-What happens instead?
-
-You might also want to check the last ~1k lines of
-`/opt/metasploit/apps/pro/engine/config/logs/framework.log` or
-`~/.msf4/logs/framework.log` for relevant stack traces
-
-
-## System stuff
-
-### Metasploit version
-
-Get this with the `version` command in msfconsole (or `git log -1 --pretty=oneline` for a source install).
-
-### I installed Metasploit with:
- [ ] Kali package via apt
- [ ] Omnibus installer (nightly)
- [ ] Commercial/Community installer (from http://www.rapid7.com/products/metasploit/download.jsp)
- [ ] Source install (please specify ruby version)
-
-### OS
-
-What OS are you running Metasploit on?
-
-
@@ -1,14 +0,0 @@
-
-Tell us what this change does. If you're fixing a bug, please mention
-the github issue number.
-
-## Verification
-
-List the steps needed to make sure this thing works
-
- [ ] Start `msfconsole`
- [ ] `use exploit/windows/smb/ms08_067_netapi`
- [ ] ...
- [ ] **Verify** the thing does what it should
- [ ] **Verify** the thing does not do what it should not
-
@@ -1,87 +1,11 @@
-.bundle
-Gemfile.local
-Gemfile.local.lock
-# Rubymine project directory
-.idea
-# Sublime Text project directory (not created by ST by default)
-.sublime-project
-# RVM control file, keep this to avoid backdooring Metasploit
-.rvmrc
-# Allow for a local choice of (unsupported / semi-supported) ruby versions
-# See PR #4136 for usage, but example usage for rvm:
-#   rvm --create --versions-conf use 2.1.4@metasploit-framework
-# Because rbenv doesn't use .versions.conf, to achieve this same functionality, run:
-#   rbenv shell 2.1.4
-.versions.conf
-# YARD cache directory
-.yardoc
-# Mac OS X files
-.DS_Store
-# database config for testing
-config/database.yml
-# target config file for testing
-features/support/targets.yml
-# simplecov coverage data
-coverage
-doc/
+data/meterpreter/ext_server_pivot.dll
+data/meterpreter/ext_server_pivot.x64.dll
 external/source/meterpreter/java/bin
 external/source/meterpreter/java/build
 external/source/meterpreter/java/extensions
 external/source/javapayload/bin
 external/source/javapayload/build
-# Java binary ignores. Replace the 5 above with this once we're merged.
-external/source/javapayload/*/.classpath
-external/source/javapayload/*/.project
-external/source/javapayload/*/.settings
-external/source/javapayload/*/bin
-external/source/javapayload/*/target
-external/source/javapayload/*/*/.classpath
-external/source/javapayload/*/*/.project
-external/source/javapayload/*/*/.settings
-external/source/javapayload/*/*/bin
-external/source/javapayload/*/*/target
-# Packaging directory
-pkg
 tags
 *.swp
 *.orig
 *.rej
-*~
-# Ignore backups of retabbed files
-*.notab
-
-# ignore Visual Studio external source garbage
-*.suo
-*.sdf
-*.opensdf
-*.user
-
-# Rails log directory
-/log
-# Rails tmp directory
-/tmp
-
-# ignore release/debug folders for exploits
-external/source/exploits/**/Debug
-external/source/exploits/**/Release
-
-# Avoid checking in Meterpreter binaries. These are supplied upstream by
-# the metasploit-payloads gem.
-data/meterpreter/*.dll
-data/meterpreter/*.php
-data/meterpreter/*.py
-data/meterpreter/*.bin
-data/meterpreter/*.jar
-data/meterpreter/*.lso
-data/android
-data/java
-
-# Avoid checking in Meterpreter libs that are built from
-# private source. If you're interested in this functionality,
-# check out Metasploit Pro: http://metasploit.com/download
-data/meterpreter/ext_server_pivot.*.dll
-
-# Avoid checking in metakitty, the source for
-# https://rapid7.github.io/metasploit-framework. It's an orphan branch.
-/metakitty
-.vagrant
@@ -1,3 +0,0 @@
-[submodule "external/source/ReflectiveDLLInjection"]
-	path = external/source/ReflectiveDLLInjection
-	url = https://github.com/rapid7/ReflectiveDLLInjection.git
@@ -1,160 +0,0 @@
-acammack-r7 <acammack-r7@github>     Adam Cammack <Adam_Cammack@rapid7.com>
-bcook-r7 <bcook-r7@github>           <busterb@gmail.com>
-bcook-r7 <bcook-r7@github>           Brent Cook <bcook@rapid7.com>
-bturner-r7 <bturner-r7@github>       Brandon Turner <brandon_turner@rapid7.com>
-bpatterson-r7 <bpatterson-r7@github> Brian Patterson <Brian_Patterson@rapid7.com>
-cdoughty-r7 <cdoughty-r7@github>     Chris Doughty <chris_doughty@rapid7.com>
-dheiland-r7 <dheiland-r7@github>     Deral Heiland <dh@layereddefense.com>
-dmaloney-r7 <dmaloney-r7@github>     David Maloney <DMaloney@rapid7.com>
-dmaloney-r7 <dmaloney-r7@github>     David Maloney <David_Maloney@rapid7.com>
-dmaloney-r7 <dmaloney-r7@github>     dmaloney-r7 <DMaloney@rapid7.com>
-dmohanty-r7 <dmohanty-r7@github>     Dev Mohanty <Dev_Mohanty@rapid7.com>
-dmohanty-r7 <dmohanty-r7@github>     Dev Mohanty <Dev_Mohanty@rapid7.com>
-dmohanty-r7 <dmohanty-r7@github>     dmohanty-r7 <Dev_Mohanty@rapid7.com>
-dmohanty-r7 <dmohanty-r7@github>     dmohanty-r7 <Dev_Mohanty@rapid7.com>
-ecarey-r7 <ecarey-r7@github>         Erran Carey <e@ipwnstuff.com>
-farias-r7 <farias-r7@github>         Fernando Arias <fernando_arias@rapid7.com>
-gmikeska-r7 <gmikeska-r7@github>     Greg Mikeska <greg_mikeska@rapid7.com>
-gmikeska-r7 <gmikeska-r7@github>     Gregory Mikeska <greg_mikeska@rapid7.com>
-jhart-r7 <jhart-r7@github>           Jon Hart <jon_hart@rapid7.com>
-jlee-r7 <jlee-r7@github>             <egypt@metasploit.com> # aka egypt
-jlee-r7 <jlee-r7@github>             <james_lee@rapid7.com>
-kgray-r7 <kgray-r7@github>           Kyle Gray <kyle_gray@rapid7.com>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <lance.sanchez+github@gmail.com>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <lance.sanchez@rapid7.com>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <lance@AUS-MAC-1041.local>
-lsanchez-r7 <lsanchez-r7@github>     Lance Sanchez <lance@aus-mac-1041.aus.rapid7.com>
-lsanchez-r7 <lsanchez-r7@github>     darkbushido <lance.sanchez@gmail.com>
-lsato-r7 <lsato-r7@github>           Louis Sato <lsato@rapid7.com>
-pdeardorff-r7 <pdeardorff-r7@github> Paul Deardorff <Paul_Deardorff@rapid7.com>
-pdeardorff-r7 <pdeardorff-r7@github> pdeardorff-r7 <paul_deardorff@rapid7.com>
-sgonzalez-r7 <sgonzalez-r7@github>   Sonny Gonzalez <sonny_gonzalez@rapid7.com>
-shuckins-r7 <shuckins-r7@github>     Samuel Huckins <samuel_huckins@rapid7.com>
-todb-r7 <todb-r7@github>             Tod Beardsley <tod_beardsley@rapid7.com>
-todb-r7 <todb-r7@github>             Tod Beardsley <todb@metasploit.com>
-todb-r7 <todb-r7@github>             Tod Beardsley <todb@packetfu.com>
-wchen-r7 <wchen-r7@github>           <msfsinn3r@gmail.com> # aka sinn3r
-wchen-r7 <wchen-r7@github>           <wei_chen@rapid7.com>
-wvu-r7 <wvu-r7@github>               William Vu <William_Vu@rapid7.com>
-wvu-r7 <wvu-r7@github>               William Vu <wvu@metasploit.com>
-wvu-r7 <wvu-r7@github>               William Vu <wvu@cs.nmt.edu>
-wvu-r7 <wvu-r7@github>               wvu-r7 <William_Vu@rapid7.com>
-wwebb-r7 <wwebb-r7@github>           William Webb <William_Webb@rapid7.com>
-
-# Above this line are current Rapid7 employees. Below this paragraph are
-# volunteers, former employees, and potential Rapid7 employees who, at
-# one time or another, had some largeish number of commits landed on
-# rapid7/metasploit-framework master branch.  This should be refreshed
-# periodically. If you're on this list and would like to not be, just
-# let todb@metasploit.com know.
-
-bannedit <bannedit@github>             David Rude <bannedit0@gmail.com>
-bcoles <bcoles@github>                 bcoles <bcoles@gmail.com>
-bcoles <bcoles@github>                 Brendan Coles <bcoles@gmail.com>
-bokojan <bokojan@github>               parzamendi-r7 <peter_arzamendi@rapid7.com>
-brandonprry <brandonprry@github>       <bperry@brandons-mbp.attlocal.net>
-brandonprry <brandonprry@github>       Brandon Perry <bperry.volatile@gmail.com>
-brandonprry <brandonprry@github>       Brandon Perry <bperry@bperry-rapid7.(none)>
-brandonprry <brandonprry@github>       Brandon Perry <brandon.perry@zenimaxonline.com>
-bwall <bwall@github>                   (B)rian (Wall)ace <nightstrike9809@gmail.com>
-bwall <bwall@github>                   Brian Wallace <bwall@openbwall.com>
-ceballosm <ceballosm@github>           Mario Ceballos <mc@metasploit.com>
-Chao-mu <Chao-Mu@github>               Chao Mu <chao.mu@minorcrash.com>
-Chao-mu <Chao-Mu@github>               chao-mu <chao.mu@minorcrash.com>
-Chao-mu <Chao-Mu@github>               chao-mu <chao@confusion.(none)>
-ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <chris.riley@c22.cc>
-ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <reg@c22.cc>
-claudijd <claudijd@github>             Jonathan Claudius <claudijd@yahoo.com>
-claudijd <claudijd@github>             Jonathan Claudius <jclaudius@trustwave.com>
-corelanc0d3r <corelanc0d3r@github>     corelanc0d3r <peter.ve@corelan.be>
-corelanc0d3r <corelanc0d3r@github>     Peter Van Eeckhoutte (corelanc0d3r) <peter.ve@corelan.be>
-crcatala <crcatala@github>             Christian Catalan <ccatalan@rapid7.com>
-darkoperator <darkoperator@github>     Carlos Perez <carlos_perez@darkoperator.com>
-efraintorres <efraintorres@github>     efraintorres <etlownoise@gmail.com>
-efraintorres <efraintorres@github>     et <>
-espreto <espreto@github>               Roberto Soares <robertoespreto@gmail.com>
-espreto <espreto@github>               Roberto Soares <robertoespreto@gmail.com>
-espreto <espreto@github>               Roberto Soares Espreto <robertoespreto@gmail.com>
-espreto <espreto@github>               Roberto Soares Espreto <robertoespreto@gmail.com>
-fab <fab@???>                          fab <> # fab at revhosts.net (Fabrice MOURRON)
-FireFart <FireFart@github>             <FireFart@users.noreply.github.com>
-FireFart <FireFart@github>             Christian Mehlmauer <firefart@gmail.com>
-g0tmi1k <g0tmi1k@github>               <g0tmi1k@users.noreply.github.com>
-g0tmi1k <g0tmi1k@github>               <have.you.g0tmi1k@gmail.com>
-h0ng10 <h0ng10@github>                 h0ng10 <hansmartin.muench@googlemail.com>
-h0ng10 <h0ng10@github>                 Hans-Martin Münch <hansmartin.muench@googlemail.com>
-hdm <hdm@github>                       HD Moore <hd_moore@rapid7.com>
-hdm <hdm@github>                       HD Moore <hdm@digitaloffense.net>
-hdm <hdm@github>                       HD Moore <x@hdm.io>
-jabra <jabra@github>                   Josh Abraham <jabra@spl0it.org>
-jabra <jabra@github>                   Joshua Abraham <jabra@spl0it.org>
-jcran <jcran@github>                   <jcran@0x0e.org>
-jcran <jcran@github>                   <jcran@pentestify.com>
-jcran <jcran@github>                   <jcran@pwnieexpress.com>
-jcran <jcran@github>                   <jcran@rapid7.com>
-jduck <jduck@github>                   <github.jdrake@qoop.org>
-jduck <jduck@github>                   <jdrake@qoop.org>
-jgor <jgor@github>                     jgor <jgor@indiecom.org>
-joevennix <joevennix@github>           <Joe_Vennix@rapid7.com>
-joevennix <joevennix@github>           <joev@metasploit.com>
-joevennix <joevennix@github>           Joe Vennix <joevennix@gmail.com>
-joevennix <joevennix@github>           jvennix-r7 <Joe_Vennix@rapid7.com>
-juanvazquez <juanvazquez@github>       jvazquez-r7 <juan.vazquez@metasploit.com>
-juanvazquez <juanvazquez@github>       jvazquez-r7 <juan_vazquez@rapid7.com>
-kernelsmith <kernelsmith@github>       Joshua Smith <kernelsmith@kernelsmith.com>
-kernelsmith <kernelsmith@github>       Joshua Smith <kernelsmith@metasploit.com>
-kernelsmith <kernelsmith@github>       kernelsmith <kernelsmith@kernelsmith>
-kost <kost@github>                     Vlatko Kosturjak <kost@linux.hr>
-kris <kris@???>                        kris <>
-KronicDeth <KronicDeth@github>         Luke Imhoff <luke_imhoff@rapid7.com>
-m-1-k-3 <m-1-k-3@github>               m-1-k-3 <github@s3cur1ty.de>
-m-1-k-3 <m-1-k-3@github>               m-1-k-3 <m1k3@s3cur1ty.de>
-m-1-k-3 <m-1-k-3@github>               m-1-k-3 <michael.messner@integralis.com>
-m-1-k-3 <m-1-k-3@github>               Michael Messner <devnull@s3cur1ty.de>
-Meatballs1 <Meatballs1@github>         <eat_meatballs@hotmail.co.uk>
-Meatballs1 <Meatballs1@github>         <Meatballs1@users.noreply.github.com>
-mubix <mubix@github>                   Rob Fuller <jd.mubix@gmail.com>
-net-ninja <net-ninja@github.com>       Steven Seeley <steventhomasseeley@gmail.com>
-nevdull77 <nevdull77@github>           Patrik Karlsson <patrik@cqure.net>
-nmonkee <nmonkee@github>               nmonkee <dave@northern-monkee.co.uk>
-nullbind <nullbind@github>             nullbind <scott.sutherland@nullbind.com>
-nullbind <nullbind@github>             Scott Sutherland <scott.sutherland@nullbind.com>
-ohdae <ohdae@github>                   ohdae <bindshell@live.com>
-oj <oj@github>                         <oj@buffered.io>
-r3dy <r3dy@github>                     Royce Davis <r3dy@Royces-MacBook-Pro.local>
-r3dy <r3dy@github>                     Royce Davis <rdavis@Royces-MacBook-Pro-2.local>
-r3dy <r3dy@github>                     Royce Davis <royce.e.davis@gmail.com>
-rep <mschloesser-r7@github>            Mark Schloesser <mark_schloesser@rapid7.com>
-rep <mschloesser-r7@github>            mschloesser-r7 <mark_schloesser@rapid7.com>
-Rick Flores <0xnanoquetz9l@gmail.com>  Rick Flores (nanotechz9l) <0xnanoquetz9l@gmail.com>
-rsmudge <rsmudge@github>               Raphael Mudge <rsmudge@gmail.com> # Aka `butane
-schierlm <schierlm@github>             Michael Schierl <schierlm@gmx.de> # Aka mihi
-scriptjunkie <scriptjunkie@github>     Matt Weeks <scriptjunkie@scriptjunkie.us>
-scriptjunkie <scriptjunkie@github>     scriptjunkie <scriptjunkie@scriptjunkie.us>
-skape <skape@???>                      Matt Miller <mmiller@hick.org>
-spoonm <spoonm@github>                 Spoon M <spoonm@gmail.com>
-stufus <stufus@github>                 Stuart <stufus@users.noreply.github.com>
-stufus <stufus@github>                 Stuart Morgan <stuart.morgan@mwrinfosecurity.com>
-swtornio <swtornio@github>             Steve Tornio <swtornio@gmail.com>
-Tasos Laskos <Tasos_Laskos@rapid7.com> Tasos Laskos <Tasos_Laskos@rapid7.com>
-techpeace <techpeace@github>           Matt Buck <Matthew_Buck@rapid7.com>
-techpeace <techpeace@github>           Matt Buck <techpeace@gmail.com>
-timwr <timwr@github>                   <timrlw@gmail.com>
-TomSellers <TomSellers@github>         Tom Sellers <tom@fadedcode.net>
-trevrosen <trevrosen@github>           Trevor Rosen <trevor@catapult-creative.com>
-trevrosen <trevrosen@github>           Trevor Rosen <Trevor_Rosen@rapid7.com>
-TrustedSec <davek@trustedsec.com>      trustedsec <davek@trustedsec.com>
-void-in <void-in@github>               root <void-in@users.noreply.github.com>
-void-in <void-in@github>               void-in <root@localhost.localdomain>
-void-in <void-in@github>               void-in <waqas.bsquare@gmail.com>
-void-in <void-in@github>               void_in <root@localhost.localdomain>
-void-in <void-in@github>               Waqas Ali <waqas.bsquare@gmail.com>
-zeroSteiner <zeroSteiner@github>       Spencer McIntyre <zeroSteiner@gmail.com>
-
-
-# Aliases for utility author names. Since they're fake, typos abound
-
-Tab Assassin <tabassassin@metasploit.com> Tabassassin <tabassassin@metasploit.com>
-Tab Assassin <tabassassin@metasploit.com> TabAssassin <tabasssassin@metasploit.com>
-Tab Assassin <tabassassin@metasploit.com> Tabasssassin <tabassassin@metasploit.com>
-Tab Assassin <tabassassin@metasploit.com> URI Assassin <tabassassin@metasploit.com>
@@ -1,3 +0,0 @@
--color
--format Fivemat
--require spec_helper
@@ -1,84 +0,0 @@
-# This list was intially created by analyzing the last three months (51
-# modules) committed to Metasploit Framework. Many, many older modules
-# will have offenses, but this should at least provide a baseline for
-# new modules.
-#
-# Updates to this file should include a 'Description' parameter for any
-# explaination needed.
-
-# inherit_from: .rubocop_todo.yml
-
-Metrics/ClassLength:
-  Description: 'Most Metasploit modules are quite large. This is ok.'
-  Enabled: true
-  Exclude:
-    - 'modules/**/*'
-
-Style/Documentation:
-  Enabled: true
-  Description: 'Most Metasploit modules do not have class documentation.'
-  Exclude:
-    - 'modules/**/*'
-
-Style/Encoding:
-  Enabled: true
-  Description: 'We prefer binary to UTF-8.'
-  EnforcedStyle: 'when_needed'
-
-Metrics/LineLength:
-  Description: >-
-                  Metasploit modules often pattern match against very
-                  long strings when identifying targets.
-  Enabled: true
-  Max: 180
-
-Metrics/MethodLength:
-  Enabled: true
-  Description: >-
-                  While the style guide suggests 10 lines, exploit definitions
-                  often exceed 200 lines.
-  Max: 300
-
-# Basically everything in metasploit needs binary encoding, not UTF-8.
-# Disable this here and enforce it through msftidy
-Style/Encoding:
-  Enabled: false
-
-# %q() is super useful for long strings split over multiple lines and
-# is very common in module constructors for things like descriptions
-Style/UnneededPercentQ:
-  Enabled: false
-
-Style/NumericLiterals:
-  Enabled: false
-  Description: 'This often hurts readability for exploit-ish code.'
-
-Style/SpaceInsideBrackets:
-  Enabled: false
-  Description: 'Until module template are final, most modules will fail this.'
-
-Style/StringLiterals:
-  Enabled: false
-  Description: 'Single vs double quote fights are largely unproductive.'
-
-Style/WordArray:
-  Enabled: false
-  Description: 'Metasploit prefers consistent use of []'
-
-Style/RedundantBegin:
-  Exclude:
-    # this pattern is very common and somewhat unavoidable
-    # def run_host(ip)
-    #   begin
-    #     ...
-    #   rescue ...
-    #     ...
-    #   ensure
-    #     disconnect
-    #   end
-    # end
-    - 'modules/**/*'
-
-Documentation:
-  Exclude:
-    - 'modules/**/*'
@@ -1 +0,0 @@
-metasploit-framework
@@ -1 +0,0 @@
-2.3.1
@@ -1,57 +0,0 @@
-# RM_INFO is set when using Rubymine.  In Rubymine, starting SimpleCov is
-# controlled by running with coverage, so don't explicitly start coverage (and
-# therefore generate a report) when in Rubymine.  This _will_ generate a report
-# whenever `rake spec` is run.
-unless ENV['RM_INFO']
-	SimpleCov.start
-end
-
-SimpleCov.configure do
-  # ignore this file
-	add_filter '.simplecov'
-
-	#
-	# Changed Files in Git Group
-	# @see http://fredwu.me/post/35625566267/simplecov-test-coverage-for-changed-files-only
-	#
-
-	untracked = `git ls-files --exclude-standard --others`
-	unstaged = `git diff --name-only`
-	staged = `git diff --name-only --cached`
-	all = untracked + unstaged + staged
-	changed_filenames = all.split("\n")
-
-	add_group 'Changed' do |source_file|
-		changed_filenames.detect { |changed_filename|
-			source_file.filename.end_with?(changed_filename)
-		}
-	end
-
-	#
-	# Framework (msf) related groups
-	#
-
-	add_group 'Metasploit Framework', 'lib/msf'
-	add_group 'Metasploit Framework (Base)', 'lib/msf/base'
-	add_group 'Metasploit Framework (Core)', 'lib/msf/core'
-
-	#
-	# Other library groups
-	#
-
-	add_group 'Metasm', 'lib/metasm'
-	add_group 'PacketFu', 'lib/packetfu'
-	add_group 'Rex', 'lib/rex'
-	add_group 'RKelly', 'lib/rkelly'
-	add_group 'Ruby Mysql', 'lib/rbmysql'
-	add_group 'Ruby Postgres', 'lib/postgres'
-	add_group 'SNMP', 'lib/snmp'
-	add_group 'Zip', 'lib/zip'
-
-	#
-	# Specs are reported on to ensure that all examples are being run and all
-	# lets, befores, afters, etc are being used.
-	#
-
-	add_group 'Specs', 'spec'
-end
@@ -1,48 +0,0 @@
-sudo: false
-group: stable
-bundler_args: --without coverage development pcap
-cache: bundler
-addons:
-  postgresql: '9.3'
-  apt:
-    packages:
-      - libpcap-dev
-      - graphviz
-language: ruby
-rvm:
-  - '2.3.1'
-
-env:
-  - RAKE_TASKS="cucumber cucumber:boot" CREATE_BINSTUBS=true
-  - RAKE_TASKS=spec SPEC_OPTS="--tag content"
-  - RAKE_TASKS=spec SPEC_OPTS="--tag ~content"
-
-matrix:
-  fast_finish: true
-before_install:
-  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
-  - rake --version
-  # Fail build if msftidy is not successful
-  - ln -sf ../../tools/dev/pre-commit-hook.rb ./.git/hooks/post-merge
-  - ls -la ./.git/hooks
-  - ./.git/hooks/post-merge
-before_script:
-  - cp config/database.yml.travis config/database.yml
-  - bundle exec rake --version
-  - bundle exec rake db:create
-  - bundle exec rake db:migrate
-script:
-  # fail build if db/schema.rb update is not committed
-  - git diff --exit-code db/schema.rb && bundle exec rake $RAKE_TASKS
-
-notifications:
-  irc: "irc.freenode.org#msfnotify"
-
-git:
-  depth: 5
-
-# Blacklist certain branches from triggering travis builds
-branches:
-  except:
-    - gh-pages
-    - metakitty
@@ -1,10 +0,0 @@
--protected
--exclude samples/
--exclude \.ut\.rb/
--exclude \.ts\.rb/
--files CONTRIBUTING.md,COPYING,HACKING,LICENSE
-app/**/*.rb
-lib/msf/**/*.rb
-lib/metasploit/**/*.rb
-lib/rex/**/*.rb
-plugins/**/*.rb
@@ -1,52 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project maintainers at msfdev@metasploit.com. If
-the incident involves a committer, you may report directly to
-egypt@metasploit.com or todb@metasploit.com.
-
-All complaints will be reviewed and investigated and will result in a
-response that is deemed necessary and appropriate to the circumstances.
-Maintainers are obligated to maintain confidentiality with regard to the
-reporter of an incident.
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
@@ -1,118 +0,0 @@
-# Hello, World!
-
-Thanks for your interest in making Metasploit -- and therefore, the
-world -- a better place!
-
-Are you about to report a bug? Sorry to hear it. Here's our [Issue tracker].
-Please try to be as specific as you can about your problem; include steps
-to reproduce (cut and paste from your console output if it's helpful) and
-what you were expecting to happen.
-
-Are you about to report a security vulnerability in Metasploit itself?
-How ironic! Please take a look at Rapid7's [Vulnerability
-Disclosure Policy](https://www.rapid7.com/disclosure.jsp), and send
-your report to security@rapid7.com using our [PGP key].
-
-Are you about to contribute some new functionality, a bug fix, or a new
-Metasploit module? If so, read on...
-
-# Contributing to Metasploit
-
-What you see here in CONTRIBUTING.md is a bullet point list of the do's
-and don'ts of how to make sure *your* valuable contributions actually
-make it into Metasploit's master branch.
-
-If you care not to follow these rules, your contribution **will** be
-closed. Sorry!
-
-This is intended to be a **short** list. The [wiki] is much more
-exhaustive and reveals many mysteries. If you read nothing else, take a
-look at the standard [development environment setup] guide
-and Metasploit's [Common Coding Mistakes].
-
-## Code Contributions
-
-* **Do** stick to the [Ruby style guide].
-* **Do** get [Rubocop] relatively quiet against the code you are adding or modifying.
-* **Do** follow the [50/72 rule] for Git commit messages.
-* **Don't** use the default merge messages when merging from other branches.
-* **Do** create a [topic branch] to work on instead of working directly on `master`.
-* **Do** license your code as BSD 3-clause, BSD 2-clause, or MIT.
-
-### Pull Requests
-
-* **Do** target your pull request to the **master branch**. Not staging, not develop, not release.
-* **Do** specify a descriptive title to make searching for your pull request easier.
-* **Do** include [console output], especially for witnessable effects in `msfconsole`.
-* **Do** list [verification steps] so your code is testable.
-* **Don't** leave your pull request description blank.
-* **Don't** abandon your pull request. Being responsive helps us land your code faster.
-
-Pull requests [PR#2940] and [PR#3043] are a couple good examples to follow.
-
-#### New Modules
-
-* **Do** run `tools/dev/msftidy.rb` against your module and fix any errors or warnings that come up.
-  - It would be even better to set up `msftidy.rb` as a [pre-commit hook].
-* **Do** use the many module mixin [API]s. Wheel improvements are welcome; wheel reinventions, not so much.
-* **Don't** include more than one module per pull request.
-* **Do** include instructions on how to setup the vulnerable environment or software
-* **Do** include [Module Documentation](https://github.com/rapid7/metasploit-framework/wiki/Generating-Module-Documentation) showing sample run-throughs
-
-
-
-#### Scripts
-
-* **Don't** submit new [scripts].  Scripts are shipped as examples for
-  automating local tasks, and anything "serious" can be done with post
-  modules and local exploits.
-
-#### Library Code
-
-* **Do** write [RSpec] tests - even the smallest change in library land can thoroughly screw things up.
-* **Do** follow [Better Specs] - it's like the style guide for specs.
-* **Do** write [YARD] documentation - this makes it easier for people to use your code.
-* **Don't** fix a lot of things in one pull request. Small fixes are easier to validate.
-
-#### Bug Fixes
-
-* **Do** include reproduction steps in the form of verification steps.
-* **Do** include a link to any corresponding [Issues] in the format of
-  `See #1234` in your commit description.
-
-## Bug Reports
-
-* **Do** report vulnerabilities in Rapid7 software directly to security@rapid7.com.
-* **Do** write a detailed description of your bug and use a descriptive title.
-* **Do** include reproduction steps, stack traces, and anything else that might help us verify and fix your bug.
-* **Don't** file duplicate reports; search for your bug before filing a new report.
-
-If you need some more guidance, talk to the main body of open
-source contributors over on the [Freenode IRC channel],
-or e-mail us at the [metasploit-hackers] mailing list.
-
-Also, **thank you** for taking the few moments to read this far! You're
-already way ahead of the curve, so keep it up!
-
-[Issue Tracker]:http://r-7.co/MSF-BUGv1
-[PGP key]:http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x2380F85B8AD4DB8D
-[wiki]:https://github.com/rapid7/metasploit-framework/wiki
-[scripts]:https://github.com/rapid7/metasploit-framework/tree/master/scripts
-[development environment setup]:http://r-7.co/MSF-DEV
-[Common Coding Mistakes]:https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes
-[Ruby style guide]:https://github.com/bbatsov/ruby-style-guide
-[Rubocop]:https://rubygems.org/search?query=rubocop
-[50/72 rule]:http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[topic branch]:http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches
-[console output]:https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks
-[verification steps]:https://help.github.com/articles/writing-on-github#task-lists
-[PR#2940]:https://github.com/rapid7/metasploit-framework/pull/2940
-[PR#3043]:https://github.com/rapid7/metasploit-framework/pull/3043
-[pre-commit hook]:https://github.com/rapid7/metasploit-framework/blob/master/tools/dev/pre-commit-hook.rb
-[API]:https://rapid7.github.io/metasploit-framework/api
-[RSpec]:http://rspec.info
-[Better Specs]:http://betterspecs.org
-[YARD]:http://yardoc.org
-[Issues]:https://github.com/rapid7/metasploit-framework/issues
-[Freenode IRC channel]:http://webchat.freenode.net/?channels=%23metasploit&uio=d4
-[metasploit-hackers]:https://lists.sourceforge.net/lists/listinfo/metasploit-hackers
@@ -1,19 +1,19 @@
-Copyright (C) 2006-2016, Rapid7, Inc.
+Copyright (C) 2006-2012, Rapid7 Inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+	  this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
+	  this list of conditions and the following disclaimer in the documentation
+	  and/or other materials provided with the distribution.

-    * Neither the name of Rapid7, Inc. nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+    * Neither the name of Rapid7 LLC nor the names of its contributors
+	  may be used to endorse or promote products derived from this software
+	  without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -30,8 +30,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 The Metasploit Framework is provided under the 3-clause BSD license above.

-The copyright on this package is held by Rapid7, Inc.
+The copyright on this package is held by Rapid7 LLC.

-This license does not apply to several components within the Metasploit
-Framework source tree.  For more details see the LICENSE file.
+This license does not apply to the following components:
+ - The Bit-Struct library located under lib/bit-struct
+ - The OpenSSL library embedded into the Meterpreter payload binaries and the
+   corresponding header files in the source tree
+ - The Packet Sniffer SDK (MicroOLAP) library embedded into the Meterpreter
+   Sniffer extension. HD Moore has a single-seat developer license.
+ - The modified TightVNC binaries and their associated source code.
+ - The Byakugan plugin located under external/source/byakugan
+ - The Metasm library located under lib/metasm
+ - The PcapRub library located under external/pcaprub
+ - The Rabal library located under lib/rabal
+ - The PacketFu library located under lib/packetfu
+ - The Ruby-Lorcon library located under external/ruby-lorcon
+ - The SNMP library located under lib/snmp
+ - The Zip library located under lib/zip
+ - The SSHKey library located under lib/sshkey
+
+Details for the above packages can be found in the THIRD-PARTY file.

@@ -1,46 +1,6 @@
-source 'https://rubygems.org'
-# Add default group gems to `metasploit-framework.gemspec`:
-#   spec.add_runtime_dependency '<name>', [<version requirements>]
-gemspec name: 'metasploit-framework'
-
-# separate from test as simplecov is not run on travis-ci
-group :coverage do
-  # code coverage for tests
-  # any version newer than 0.5.4 gives an Encoding error when trying to read the source files.
-  # see: https://github.com/colszowka/simplecov/issues/127 (hopefully fixed in 0.8.0)
-  gem 'simplecov'
-end
-
-group :development do
-  # Markdown formatting for yard
-  gem 'redcarpet'
-  # generating documentation
-  gem 'yard'
-  # for development and testing purposes
-  gem 'pry'
-  # module documentation
-  gem 'octokit', '~> 4.0'
-  # rails-upgrade staging gems
-end
-
-group :development, :test do
-  # automatically include factories from spec/factories
-  gem 'factory_girl_rails'
-  # Make rspec output shorter and more useful
-  gem 'fivemat'
-  # running documentation generation tasks and rspec tasks
-  gem 'rake'
-  # Define `rake spec`.  Must be in development AND test so that its available by default as a rake test when the
-  # environment is development
-  gem 'rspec-rails'
-end
-
-group :test do
-  # cucumber extension for testing command line applications, like msfconsole
-  gem 'aruba'
-  # cucumber + automatic database cleaning with database_cleaner
-  gem 'cucumber-rails', :require => false
-  gem 'shoulda-matchers'
-  # Manipulate Time.now in specs
-  gem 'timecop'
-end
+source 'http://rubygems.org'
+gem 'rails', '3.2.2'
+gem 'metasploit_data_models', '0.0.2', :git => "git://github.com/rapid7/metasploit_data_models.git"
+gem 'pg', '>=0.13'
+gem 'msgpack'
+gem 'nokogiri'
@@ -1,34 +0,0 @@
-##
-# Example Gemfile.local file for Metasploit Framework
-#
-# The Gemfile.local file provides a way to use other gems that are not
-# included in the standard Gemfile provided with Metasploit.
-# This filename is included in Metasploit's .gitignore file, so local changes
-# to this file will not accidentally show up in future pull requests. This
-# example Gemfile.local includes all gems in Gemfile using instance_eval.
-# It also creates a new bundle group, 'local', to hold additional gems.
-#
-# This file will not be used by default within the framework. As such, one
-# must first install the custom Gemfile.local with bundle:
-#   bundle install --gemfile Gemfile.local
-#
-# Note that msfupdate does not consider Gemfile.local when updating the
-# framework. If it is used, it may be necessary to run the above bundle
-# command after the update.
-#
-###
-
-# Include the Gemfile included with the framework. This is very
-# important for picking up new gem dependencies.
-msf_gemfile = File.join(File.dirname(__FILE__), 'Gemfile')
-if File.readable?(msf_gemfile)
-  instance_eval(File.read(msf_gemfile))
-end
-
-# Create a custom group
-group :local do
-  # Use pry-debugger to step through code during development
-  gem 'pry-debugger', '~> 0.2'
-  # Add the lab gem so that the 'lab' plugin will work again
-  gem 'lab', '~> 0.2.7'
-end
@@ -1,285 +0,0 @@
-PATH
-  remote: .
-  specs:
-    metasploit-framework (4.12.8)
-      actionpack (~> 4.2.6)
-      activerecord (~> 4.2.6)
-      activesupport (~> 4.2.6)
-      bcrypt
-      filesize
-      jsobfu
-      json
-      metasm
-      metasploit-concern
-      metasploit-credential
-      metasploit-model
-      metasploit-payloads (= 1.1.11)
-      metasploit_data_models
-      msgpack
-      network_interface
-      nokogiri
-      octokit
-      openssl-ccm
-      packetfu
-      patch_finder
-      pcaprub
-      pg
-      railties
-      rb-readline-r7
-      recog
-      redcarpet
-      rex-powershell
-      rex-random_identifier
-      rex-registry
-      rex-text
-      rex-zip
-      robots
-      rubyzip
-      sqlite3
-      tzinfo
-      tzinfo-data
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
-      arel (~> 6.0)
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (6.0.3)
-    arel-helpers (2.3.0)
-      activerecord (>= 3.1.0, < 6)
-    aruba (0.14.1)
-      childprocess (~> 0.5.6)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      ffi (~> 1.9.10)
-      rspec-expectations (>= 2.99)
-      thor (~> 0.19)
-    bcrypt (3.1.11)
-    builder (3.2.2)
-    capybara (2.7.1)
-      addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.1)
-    contracts (0.14.0)
-    cucumber (2.3.3)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.4.0)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 3.2.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.4.0)
-      gherkin (~> 3.2.0)
-    cucumber-rails (1.4.3)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 3)
-      mime-types (>= 1.16, < 4)
-      nokogiri (~> 1.5)
-      railties (>= 3, < 5)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    factory_girl (4.7.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
-      railties (>= 3.0.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
-    filesize (0.1.1)
-    fivemat (1.3.2)
-    gherkin (3.2.0)
-    i18n (0.7.0)
-    jsobfu (0.4.1)
-      rkelly-remix (= 0.0.6)
-    json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    metasm (1.0.2)
-    metasploit-concern (2.0.1)
-      activemodel (~> 4.2.6)
-      activesupport (~> 4.2.6)
-      railties (~> 4.2.6)
-    metasploit-credential (2.0.2)
-      metasploit-concern
-      metasploit-model
-      metasploit_data_models
-      pg
-      railties
-      rubyntlm
-      rubyzip
-    metasploit-model (2.0.0)
-      activemodel (~> 4.2.6)
-      activesupport (~> 4.2.6)
-      railties (~> 4.2.6)
-    metasploit-payloads (1.1.11)
-    metasploit_data_models (2.0.0)
-      activerecord (~> 4.2.6)
-      activesupport (~> 4.2.6)
-      arel-helpers
-      metasploit-concern
-      metasploit-model
-      pg
-      postgres_ext
-      railties (~> 4.2.6)
-      recog (~> 2.0)
-    method_source (0.8.2)
-    mime-types (3.0)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    msgpack (0.7.6)
-    multi_json (1.12.0)
-    multi_test (0.1.2)
-    multipart-post (2.0.0)
-    network_interface (0.0.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    octokit (4.3.0)
-      sawyer (~> 0.7.0, >= 0.5.3)
-    openssl-ccm (1.2.1)
-    packetfu (1.1.11)
-      network_interface (~> 0.0)
-      pcaprub (~> 0.12)
-    patch_finder (1.0.2)
-    pcaprub (0.12.4)
-    pg (0.18.4)
-    pg_array_parser (0.0.9)
-    postgres_ext (3.0.0)
-      activerecord (>= 4.0.0)
-      arel (>= 4.0.1)
-      pg_array_parser (~> 0.0.9)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
-    rb-readline-r7 (0.5.2.0)
-    recog (2.0.21)
-      nokogiri
-    redcarpet (3.3.4)
-    rex-powershell (0.1.0)
-      rex-random_identifier
-      rex-text
-    rex-random_identifier (0.1.0)
-      rex-text
-    rex-registry (0.1.0)
-    rex-text (0.1.1)
-    rex-zip (0.1.0)
-      rex-text
-    rkelly-remix (0.0.6)
-    robots (0.10.1)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubyntlm (0.6.0)
-    rubyzip (1.2.0)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    shoulda-matchers (3.1.1)
-      activesupport (>= 4.0.0)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    timecop (0.8.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2016.5)
-      tzinfo (>= 1.0.0)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  cucumber-rails
-  factory_girl_rails
-  fivemat
-  metasploit-framework!
-  octokit (~> 4.0)
-  pry
-  rake
-  redcarpet
-  rspec-rails
-  shoulda-matchers
-  simplecov
-  timecop
-  yard
-
-BUNDLED WITH
-   1.12.5
@@ -1,38 +1,137 @@
-HACKING
-=======
+# $Id$

-(Last updated: 2014-03-04)
+This file contains some brief instructions on contributing to the
+Metasploit Framework.

-This document almost entirely deprecated by:
+Code Style
+==========

-CONTRIBUTING.md
+In order to maintain consistency and readability, we ask that you
+adhere to the following style guidelines:

-in the same directory as this file, and to a lesser extent:
+ - Hard tabs, not spaces
+ - Try to keep your lines under 100 columns (assuming four-space tabs)
+ - do; end instead of {} for a block
+ - Always use str[0,1] instead of str[0]
+   (This avoids a known ruby 1.8/1.9 incompatibility.)
+ - Method names should always be lower_case and words separated by "_"
+ - Variable names should be lower case with words separated by "_"
+ - Don't depend on any external gems or libraries without talking to
+   todb to resolve packaging and licensing issues 

-The Metasploit Development Environment
-https://github.com/rapid7/metasploit-framework/wiki/Setting-Up-a-Metasploit-Development-Environment
+You can use the the "./tools/msftidy.rb" script to do some rudimentary
+checking for various violations.

-Common Coding Mistakes
-https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes

-The Ruby Style Guide
-https://github.com/bbatsov/ruby-style-guide
+Code No-Nos
+===========

-Ruby 1.9: What to Expect
-http://slideshow.rubyforge.org/ruby19.html
+1. Don't print to standard output. Doing so means that users of
+interfaces other than msfconsole, such as msfrpc and msfgui, won't see
+your output.  You can use print_line to accomplish the same thing as
+puts. 

-You can use the the "./tools/msftidy.rb" script against your new and
-changed modules to do some rudimentary checking for various style and
-syntax violations.
+2. Don't read from standard input, doing so will make your code 
+lock up the entire module when called from other interfaces. If you 
+need user input, you can either register an option or expose an 
+interactve session type specific for the type of exploit.

-Licensing for Your New Content
-==============================
+3. Don't use "sleep". It has been known to cause issues with
+multi-threaded programs on various platforms. Instead, we use
+"select(nil, nil, nil, <time>)" throughout the framework. We have
+found this works around the underlying issue.

+4. Always use Rex sockets, not ruby sockets.  This includes
+third-party libraries such as Net::Http.  There are several very good
+reasons for this rule.  First, the framework doesn't get notified on
+the creation of ruby sockets and won't know how to clean them up in
+case your module raises an exception without cleaning up after itself.
+Secondly, non-Rex sockets do not know about routes and therefore can't
+be used through a meterpreter tunnel.  Lastly, regular sockets miss
+out on msf's proxy and ssl features.  Msf includes many protocols
+already implemented with Rex and if the protocol you need is missing,
+porting another library to use them is straight-forward.  See our
+Net::SSH modifications in lib/net/ssh/ for an example.
+
+5. When opening an IO stream, always force binary with "b" mode (or
+using IO#binmode). This not only helps keep Windows and non-Windows
+runtime environments consistent with each other, but also guarantees
+that files will be treated as ASCII-8BIT instead of UTF-8.
+
+6. Don't use String#[] for a single character.  This returns a Fixnum in
+ruby 1.8 and a String in 1.9, so it's safer to use the following idiom:
+	str[idx,1]
+which always returns a String.  If you need the ASCII byte, unpack it like
+so: 
+	str[idx,1].unpack("C")[0]
+
+7. Whenever possible, avoid using '+' or '+=' to concatenate strings.
+The '<<' operator is significantly faster. The difference will become
+even more apparent when doing string manipulation in a loop. The
+following table approximates the underlying implementation:
+	Ruby 		Pseudo-C
+	----------- 	----------------
+	a = b + c 	a = malloc(b.len+c.len+1);
+			strcpy(a, b);
+			memcpy(a+b.len, c, c.len);
+			a[b.len + c.len] = '\0';
+	a = b 		a = b;
+	a << c 		a = realloc(a, a.len+c.len+1);
+			memcpy(a+a.len, c, c.len);
+			a[a.len + c.len] = '\0';
+Note that the original value of 'b' is lost in the second case. Care
+must be taken to duplicate strings that you do not want to modify.
+
+8. For other Ruby 1.8.x/1.9.x compat issues, please see Sam Ruby's
+excellent slide show at <http://slideshow.rubyforge.org/ruby19.html>
+for an overview of common and not-so-common Ruby version related gotchas.
+
+9. Never, ever use $global variables. This applies to modules, mixins,
+and libraries. If you need a "global" within a specific class, you can
+use @@class_variables, but most modules should use @instance variables
+to store information between methods. 
+
+10. Do not define CONSTANTS within individual modules. This can lead to
+warning messages when the module is reloaded. Try to keep constants
+inside libraries and mixins instead.
+
+
+Creating New Modules
+====================
+
+When creating a new module, the simplest way to start is to copy
+another module that uses the same protocol and modify it to your
+needs.  If you're creating an exploit module, generally you'll want
+to edit the exploit() method.  Auxiliary Scanner modules use one of
+run_host(), run_range(), or run_batch() instead of exploit().
+Non-scanner aux modules use run().
+
+
+Submitting Your Code
+====================
+
+The process for submitting new modules via GitHub is documented here:
+
+https://github.com/rapid7/metasploit-framework/wiki/Metasploit-Development-Environment
+
+This describes the process of forking, editing, and generating a
+pull request, and is the preferred method for bringing new modules
+and framework enhancements to the attention of the core Metasploit
+development team. Note that this process requires a GitHub account.
+
+For modules, note that Author field is not automatic, and should be 
+filled in in the format of 'Your Name <user[at]domain.tld>' so future 
+developers can contact you with any questions.
+
+Licensing
+=========
 By submitting code contributions to the Metasploit Project it is
 assumed that you are offering your code under the Metasploit License
-or similar 3-clause BSD-compatible license.  MIT and Ruby Licenses
+or similar 3-clause BSD-compatible license.  MIT and Ruby Licenses 
 are also fine.  We specifically cannot include GPL code. LGPL code
-is accepted on a case by case basis for libraries only and is never
+is accepted on a case by case basis for libraries only and is never 
 accepted for modules.

+When possible, such as aux and exploit modules, be sure to include
+your license designation in the file in the appropriate place.

@@ -1,985 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: http://www.metasploit.com/
-
-Files: *
-Copyright: 2006-2016, Rapid7, Inc.
-License: BSD-3-clause
-
-# The Metasploit Framework is provided under the 3-clause BSD license provided
-# at the end of this file.
-#
-# The copyright on this package is held by Rapid7, Inc.
-#
-# This license does not apply to third-party components detailed below.
-#
-# Last updated: 2013-Nov-04
-#
-
-Files: data/templates/to_mem_pshreflection.ps1.template
-Copyright: 2012, Matthew Graeber
-License: BSD-3-clause
-
-Files: data/john/*
-Copyright: 1996-2011 Solar Designer.
-License: GPL-2
-
-Files: external/pcaprub/*
-Copyright: 2007-2008, Alastair Houghton
-License: LGPL-2.1
-
-Files: external/ruby-kissfft/*
-Copyright: 2003-2010 Mark Borgerding
-           2009-2012 H D Moore <hdm[at]rapid7.com>
-License: BSD-3-clause
-
-Files: external/source/exploits/IE11SandboxEscapes/*
-Copyright: James Forshaw, 2014
-License: GPLv3
-
-Files: external/source/byakugan/*
-Copyright: Lurene Grenier, 2009
-License: BSD-3-clause
-
-Files: external/source/ipwn/*
-Copyright: 2004-2005 vlad902 <vlad902 [at] gmail.com>
-           2007 H D Moore <hdm [at] metasploit.com>
-License: GPL-2 and Artistic
-
-Files: external/source/ReflectiveDLLInjection/*
-Copyright: 2011, Stephen Fewer of Harmony Security (www.harmonysecurity.com)
-License: BSD-3-clause
-
-Files: external/source/metsvc/*
-Copyright: 2007, Determina Inc.
-License: BSD-3-clause
-
-Files: external/source/tightvnc/*
-Copyright: 1999 AT&T Laboratories Cambridge.
-           2000 Tridia Corp.
-           2002-2003 RealVNC Ltd.
-           2001-2004 HorizonLive.com, Inc.
-           2000-2007 Constantin Kaplinsky
-           2000-2009 TightVNC Group
-License: GPL-2
-
-Files: external/source/unixasm/*
-Copyright: 2004-2008 Ramon de Carvalho Valle <ramon@risesecurity.org>
-License: BSD-4-clause
-
-Files: external/source/vncdll/winvnc/*
-Copyright: 1999 AT&T Laboratories Cambridge.
-           2000 Tridia Corp.
-           2002-2003 RealVNC Ltd.
-           2001-2004 HorizonLive.com, Inc.
-           2000-2006 Constantin Kaplinsky.
-           2000-2009 TightVNC Group
-License: GPL-2
-
-Files: lib/anemone.rb lib/anemone/*
-Copyright: 2009 Vertive, Inc.
-License: MIT
-
-Files: lib/bit-struct.rb lib/bit-struct/*
-Copyright: 2005-2009, Joel VanderWerf
-License: Ruby
-
-Files: lib/metasm.rb lib/metasm/* data/cpuinfo/*
-Copyright: 2006-2010 Yoann GUILLOT
-License: LGPL-2.1
-
-Files: lib/nessus/*
-Copyright: Vlatoko Kosturjak
-License: BSD-3-clause
-
-Files: lib/net/dns.rb lib/net/dns/*
-Copyright: 2006 Marco Ceresa
-License: Ruby
-
-Files: lib/net/ssh.rb lib/net/ssh/*
-Copyright: 2008 Jamis Buck <jamis@37signals.com>
-License: MIT
-
-Files: lib/packetfu.rb lib/packetfu/*
-Copyright: 2008-2012 Tod Beardsley
-License: BSD-3-clause
-
-Files: lib/postgres_msf.rb lib/postgres/postgres-pr/message.rb lib/postgres/postgres-pr/connection.rb
-Copyright: 2005 Michael Neumann
-License: BSD-3-clause or Ruby
-
-Files: lib/openvas/*
-Copyright: No copyright statement provided
-License: MIT
-
-Files: lib/rabal/*
-Copyright: Jeremy Hinegadner <jeremy at hinegardner dot org>
-License: Ruby
-
-Files: lib/rbmysql.rb lib/rbmysql/*
-Copyright: 2009 tommy
-License: Ruby
-
-Files: lib/rbreadline.rb
-Copyright: 2009 Park Heesob
-License: BSD-3-clause
-
-Files: lib/rkelly/*
-Copyright: 2007, 2008, 2009 Aaron Patternson, John Barnette
-License: MIT
-
-Files: lib/snmp.rb lib/snmp/*
-Copyright: 2004, David R. Halliday
-License: Ruby
-
-Files: lib/sshkey.rb lib/sshkey/*
-Copyright: 2011 James Miller
-License: MIT
-
-Files: lib/windows_console_color_support.rb
-Copyright: 2011 Michael 'mihi' Schierl
-License: BSD-3-clause
-
-Files: lib/zip.rb lib/zip/*
-Copyright: 2002-2004, Thomas Sandergaard
-License: Ruby
-
-Files: modules/payloads/singles/windows/speak_pwned.rb
-Copyright: 2009-2010 Berend-Jan "SkyLined" Wever <berendjanwever@gmail.com>
-License: BSD-3-clause
-
-Files: data/webcam/api.js
-Copyright: Copyright 2013 Muaz Khan<@muazkh>.
-License: MIT
-
-
-#
-# Gems
-#
-
-Files: activemodel
-Copyright: 2004-2011 David Heinemeier Hansson
-License: MIT
-
-Files: activerecord
-Copyright: 2004-2011 David Heinemeier Hansson
-License: MIT
-
-Files: activesupport
-Copyright: 2005-2011 David Heinemeier Hansson
-License: MIT
-
-Files: arel
-Copyright: 2007-2010 Nick Kallen, Bryan Helmkamp, Emilio Tagua, Aaron Patterson
-License: MIT
-
-Files: bcrypt
-Copyright: 2007-2011 Coda Hale
-License: MIT
-
-Files: builder
-Copyright: 2003-2012 Jim Weirich (jim.weirich@gmail.com)
-License: MIT
-
-Files: database_cleaner
-Copyright: 2009 Ben Mabey
-License: MIT
-
-Files: diff-lcs
-Copyright: 2004-2011 Austin Ziegler
-License: MIT
-
-Files: factory_girl
-Copyright: 2008-2013 Joe Ferris and thoughtbot, inc.
-License: MIT
-
-Files: fivemat
-Copyright: 2012 Tim Pope
-License: MIT
-
-Files: i18n
-Copyright: 2008 The Ruby I18n team
-License: MIT
-
-Files: json
-Copyright: Daniel Luz <dev at mernen dot com>
-License: Ruby
-
-Files: metasploit_data_models
-Copyright: 2012 Rapid7, Inc.
-License: MIT
-
-Files: mini_portile
-Copyright: 2011 Luis Lavena
-License: MIT
-
-Files: msgpack
-Copyright: Austin Ziegler
-License: Ruby
-
-Files: multi_json
-Copyright: 2010 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intridea, Inc.
-License: MIT
-
-Files: network_interface
-Copyright: 2012, Rapid7, Inc.
-License: MIT
-
-Files: nokogiri
-Copyright: 2008 - 2012 Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo, Patrick Mahoney, Yoko Harada
-License: MIT
-
-Files: packetfu
-Copyright: 2008-2012 Tod Beardsley
-License: BSD-3-clause
-
-Files: pcaprub
-Copyright: 2007-2008, Alastair Houghton
-License: LGPL-2.1
-
-Files: pg
-Copyright: 1997-2012 by the authors
-License: Ruby
-
-Files: rake
-Copyright: 2003, 2004 Jim Weirich
-License: MIT
-
-Files: redcarpet
-Copyright: 2009 Natacha Porté
-License: MIT
-
-Files: robots
-Copyright: 2008 Kyle Maxwell, contributors
-License: MIT
-
-Files: rspec
-Copyright: 2009 Chad Humphries, David Chelimsky
-License: MIT
-
-Files: shoulda-matchers
-Copyright: 2006-2013, Tammer Saleh, thoughtbot, inc.
-License: MIT
-
-Files: simplecov
-Copyright: 2010-2012 Christoph Olszowka
-License: MIT
-
-Files: timecop
-Copyright: 2012 Travis Jeffery, John Trupiano
-License: MIT
-
-Files: tzinfo
-Copyright: 2005-2006 Philip Ross
-License: MIT
-
-Files: yard
-Copyright: 2007-2013 Loren Segal
-License: MIT
-
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY {{THE COPYRIGHT HOLDERS AND CONTRIBUTORS}} "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL {{THE COPYRIGHT HOLDER OR CONTRIBUTORS}} BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
-     * Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
- .
-     * Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- .
-     * Neither the name of Rapid7, Inc. nor the names of its contributors
-     may be used to endorse or promote products derived from this software
-     without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: BSD-4-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-    This product includes software developed by the <organization>.
- 4. Neither the name of the <organization> nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Ruby
- 1. You may make and give away verbatim copies of the source form of the
-    software without restriction, provided that you duplicate all of the
-    original copyright notices and associated disclaimers.
- .
- 2. You may modify your copy of the software in any way, provided that
-    you do at least ONE of the following:
- .
-    a) place your modifications in the Public Domain or otherwise
-       make them Freely Available, such as by posting said
-       modifications to Usenet or an equivalent medium, or by allowing
-       the author to include your modifications in the software.
- .
-    b) use the modified software only within your corporation or
-       organization.
- .
-    c) rename any non-standard executables so the names do not conflict
-       with standard executables, which must also be provided.
- .
-    d) make other distribution arrangements with the author.
- .
- 3. You may distribute the software in object code or executable
-    form, provided that you do at least ONE of the following:
- .
-    a) distribute the executables and library files of the software,
-       together with instructions (in the manual page or equivalent)
-       on where to get the original distribution.
- .
-    b) accompany the distribution with the machine-readable source of
-       the software.
- .
-    c) give non-standard executables non-standard names, with
-       instructions on where to get the original software distribution.
- .
-    d) make other distribution arrangements with the author.
- .
- 4. You may modify and include the part of the software into any other
-    software (possibly commercial).  But some files in the distribution
-    are not written by the author, so that they are not under this terms.
-    They are gc.c(partly), utils.c(partly), regex.[ch], fnmatch.[ch],
-    glob.c, st.[ch] and some files under the ./missing directory.  See
-    each file for the copying condition.
- .
- 5. The scripts and library files supplied as input to or produced as
-    output from the software do not automatically fall under the
-    copyright of the software, but belong to whomever generated them,
-    and may be sold commercially, and may be aggregated with this
-    software.
- .
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-    WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE.
-
-License: GPL-2
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-License: OpenSSL
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
- .
- 3. All advertising materials mentioning features or use of this
-    software must display the following acknowledgment:
-    "This product includes software developed by the OpenSSL Project
-    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- .
- 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For written permission, please contact
-    openssl-core@openssl.org.
- .
- 5. Products derived from this software may not be called "OpenSSL"
-    nor may "OpenSSL" appear in their names without prior written
-    permission of the OpenSSL Project.
- .
- 6. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by the OpenSSL Project
-    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- .
- THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT `AS IS'' AND ANY
- EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- This product includes cryptographic software written by Eric Young
- (eay@cryptsoft.com).  This product includes software written by Tim
- Hudson (tjh@cryptsoft.com).
-
-License: SSLeay
- This package is an SSL implementation written
- by Eric Young (eay@cryptsoft.com).
- The implementation was written so as to conform with Netscapes SSL.
- .
- This library is free for commercial and non-commercial use as long as
- the following conditions are aheared to.  The following conditions
- apply to all code found in this distribution, be it the RC4, RSA,
- lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- included with this distribution is covered by the same copyright terms
- except that the holder is Tim Hudson (tjh@cryptsoft.com).
- .
- Copyright remains Eric Young's, and as such any Copyright notices in
- the code are not to be removed.
- If this package is used in a product, Eric Young should be given attribution
- as the author of the parts of the library used.
- This can be in the form of a textual message at program startup or
- in documentation (online or textual) provided with the package.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-    "This product includes cryptographic software written by
-    Eric Young (eay@cryptsoft.com)"
-    The word 'cryptographic' can be left out if the rouines from the library
-    being used are not cryptographic related :-).
- 4. If you include any Windows specific code (or a derivative thereof) from
-    the apps directory (application code) you must include an acknowledgement:
-    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- .
- THIS SOFTWARE IS PROVIDED BY ERIC YOUNG `AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- .
- The licence and distribution terms for any publically available version or
- derivative of this code cannot be changed.  i.e. this code cannot simply be
- copied and put under another distribution licence
- [including the GNU Public Licence.]
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: Artistic
- Copyright (c) 2000-2006, The Perl Foundation.
- .
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
- .
- Preamble
- .
- This license establishes the terms under which a given free software
- Package may be copied, modified, distributed, and/or redistributed.
- The intent is that the Copyright Holder maintains some artistic
- control over the development of that Package while still keeping the
- Package available as open source and free software.
- .
- You are always permitted to make arrangements wholly outside of this
- license directly with the Copyright Holder of a given Package. If the
- terms of this license do not permit the full use that you propose to
- make of the Package, you should contact the Copyright Holder and seek
- a different licensing arrangement.
- .
- Definitions
- .
- "Copyright Holder" means the individual(s) or organization(s)
- named in the copyright notice for the entire Package.
- .
- "Contributor" means any party that has contributed code or other
- material to the Package, in accordance with the Copyright Holder's
- procedures.
- .
- "You" and "your" means any person who would like to copy,
- distribute, or modify the Package.
- .
- "Package" means the collection of files distributed by the
- Copyright Holder, and derivatives of that collection and/or of
- those files. A given Package may consist of either the Standard
- Version, or a Modified Version.
- .
- "Distribute" means providing a copy of the Package or making it
- accessible to anyone else, or in the case of a company or
- organization, to others outside of your company or organization.
- .
- "Distributor Fee" means any fee that you charge for Distributing
- this Package or providing support for this Package to another
- party. It does not mean licensing fees.
- .
- "Standard Version" refers to the Package if it has not been
- modified, or has been modified only in ways explicitly requested
- by the Copyright Holder.
- .
- "Modified Version" means the Package, if it has been changed, and
- such changes were not explicitly requested by the Copyright
- Holder.
- .
- "Original License" means this Artistic License as Distributed with
- the Standard Version of the Package, in its current version or as
- it may be modified by The Perl Foundation in the future.
- .
- "Source" form means the source code, documentation source, and
- configuration files for the Package.
- .
- "Compiled" form means the compiled bytecode, object code, binary,
- or any other form resulting from mechanical transformation or
- translation of the Source form.
- .
- Permission for Use and Modification Without Distribution
- .
- (1) You are permitted to use the Standard Version and create and use
- Modified Versions for any purpose without restriction, provided that
- you do not Distribute the Modified Version.
- .
- .
- Permissions for Redistribution of the Standard Version
- .
- (2) You may Distribute verbatim copies of the Source form of the
- Standard Version of this Package in any medium without restriction,
- either gratis or for a Distributor Fee, provided that you duplicate
- all of the original copyright notices and associated disclaimers. At
- your discretion, such verbatim copies may or may not include a
- Compiled form of the Package.
- .
- (3) You may apply any bug fixes, portability changes, and other
- modifications made available from the Copyright Holder. The resulting
- Package will still be considered the Standard Version, and as such
- will be subject to the Original License.
- .
- .
- Distribution of Modified Versions of the Package as Source
- .
- (4) You may Distribute your Modified Version as Source (either gratis
- or for a Distributor Fee, and with or without a Compiled form of the
- Modified Version) provided that you clearly document how it differs
- from the Standard Version, including, but not limited to, documenting
- any non-standard features, executables, or modules, and provided that
- you do at least ONE of the following:
- .
- (a) make the Modified Version available to the Copyright Holder
- of the Standard Version, under the Original License, so that the
- Copyright Holder may include your modifications in the Standard
- Version.
- .
- (b) ensure that installation of your Modified Version does not
- prevent the user installing or running the Standard Version. In
- addition, the Modified Version must bear a name that is different
- from the name of the Standard Version.
- .
- (c) allow anyone who receives a copy of the Modified Version to
- make the Source form of the Modified Version available to others
- under
- .
- (i) the Original License or
- .
- (ii) a license that permits the licensee to freely copy,
- modify and redistribute the Modified Version using the same
- licensing terms that apply to the copy that the licensee
- received, and requires that the Source form of the Modified
- Version, and of any works derived from it, be made freely
- available in that license fees are prohibited but Distributor
- Fees are allowed.
- .
- .
- Distribution of Compiled Forms of the Standard Version
- or Modified Versions without the Source
- .
- (5) You may Distribute Compiled forms of the Standard Version without
- the Source, provided that you include complete instructions on how to
- get the Source of the Standard Version. Such instructions must be
- valid at the time of your distribution. If these instructions, at any
- time while you are carrying out such distribution, become invalid, you
- must provide new instructions on demand or cease further distribution.
- If you provide valid instructions or cease distribution within thirty
- days after you become aware that the instructions are invalid, then
- you do not forfeit any of your rights under this license.
- .
- (6) You may Distribute a Modified Version in Compiled form without
- the Source, provided that you comply with Section 4 with respect to
- the Source of the Modified Version.
- .
- .
- Aggregating or Linking the Package
- .
- (7) You may aggregate the Package (either the Standard Version or
- Modified Version) with other packages and Distribute the resulting
- aggregation provided that you do not charge a licensing fee for the
- Package. Distributor Fees are permitted, and licensing fees for other
- components in the aggregation are permitted. The terms of this license
- apply to the use and Distribution of the Standard or Modified Versions
- as included in the aggregation.
- .
- (8) You are permitted to link Modified and Standard Versions with
- other works, to embed the Package in a larger work of your own, or to
- build stand-alone binary or bytecode versions of applications that
- include the Package, and Distribute the result without restriction,
- provided the result does not expose a direct interface to the Package.
- .
- .
- Items That are Not Considered Part of a Modified Version
- .
- (9) Works (including, but not limited to, modules and scripts) that
- merely extend or make use of the Package, do not, by themselves, cause
- the Package to be a Modified Version. In addition, such works are not
- considered parts of the Package itself, and are not subject to the
- terms of this license.
- .
- .
- General Provisions
- .
- (10) Any use, modification, and distribution of the Standard or
- Modified Versions is governed by this Artistic License. By using,
- modifying or distributing the Package, you accept this license. Do not
- use, modify, or distribute the Package, if you do not accept this
- license.
- .
- (11) If your Modified Version has been derived from a Modified
- Version made by someone other than you, you are nevertheless required
- to ensure that your Modified Version complies with the requirements of
- this license.
- .
- (12) This license does not grant you the right to use any trademark,
- service mark, tradename, or logo of the Copyright Holder.
- .
- (13) This license includes the non-exclusive, worldwide,
- free-of-charge patent license to make, have made, use, offer to sell,
- sell, import and otherwise transfer the Package with respect to any
- patent claims licensable by the Copyright Holder that are necessarily
- infringed by the Package. If you institute patent litigation
- (including a cross-claim or counterclaim) against any party alleging
- that the Package constitutes direct or contributory patent
- infringement, then this Artistic License to you shall terminate on the
- date that such litigation is filed.
- .
- (14) Disclaimer of Warranty:
- THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
- IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED
- WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL
- LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Apache
- Version 2.0, January 2004
- http://www.apache.org/licenses/
- .
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- .
- 1. Definitions.
- .
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
- .
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
- .
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
- .
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
- .
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
- .
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
- .
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
- .
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
- .
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
- .
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
- .
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
- .
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
- .
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
- .
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
- .
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
- .
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
- .
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
- .
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
- .
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
- .
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
- .
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
- .
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
- .
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
- .
- END OF TERMS AND CONDITIONS
- .
- APPENDIX: How to apply the Apache License to your work.
- .
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
- .
- Copyright [yyyy] [name of copyright owner]
- .
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
@@ -1,48 +1,52 @@
-Metasploit [![Build Status](https://travis-ci.org/rapid7/metasploit-framework.svg?branch=master)](https://travis-ci.org/rapid7/metasploit-framework) [![Code Climate](https://img.shields.io/codeclimate/github/rapid7/metasploit-framework.svg)](https://codeclimate.com/github/rapid7/metasploit-framework)
+
+Metasploit
 ==
 The Metasploit Framework is released under a BSD-style license. See
 COPYING for more details.

-The latest version of this software is available from: https://metasploit.com
+The latest version of this software is available from http://metasploit.com/

 Bug tracking and development information can be found at:
+ https://dev.metasploit.com/redmine/projects/framework/
+
+The public GitHub source repository can be found at:
 https://github.com/rapid7/metasploit-framework

-New bugs and feature requests should be directed to:
-  http://r-7.co/MSF-BUGv1
-
-API documentation for writing modules can be found at:
-  https://rapid7.github.io/metasploit-framework/api
-
 Questions and suggestions can be sent to:
-  https://lists.sourceforge.net/lists/listinfo/metasploit-hackers
+ msfdev(at)metasploit.com
+
+The framework mailing list is the place to discuss features and ask for help.
+To subscribe, visit the following web page:
+ https://mail.metasploit.com/mailman/listinfo/framework
+
+The mailing list archives are available from:
+ https://mail.metasploit.com/pipermail/framework/

 Installing
 --
-
-Generally, you should use [the free installer](https://www.metasploit.com/download),
-which contains all of the dependencies and will get you up and running with a
-few clicks. See the [Dev Environment Setup](http://r-7.co/MSF-DEV) if
-you'd like to deal with dependencies on your own.
+Generally, you should use the installer which contains all dependencies
+and will get you up and running with a few clicks. See the [Dev
+Environment Setup][wiki-devenv] if you'd like to deal with dependencies
+on your own.

 Using Metasploit
 --
 Metasploit can do all sorts of things. The first thing you'll want to do
 is start `msfconsole`, but after that, you'll probably be best served by
-reading [Metasploit Unleashed][unleashed], the [great community
-resources](https://metasploit.github.io), or the [wiki].
+reading some of the great tutorials online:
+
+  * [Metasploit Unleashed][unleashed]
+  * [The official Metasploit wiki on Github][wiki-start]

 Contributing
 --
-See the [Dev Environment Setup][wiki-devenv] guide on GitHub, which will
-walk you through the whole process from installing all the
+See the [Dev Environment Setup][wiki-devenv] guide on github which will
+walk you through the whole process starting from installing all the
 dependencies, to cloning the repository, and finally to submitting a
-pull request. For slightly more information, see
-[Contributing](https://github.com/rapid7/metasploit-framework/blob/master/CONTRIBUTING.md).
+pull request.


-[wiki]: https://github.com/rapid7/metasploit-framework/wiki
-[wiki-devenv]: https://github.com/rapid7/metasploit-framework/wiki/Setting-Up-a-Metasploit-Development-Environment "Metasploit Development Environment Setup"
+[wiki-devenv]: https://github.com/rapid7/metasploit-framework/wiki/Metasploit-Development-Environment "Metasploit Development Environment Setup"
 [wiki-start]: https://github.com/rapid7/metasploit-framework/wiki/ "Metasploit Wiki"
 [wiki-usage]: https://github.com/rapid7/metasploit-framework/wiki/Using-Metasploit "Using Metasploit"
 [unleashed]: http://www.offensive-security.com/metasploit-unleashed/ "Metasploit Unleashed"
@@ -1,15 +0,0 @@
-#!/usr/bin/env rake
-require File.expand_path('../config/application', __FILE__)
-require 'metasploit/framework/require'
-require 'metasploit/framework/spec/untested_payloads'
-
-# @note must be before `Metasploit::Framework::Application.load_tasks`
-#
-# define db rake tasks from activerecord if activerecord is in the bundle.  activerecord could be not in the bundle if
-# the user installs with `bundle install --without db`
-Metasploit::Framework::Require.optionally_active_record_railtie
-
-Metasploit::Framework::Application.load_tasks
-Metasploit::Framework::Spec::Constants.define_task
-Metasploit::Framework::Spec::Threads::Suite.define_task
-Metasploit::Framework::Spec::UntestedPayloads.define_task
@@ -0,0 +1,1083 @@
+
+
+This file lists bundled packages and their associated licensing terms.
+
+
+ - The Packet Sniffer SDK (MicroOLAP) library embedded into the Meterpreter
+   Sniffer extension. HD Moore has a single-seat developer license.
+ - The Rabal library located under lib/rabal
+
+
+
+
+Ruby
+====
+ - The Bit-Struct library located under lib/bit-struct.
+   Copyright (c) 2005-2009, Joel VanderWerf.
+ - The SNMP library located under lib/snmp.
+   Copyright (c) 2004 David R. Halliday
+ - The Zip library located under lib/zip.
+   Copyright (C) 2002-2004 Thomas Sondergaard
+ - Gem components located under lib/gemcache/
+   * rdoc - RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers.
+   Portions (c) 2007-2011 Eric Hodel.  Portions copyright others, see individual
+   files for details.
+   * eventmachine - Copyright (C) 2006-07 by Francis Cianfrocca
+   * json - Copyright Daniel Luz <dev at mernen dot com>
+   * pg - Copyright (c) 1997-2012 by the authors
+
+
+
+````
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+    modifications to Usenet or an equivalent medium, or by allowing
+    the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+    with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+    together with instructions (in the manual page or equivalent)
+    on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+    the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+````
+
+
+PacketFu
+========
+ - The PacketFu library located under lib/packetfu.
+   Copyright (c) 2008-2012, Tod Beardsley
+
+````
+Copyright (c) 2008-2012, Tod Beardsley
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Tod Beardsley nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY TOD BEARDSLEY ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL TOD BEARDSLEY BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+````
+
+
+
+GPL
+===
+ - The modified TightVNC binaries and their associated source code.
+
+````
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Prot holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+````
+
+
+
+LGPL
+====
+ - The Metasm library located under lib/metasm.
+   Copyright (C) 2006-2010 Yoann GUILLOT
+ - The PcapRub library located under external/pcaprub
+ - The Ruby-Lorcon library located under external/ruby-lorcon
+ - Gem components located under lib/gemcache/
+   * coderay - Copyright (c) 2006-2011 by murphy (Kornelius Kalnbach) <murphy rubychan de>
+
+
+````
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+````
+
+
+
+OpenSSL
+=======
+ - The OpenSSL library embedded into the Meterpreter payload binaries and the
+   corresponding header files in the source tree
+
+````
+The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+the OpenSSL License and the original SSLeay license apply to the toolkit.
+See below for the actual license texts. Actually both licenses are BSD-style
+Open Source licenses. In case of any license issues related to OpenSSL
+please contact openssl-core@openssl.org.
+
+OpenSSL License
+---------------
+/* ====================================================================
+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT `AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG `AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+````
+
+
+MIT
+===
+ - The SSHKey library located under lib/sshkey.
+   Copyright (c) 2011 James Miller
+ - The Net::SSH library located under lib/net/ssh.
+   Copyright (c) 2008 Jamis Buck <jamis@37signals.com>
+ - Anemone located under lib/anemone
+   Copyright (c) 2009 Vertive, Inc.
+ - RKelly located under lib/rkelly/
+   Copyright (c) 2007, 2008, 2009 Aaron Patterson, John Barnette
+ - Gem components located under lib/gemcache
+   * actionmailer - Copyright (c) 2004-2011 David Heinemeier Hansson
+   * actionpack - Copyright (c) 2004-2011 David Heinemeier Hansson
+   * activemodel - Copyright (c) 2004-2011 David Heinemeier Hansson
+   * activerecord - Copyright (c) 2004-2011 David Heinemeier Hansson
+   * activeresource - Copyright (c) 2006-2011 David Heinemeier Hansson
+   * activesupport - Copyright (c) 2005-2011 David Heinemeier Hansson
+   * authlogic - Copyright (c) 2011 Ben Johnson of Binary Logic
+   * carrierwave - Copyright (c) 2008-2012 Jonas Nicklas
+   * chunky_png - Copyright (c) 2010 Willem van Bergen
+   * daemons - Copyright (c) 2005-2012 Thomas Uehlinger
+   * diff-lcs - Copyright 2004–2011 Austin Ziegler
+   * formtastic - Copyright (c) 2008-2010 Justin French
+   * fssm - Copyright (c) 2011 Travis Tilley
+   * hike - Copyright (c) 2011 Sam Stephenson
+   * i18n - Copyright (c) 2008 The Ruby I18n team
+   * jquery-rails - Copyright (c) 2010 Andre Arko
+   * liquid - Copyright (c) 2005, 2006 Tobias Luetke
+   * method_source - Copyright (c) 2011 John Mair (banisterfiend)
+   * multi_json - Copyright (c) 2010 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intridea, Inc.
+   * rack - Copyright (c) 2007, 2008, 2009, 2010 Christian Neukirchen <purl.org/net/chneukirchen>
+   * rack-cache - Copyright (c) 2008 Ryan Tomayko <http://tomayko.com/about>
+   * rack-ssl - Copyright (c) 2010 Joshua Peek
+   * rake - Copyright (c) 2003, 2004 Jim Weirich
+   * slop - Copyright (c) 2012 Lee Jarvis
+   * sprockets - Copyright (c) 2011 Sam Stephenson, Copyright (c) 2011 Joshua Peek
+   * state_machine - Copyright (c) 2006-2012 Aaron Pfeifer
+   * thor - Copyright (c) 2008 Yehuda Katz
+   * tilt - Copyright (c) 2010 Ryan Tomayko <http://tomayko.com/about>
+   * treetop - Copyright (c) 2007 Nathan Sobo
+   * tzinfo - Copyright (c) 2005-2006 Philip Ross
+
+
+
+
+````
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+````
+
@@ -1,50 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-  config.ssh.forward_x11 = true
-  config.vm.box = "ubuntu/trusty64"
-  # TODO: find a minimal image that keeps up-to-date and
-  # supports multiple providers
-  #config.vm.box = "phusion/ubuntu-14.04-amd64"
-  config.vm.network :forwarded_port, guest: 4444, host: 4444
-  config.vm.provider "vmware" do |v|
-	  v.memory = 2048
-	  v.cpus = 2
-  end
-  config.vm.provider "virtualbox" do |v|
-	  v.memory = 2048
-	  v.cpus = 2
-  end
-  %w(.vimrc .gitconfig).each do |f|
-    local = File.expand_path "~/#{f}"
-    if File.exist? local
-      config.vm.provision "file", source: local, destination: f
-    end
-  end
-
-  [ #"echo 127.0.1.1 `cat /etc/hostname` >> /etc/hosts", work around a bug in official Ubuntu Xenial cloud images
-    "apt-get update",
-    "apt-get dist-upgrade -y",
-    "apt-get -y install curl build-essential git tig vim john nmap libpq-dev libpcap-dev gnupg fortune postgresql postgresql-contrib",
-  ].each do |step|
-    config.vm.provision "shell", inline: step
-  end
-
-  [ "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3",
-    "curl -L https://get.rvm.io | bash -s stable",
-    "source ~/.rvm/scripts/rvm && cd /vagrant && rvm --install .ruby-version",
-    "source ~/.rvm/scripts/rvm && cd /vagrant && gem install bundler",
-    "source ~/.rvm/scripts/rvm && cd /vagrant && bundle",
-    "mkdir -p ~/.msf4",
-  ].each do |step|
-    config.vm.provision "shell", privileged: false, inline: step
-  end
-  config.vm.provision "file", source: "config/database.yml.vagrant", destination: "~/.msf4/database.yml"
-
-  config.vm.provision "shell", inline: "sudo -u postgres psql postgres -tAc \"SELECT 1 FROM pg_roles WHERE rolname='vagrant'\" | grep -q 1 || sudo -u postgres createuser -s -e -w vagrant && sudo -u postgres psql -c \"ALTER USER vagrant with ENCRYPTED PASSWORD 'vagrant';\""
-
-  ["msf_dev_db", "msf_test_db"].each do |database|
-    config.vm.provision "shell", inline: "sudo -u postgres psql -lqt | awk '{ print $1 }' | grep -w #{database} | wc -l | grep -q 1 || sudo -u postgres createdb --owner vagrant #{database}"
-  end
-end
@@ -1,82 +0,0 @@
-module Mdm::Workspace::BoundaryRange
-  extend ActiveSupport::Concern
-
-  included do
-    #
-    # Validations
-    #
-
-    validate :boundary_must_be_ip_range
-
-    #
-    # Instance Methods
-    #
-
-    # If {#limit_to_network} is disabled, this will always return `true`.
-    # Otherwise, return `true` only if all of the given IPs are within the
-    # project {#boundary boundaries}.
-
-    #
-    # @param ips [String] IP range(s)
-    # @return [true] if actions on ips are allowed.
-    # @return [false] if actions are not allowed on ips.
-    def allow_actions_on?(ips)
-      return true unless limit_to_network
-      return true unless boundary
-      return true if boundary.empty?
-      boundaries = Shellwords.split(boundary)
-      return true if boundaries.empty? # It's okay if there is no boundary range after all
-      given_range = Rex::Socket::RangeWalker.new(ips)
-      return false unless given_range # Can't do things to nonexistant IPs
-      allowed = false
-      boundaries.each do |boundary_range|
-        ok_range = Rex::Socket::RangeWalker.new(boundary)
-        allowed  = true if ok_range.include_range? given_range
-      end
-      return allowed
-    end
-
-    # Validates that {#boundary} is {#valid_ip_or_range? a valid IP address or
-    # IP address range}. Due to this not being tested before it was moved here
-    # from Mdm, the default workspace does not validate. We always validate boundaries
-    # and a workspace may have a blank default boundary.
-    #
-    # @return [void]
-    def boundary_must_be_ip_range
-      unless boundary.blank?
-        begin
-          boundaries = Shellwords.split(boundary)
-        rescue ArgumentError
-          boundaries = []
-        end
-
-        boundaries.each do |range|
-          unless valid_ip_or_range?(range)
-            errors.add(:boundary, "must be a valid IP range")
-          end
-        end
-      end
-    end
-
-    # Returns an array of addresses ranges
-    #
-    # @return [Array<String>]
-    def addresses
-      (boundary || "").split("\n")
-    end
-
-    private
-
-    # Returns whether `string` is a valid IP address or IP address range.
-    #
-    # @return [true] if valid IP address or IP address range.
-    # @return [false] otherwise.
-    def valid_ip_or_range?(string)
-      range = Rex::Socket::RangeWalker.new(string)
-      range && range.ranges && range.ranges.any?
-    end
-
-  end
-
-
-end
@@ -1,23 +0,0 @@
-# Adds associations to `Metasploit::Credential::Core` which are inverses of association on models under
-# {BruteForce::Reuse}.
-require 'metasploit/framework/credential'
-
-module Metasploit::Credential::Core::ToCredential
-  extend ActiveSupport::Concern
-  
-  included do
-    
-    def to_credential
-      Metasploit::Framework::Credential.new(
-        public:       public.try(:username) || '',
-        private:      private.try(:data)    || '',
-        private_type: private.try(:type).try(:demodulize).try(:underscore).try(:to_sym), 
-        realm:        realm.try(:value), 
-        realm_key:    realm.try(:key),
-        parent:       self
-      )
-    end
-    
-  end
-  
-end
@@ -1,2 +0,0 @@
-require 'metasploit/framework/file_path_validator'
-require 'metasploit/framework/executable_path_validator'
@@ -1,16 +0,0 @@
-module Metasploit
-  module Framework
-    # This is a ActiveModel custom validator that assumes the attribute
-    # is supposed to be the path to a regular file. It checks whether the
-    # file exists and whether or not it is an executable file.
-    class ExecutablePathValidator < ActiveModel::EachValidator
-
-      def validate_each(record, attribute, value)
-        unless ::File.executable? value
-          record.errors[attribute] << (options[:message] || "is not a valid path to an executable file")
-        end
-      end
-    end
-  end
-end
-
@@ -1,16 +0,0 @@
-module Metasploit
-  module Framework
-    # This is a ActiveModel custom validator that assumes the attribute
-    # is supposed to be the path to a regular file. It checks whether the
-    # file exists and whether or not it is a regular file.
-    class FilePathValidator < ActiveModel::EachValidator
-
-      def validate_each(record, attribute, value)
-        unless ::File.file? value
-          record.errors[attribute] << (options[:message] || "is not a valid path to a regular file")
-        end
-      end
-    end
-  end
-end
-
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+#
+# $Id$
+#
+# Ruby front-end to the Armitage Java user interface
+#
+# $Revision$
+#
+
+msfbase = __FILE__
+while File.symlink?(msfbase)
+	msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
+end
+
+if RUBY_PLATFORM =~ /mswin|mingw/i
+	exec "javaw", "-jar", "#{File.dirname(msfbase)}/data/armitage/armitage.jar", *ARGV
+else
+	exec "java", "-jar", "#{File.dirname(msfbase)}/data/armitage/armitage.jar", *ARGV
+end
@@ -1,54 +0,0 @@
-require 'rails'
-require File.expand_path('../boot', __FILE__)
-
-all_environments = [
-    :development,
-    :production,
-    :test
-]
-
-Bundler.require(
-    *Rails.groups(
-        coverage: [:test],
-        db: all_environments,
-        pcap: all_environments
-    )
-)
-
-#
-# Railties
-#
-
-# For compatibility with jquery-rails (and other engines that need action_view) in pro
-require 'action_controller/railtie'
-require 'action_view/railtie'
-
-#
-# Project
-#
-
-require 'metasploit/framework/common_engine'
-require 'metasploit/framework/database'
-
-module Metasploit
-  module Framework
-    class Application < Rails::Application
-      include Metasploit::Framework::CommonEngine
-
-      config.paths['log']             = "#{Msf::Config.log_directory}/#{Rails.env}.log"
-      config.paths['config/database'] = [Metasploit::Framework::Database.configurations_pathname.try(:to_path)]
-
-      case Rails.env
-      when "development"
-        config.eager_load = false
-      when "test"
-        config.eager_load = false
-      when "production"
-        config.eager_load = true
-      end
-    end
-  end
-end
-
-# Silence warnings about this defaulting to true
-I18n.enforce_available_locales = true
@@ -1,37 +0,0 @@
-require 'pathname'
-require 'rubygems'
-
-GEMFILE_EXTENSIONS = [
-    '.local',
-    ''
-]
-
-msfenv_real_pathname = Pathname.new(__FILE__).realpath
-root = msfenv_real_pathname.parent.parent
-
-unless ENV['BUNDLE_GEMFILE']
-  require 'pathname'
-
-  GEMFILE_EXTENSIONS.each do |extension|
-    extension_pathname = root.join("Gemfile#{extension}")
-
-    if extension_pathname.readable?
-      ENV['BUNDLE_GEMFILE'] = extension_pathname.to_path
-      break
-    end
-  end
-end
-
-begin
-  require 'bundler/setup'
-rescue LoadError
-  $stderr.puts "[*] Metasploit requires the Bundler gem to be installed"
-  $stderr.puts "    $ gem install bundler"
-  exit(1)
-end
-
-lib_path = root.join('lib').to_path
-
-unless $LOAD_PATH.include? lib_path
-  $LOAD_PATH.unshift lib_path
-end
@@ -1,11 +0,0 @@
-<%
-rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
-ignored_tags = "--tags ~@boot --tags ~@targets"
-%>
-default: <%= std_opts %> <%= ignored_tags %> features
-boot: <%= std_opts %> --tags @boot features
-exploit: <%= std_opts %> --tags @targets features
-wip: --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
@@ -1,32 +0,0 @@
-# To set up a metasploit database, follow the directions hosted at:
-# http://r-7.co/MSF-DEV#set-up-postgresql
-#
-# Kali Linux and the Omnibus installers both include an easy wrapper script for
-# managing your database, which may be more convenient than rolling your own.
-
-development: &pgsql
-  adapter: postgresql
-  database: metasploit_framework_development
-  username: metasploit_framework_development
-  password: __________________________________
-  host: localhost
-  port: 5432
-  pool: 200
-  timeout: 5
-
-# You will often want to seperate your databases between dev
-# mode and prod mode. Absent a production db, though, defaulting
-# to dev is pretty sensible for many developer-users.
-production: &production
-  <<: *pgsql
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-#
-# Note also, sqlite3 is totally unsupported by Metasploit now.
-test:
-  <<: *pgsql
-  database: metasploit_framework_test
-  username: metasploit_framework_test
-  password: ___________________________
@@ -1,27 +0,0 @@
-# @note This file is only for use in travis-ci.  If you need to make a
-# config/database.yml for running rake, rake spec, or rspec locally, please
-# customize `conifg/database.yml.example`
-#
-# @example Customizing config/database.yml.example
-#   cp config/database.yml.example config/database.yml
-#   # update password fields for each environment's user
-
-# Using the postgres user locally without a host and port is the supported
-# configuration from Travis-CI
-#
-# @see http://about.travis-ci.org/docs/user/database-setup/#PostgreSQL
-development: &pgsql
-  adapter: postgresql
-  database: metasploit_framework_development
-  username: postgres
-  pool: 5
-  timeout: 5
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-#
-# Note also, sqlite3 is totally unsupported by Metasploit now.
-test:
-  <<: *pgsql
-  database: metasploit_framework_test
@@ -1,18 +0,0 @@
-development: &pgsql
-  adapter: postgresql
-  database: msf_dev_db
-  username: vagrant
-  password: vagrant
-  host: localhost
-  port: 5432
-  pool: 200
-  timeout: 5
-
-production: &production
-  <<: *pgsql
-
-test:
-  <<: *pgsql
-  database: msf_test_db
-  username: vagrant
-  wassword: vagrant
@@ -1,5 +0,0 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-Metasploit::Framework::Application.initialize!
@@ -1,5 +0,0 @@
-if defined? Metasploit::Framework::Application
-  Metasploit::Framework::Application.configure do
-    config.log_level = :info
-  end
-end
@@ -0,0 +1 @@
+java -jar armitage.jar $*
@@ -0,0 +1,90 @@
+=============================================================================
+Armitage - Cyber Attack Management for Metasploit
+=============================================================================
+   
+                 *** http://www.fastandeasyhacking.com ***
+
+1. What is Armitage?
+   -----------------
+
+Armitage is a graphical cyber attack management tool for Metasploit that 
+visualizes your targets, recommends exploits, and exposes the advanced 
+capabilities of the framework.
+
+Advanced users will find Armitage valuable for managing remote Metasploit 
+instances and collaboration. Armitage's red team collaboration features allow 
+your team to use the same sessions, share data, and communicate through one 
+Metasploit instance.
+
+Armitage aims to make Metasploit usable for security practitioners who 
+understand hacking but don't use Metasploit every day. If you want to learn 
+Metasploit and grow into the advanced features, Armitage can help you.
+
+2. Documentation
+   -------------
+
+The documentation for Armitage is located on the Armitage website at:
+http://www.fastandeasyhacking.com. Read the FAQ and the Manual for 
+information on connecting Armitage to Metasploit and using it.
+
+3. Install and Update
+   ----------
+
+To get started, see the manual at http://www.fastandeasyhacking.com
+
+4. Source Code
+   -----------
+
+This projected is hosted on Google Code at:
+http://code.google.com/p/armitage/
+
+5. Disclaimer
+   ----------
+
+Use this code for your development and don't hack systems that you don't 
+have permission to hack. The existence of this software does not reflect the 
+opinions or beliefs of my current employers, past employers, future 
+employers, or any small animals I come into contact with. Enjoy this 
+software with my blessing. I hope it helps you learn and become a better 
+security professional.
+
+6. Contact
+   -------
+
+Report bugs in the issue tracker at:
+http://code.google.com/p/armitage/issues/list
+
+E-mail contact@fastandeasyhacking.com with other questions/concerns. Make
+sure you peruse the FAQ and Manual first. 
+
+7. License
+   -------
+
+(c) 2010-2012 Raphael Mudge. This project is licensed under the BSD license. 
+See section 8 for more information.
+
+lib/jgraphx.jar is used here within the terms of the BSD license offered by
+JGraphX Ltd. http://www.jgraphx.com/
+-
+lib/msgpack-0.5.1-devel.jar and lib/postgresql-9.1-901.jdbc4.jar are both 
+BSD licensed libraries.
+-
+Some code in src/msf/* comes from msfgui by scriptjunkie. 
+-
+This project uses the LGPL Sleep scripting language with no modifications. 
+Sleep's source is available at: http://sleep.dashnine.org/
+
+8. The BSD License
+   ---------------
+
+Redistribution and use in source and binary forms are permitted provided 
+that the above copyright notice and this paragraph are duplicated in all 
+such forms and that any documentation, advertising materials, and other 
+materials related to such distribution and use acknowledge that the 
+software was developed by the copyright holders.  The name of the copyright
+holders  may not be used to endorse or promote products derived from this 
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ''AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF 
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -0,0 +1,72 @@
+#!/bin/bash
+# start msfrpcd and the deconfliction server. Check for common mistakes
+# to save some time and head scratching...
+
+# check the arguments
+EXPECTED=2
+if [ $# -ne $EXPECTED ]; then
+	echo "[-] You must provide: <external IP address> <team password>"
+	echo "    <external IP address> must be reachable by Armitage"
+	echo "          clients on port 55553"
+	echo "    <team password> is a shared password your team uses to"
+	echo "          authenticate to the Armitage team server"
+	exit
+fi
+
+# check that we're r00t
+if [ $UID -ne 0 ]; then
+	echo "[-] Superuser privileges are required to run the team server"
+	exit 
+fi
+
+# check if java is available...
+if [ $(command -v java) ]; then
+	true
+else
+	echo "[-] java is not in \$PATH"
+	echo "    is Java installed?"
+	exit
+fi
+
+# check if keytool is available...
+if [ $(command -v keytool) ]; then
+	true
+else
+	echo "[-] keytool is not in \$PATH"
+	echo "    install the Java Developer Kit"
+	exit
+fi
+
+# check if msfrpcd is available
+if [ $(command -v msfrpcd) ]; then
+	true
+else
+	echo "[-] msfrpcd is not in \$PATH"
+	echo "    is Metasploit installed?"
+	exit
+fi
+
+# check if msfrpcd is running or not
+if [ "$(pidof msfrpcd)" ]; then
+	echo "[-] msfrpcd is already running. Kill it before running this script"
+	echo "    try: killall -9 msfrpcd"
+	exit
+fi
+
+# generate a certificate
+	# naturally you're welcome to replace this step with your own permanent certificate.
+	# just make sure you pass -Djavax.net.ssl.keyStore="/path/to/whatever" and
+	# -Djavax.net.ssl.keyStorePassword="password" to java. This is used for setting up
+	# an SSL server socket. Also, the SHA-1 digest of the first certificate in the store
+	# is printed so users may have a chance to verify they're not being owned.
+echo "[+] Generating X509 certificate and keystore (for SSL)"
+rm -f ./armitage.store
+keytool -keystore ./armitage.store -storepass 123456 -keypass 123456 -genkey -keyalg RSA -alias armitage -dname "CN=Armitage Hacker, OU=FastAndEasyHacking, O=Armitage, L=Somewhere, S=Cyberspace, C=Earth"
+
+# start everything up
+echo "[+] Starting RPC daemon"
+msfrpcd -U msf -P $2 -a 127.0.0.1 -p 55554 -S
+echo "[+] sleeping for 20s (to let msfrpcd initialize)"
+sleep 20
+echo "[+] Starting Armitage team server"
+java -Djavax.net.ssl.keyStore=./armitage.store -Djavax.net.ssl.keyStorePassword=123456 -server -XX:+UseParallelGC -jar armitage.jar --server $1 55554 msf $2 55553
@@ -0,0 +1,1195 @@
+Armitage Changelog
+==================
+
+7 Jun 12 - Adding on to those quick bug fixes / tweaks
+--------
+- Disabled Nagles algorithm for team server and client SSL sockets.
+  This makes team server much more responsive... trust me.
+- Fixed bug preventing Armitage from showing "Started Service" 
+  message when starting the SOCKS Proxy server.
+- Fixed a find feature highlight bug in the View tab.
+
+30 May 12 - A few quick bug fixes / tweaks...
+---------
+- Fixed an exception when killing a session or removing a route 
+  through the UI. 
+- Oooh, ps command added a new column to its output. Updated ps  
+  parser to handle this.
+- Hosts -> Import Hosts now works under Windows again. Had to 
+  escape the filename. *sigh*
+- Hail Mary now sets LHOST option. This is necessary for some 
+  attacks to work properly.
+- Tweaked console create code in beginning of Armitage setup to 
+  hopefully avoid aggravating the evil console.create deadlock
+  condition.
+
+21 May 12
+---------
+- Added a hack to prevent the input area from flickering when the 
+  prompt changes.
+- Updated the color palette to something a little more subtle.
+- Added an optimization to how modules are launched. This will make
+  a difference for team use in high latency situations.
+- Rewrote MSF Scans feature to use console queue. This option is more
+  reliable and it makes the code easier to follow.
+- Added a hack to combine chat message writes with a read request.
+  This will make the event log more responsive in a high latency 
+  situation (can't you tell I care about this "situation")
+- Fixed text highlights through Ctrl+F on Windows. UNIX platforms 
+  were always OK. Another good reason to not use these tools on 
+  Windows. Ever.
+- View -> Downloads Sync Files feature now works on Windows. It looks
+  like leaving those pesky :'s in the file paths is bad.
+
+17 May 12
+---------
+- Fixed bug with loot/download viewer breaking with a font resize.
+- Default console font color is now grey. I never noticed that I had
+  white text on a black background before. That's a lot of contrast.
+  This is adjustable too through Armitage -> Preferences.
+- And... the Armitage console now displays pretty colors. If you don't
+  like colors, set the console.show_colors.boolean preference to false
+  through Armitage -> Preferences.
+- Fixed a bug preventing input field from getting focus when popping a
+  console tab using Ctrl+W.
+
+14 May 12
+---------
+- Oopserific--dynamic workspace shortcuts were not bound until you
+  clicked the Workspaces menu. I fixed that.
+- Improved console pool's ability to detect a dead console. If you saw
+  "null" prompts in an open tab, it's because of a dead console. Fixed
+- Bound Ctrl+Backspace to reset dynamic workspaces. Ctrl+0 is now back
+  to what it originally did (resetting the font size to default).
+- Added Ctrl+T to take a screenshot of the active tab
+- Added Ctrl+W to pop the active tab into its own window
+- Armitage team server is now SSL enabled. The teamserver script (you
+  are using it, right?) generates a certificate for you using keytool.
+  The server presents the SHA1 hash of its certificate. Armitage users
+  have the opportunity to verify and trust the hash of the certificate
+  presented to them or to reject it and not connect.
+- Added Ctrl+Left / Ctrl+Right to quickly navigate through tabs.
+- Added a check to prevent clients from connecting to msfrpcd directly
+  when teaming is enabled.
+- Fixed a bug that prevented command shells from opening on some sessions
+- Team server client now caches certain calls to RPC server.
+- Reworked the Loot/Downloads View button. Now, all highlighted files are
+  displayed in one View tab. This makes searching easier. Each file is
+  displayed with a colored header (to make it easier to tell when one file
+  ends and the other begins). 
+- Added Sync Files button to Loot/Downloads tabs when connected to a team
+  server. This button will download all files associated with the highlighted
+  rows and save them in the Armitage data directory.
+
+7 May 12
+--------
+Note: Armitage team server setup has changed. Refer to the manual for
+the latest information: http://www.fastandeasyhacking.com/manual#7
+
+- Armitage team mode now routes all Metasploit-bound calls through the
+  deconfliction server. Armitage also pools "temporary" Metasploit
+  consoles. It's too bad this is logged as one change, because it's 
+  more like twenty. These changes were motivated by a desire to avoid 
+  triggering a race condition that was introduced w/ Metasploit 4.3.0.
+         http://dev.metasploit.com/redmine/issues/6829
+
+  On the bright side these changes will allow a lot more flexibility 
+  to optimize how Armitage interacts with msfrpcd and to do some neat 
+  things (like logging) in a centralized way.
+- Module description (in module launch dialog) is now resizable.
+- Added Ctrl+D keyboard shortcut to close active tab.
+- Armitage now uses (more robust) console queue for launching post
+  modules, handlers, brute force attacks, and other things.
+- Fixed a race condition in the Jobs tab refresh after killing a job
+- Armitage now filters smb hashes from non-psexec/smb login dialogs.
+- Added armitage.log_data_here.folder setting. This setting lets you
+  specify where Armitage will save its logs, downloaded files, and
+  screenshots. *cough* Some penetration testers like to dump everything
+  to an encrypted volume. *cough*. I apologize it took this long to
+  get this feature in place.
+- Improved perceived responsiveness of a console interaction
+
+17 Apr 12
+---------
+- Modified how Armitage determines a console command is complete to stay 
+  compat with behavior changes in a recent Metasploit update.
+- Armitage now queues console commands to prevent out of order execution.
+
+16 Apr 12
+---------
+- The search field in the module browser now updates results in real time.
+  Start typing and Armitage will start filtering the module tree for you. 
+  Clear the field to reset it to the default state.
+- Added keyboard shortcuts to switch dynamic workspaces...
+	Ctrl+1 = first workspace
+	Ctrl+2 = second workspace
+	....
+	Ctrl+0 = show all 
+- Added keyboard shortcuts:
+	Ctrl+N = new console
+	Ctrl+O = open preferences
+- Armitage's Meterpreter -> Access -> Dump Hashes -> lsass method is now 
+  much better about grabbing all of the hashdump output and adding it to 
+  the creds table. The hashdump command returns output as an arbitrary
+  number of chunks. I now use a different read strategy for determining when
+  the output is complete.
+- You may now use Ctrl+Alt to deselect highlighted items in a range in the
+  Jobs and Workspaces table views (most other table views that do multi
+  selection should allow this already).
+- Added Shell -> Pass Session for *NIX shell sessions. Uses the system_session
+  module to pass a shell session elsewhere (or duplicate the current shell)
+
+29 Mar 12
+---------
+- Fixed a bug that affects first-time users. Armitage was not initializing a
+  console before trying to connect to the database. 
+
+28 Mar 12
+---------
+- Team server now delivers chat messages in batches vs. one line at a time. 
+  This will make syncing on reconnect much better (in theory)
+- Several optimizations to prevent unnecessary reads/calls to deconfliction
+  server when in team mode. This will primarily affect high latency situations.
+- Use Shift+Click to close all tabs with the same name. This feature now closes
+  all tabs in the same group (e.g., all screenshots, file browsers, command 
+  shells, etc.)
+- Armitage now logs launches of the enum_dns module.
+- Hosts -> DNS Enumerate now populates NS field with highlighted host.
+- Armitage now adds a tooltip to tabs associated with a session. Hover your 
+  mouse over a tab X button to see which host the tab is associated with.
+- Fixed a potential exception caused when listing downloads.
+- Created a queue to process certain commands meant for Metasploit in order and
+  in a throttled manner. Started moving some Armitage calls to it. Now you can
+  fire an exploit at 1,000 hosts and Armitage won't blink. It might take awhile
+  before that exploit finishes firing against all of the hosts though :)
+- The file browser now has a "List Drives" button. It's only available on 
+  Windows sessions. Click it to see which drives are available.
+- File browser can now navigate to folders with apostrophes in their name.
+- Made some major internal changes to how Armitage interacts with Metasploit. The
+  goal is to make a more robust and faster hacking experience for you.
+
+22 Mar 12
+---------
+- Updated Armitage NMap profiles with the following:
+	-T4 (instead of -T5) [wait longer for open services to reply]
+	-n  [forces NMap to not resolve the hostname of IP addresses]
+	--min-hostgroup 96 [allows more parallelism when scanning hosts]
+- Armitage now intercepts screenshot and webcam_snap commands from meterpreter 
+  shell and performs the appropriate action with them.
+- View -> Creds -> Export button now works in team mode.
+- Doh! Armitage now properly shows VMWare icon when OS is set to a VMWare ESXi
+- Armitage "is command finished?" heuristic now accounts for commands like
+  del /S which prompt with a (Y/N)? - you can safely use these commands again.
+- Armitage now detects whether a client connecting to the team server is out 
+  dated or not. It rejects old clients. They will get a message indicating they
+  need to update and then their client won't do anything else. You'll see a
+  message printed to STDOUT where the team server ran about the rejection.
+- Added a * indicator to the active workspace in the workspaces menu.
+- Added Hosts -> DNS Enumerate, this menu launches a Metasploit module that will
+  attempt to discover hosts by querying a name server in different ways.
+- Added a file chooser helper to WORDLIST option.
+- Armitage now displays a pivot relationship between a compromised host and the
+  NAT/proxy device it is connected through.
+- Added a Copy button to services tab. This button copies the highlighted hosts
+  to the clipboard. I found myself needing this several times recently.
+- Improved reverse payload selection logic (now it includes rev php meterpreter)
+- Armitage now sets a different LPORT for each exploit launched with a rev payload
+
+10:30am
+- Changed algorithm for determining which edges to highlight in graph view. If there
+  is a pivot and both sides have a session, then the edge is highlighted.
+
+8 Mar 12 1.43-dev
+--------
+- Armitage now uses session_host to determine which host a session is associated
+  with. This value is grabbed directly from the OS itself. You'll no longer have
+  20 meterpreter sessions associated with a NAT/firewall device.
+- Armitage now spins up a new listener for each client-side attack (no longer
+  relying on the random default listener created on startup). Of course you can
+  change this... double-click the PAYLOAD option to set it to something else.
+- Token stealing dialog now disables refresh button while grabbing tokens. Enables
+  it again when done.
+- Armitage now talks to Metasploit every two minutes to prevent auth timeout.
+- Armitage now displays a firewall icon for hosts with no OS marked as a firewall
+  by MSF.
+- Armitage now selects an IPv6 bind payload when attacking IPv6 hosts.
+- Armitage now explicitly sets RPORT for different MSF Scan options and psexec.
+- Updated the about dialog to include a version number and release date.
+- Added a ./teamserver [external IP] [shared pass] script to the UNIX distro of 
+  Armitage. This script makes it much easier to startup Armitage's team server mode.
+
+2 Mar 12 - Catching up to a few MSF 4.3.0-dev changes...
+--------
+- Added a tab rename feature.
+- Hosts that self report as .NET server now display an XP/2003 era icon.
+- Updated route command parser to conform to Metasploit 4.3.0's output for it
+- "Check all credentials" feature now works when running the deconfliction 
+  server AND client from the same folder.
+- [host] -> Host -> Operating System -> * now clears notes related to host
+  before updating OS. This allows future scans to trigger MSF normalization
+  code and update the OS to something else (e.g., from Unknown to X)
+
+29 Feb 12
+---------
+- Armitage now displays a VMWare icon for hosts flagged as ESX/ESXi servers
+- Overhauled token stealing user experience--this is the cadillac version. You
+  now get a nice list of the available tokens (from the post module), click to
+  impersonate, refresh, rev2self, and getuid. 
+- Improved file browser responsiveness
+- Table view now allows individual hosts to be deselected in an interveral 
+  (Armitage will no longer reselect these hosts for you)
+- Dynamic workspaces no longer requires a comma and a space between entries (a
+  comma is good enough)
+- Improved the [Host] -> Remove menu option
+- Deconfliction server now returns the previous 100 events to new clients.
+- File browser directory up button is now more obvious
+- Keyboard accelerators when you right-click in the graph view are now correct.
+- Adjusted the graph view scrolling increments to something sane.
+- Added a slight delay between commands issued to a console to prevent them 
+  from executing out of order.
+
+21 Feb 12
+---------
+- Added Cut/Copy/Paste menu to table cell editor.
+- Module browser search field now treats spaces as a wildcard. You may type:
+  "win meterp" and Armitage will treat it as "win*meterp"
+- Hovering over an edge in graph view no longer reports a "null" tooltip
+- Fixed parsing of ps output for the process dialog (it's much much better now)
+
+14 Feb 12
+---------
+- Added ports 5631 (pc anywhere) and 902 (vmauthd) to the MSF Scans feature.
+- Several cosmetic tweaks to the spacing in Armitage tables.
+- Moved table render code from Sleep to Java to avoid potential lock conflicts
+- Added support for vba-exe payload output type.
+- Payload generation dialog now sets more appropriate default options for the
+  vba output type when it is selected.
+- Meterp command shell "read more stuff?" heuristic now accounts for Yes/No/All
+- Fixed ExitOnSession showing up twice when setting advanced options for a 
+  client-side exploit
+- You may now import multiple files through Hosts -> Import again.
+- Added 5s timeout to d-server connect attempt.
+- Added a --client [connect.properties] to specify which Metasploit server to 
+  connect to. The connect.properties file is a Java properties file that looks
+  like this (without the leading whitespace):
+
+  host=127.0.0.1
+  port=55553
+  user=msf
+  pass=test
+
+19 Jan 12
+---------
+- Data export now includes a sessions file. This lists all of the Metasploit
+  sessions you had in your database. There's some neat data here including
+  which exploit was used, which payload, start time, and close time. You can
+  calculate how much time you spent on your client's boxes. Cool stuff.
+- Fixed a potential dead-lock caused by mouse enter/exit events firing code
+  that required a lock. Nice landmine to defuse.
+- Fixed a weird condition with d-server detection. Sometimes (rarely)
+  Armitage wouldn't detect the d-server even when it's present.
+- Added check to d-server allowing one lock per/client. Client won't reobtain
+  a lock until it lets it go. This prevents you from opening two shell tabs
+  for a shell session in team mode.
+- Fixed an infinite loop condition when some Windows shell commands would
+  return output with no newlines (e.g., net stop [some service]). Thanks
+  Jesse for pointing me to this one.
+- Data export now includes a timeline file. This file documents all of the
+  major engagement events seen by Armitage. Included with each of these 
+  events is the source ip of the attack system and the user who carried out
+  the action (when teaming is setup).
+- Data export now exports timestamps with current timezone (not GMT)
+- Fixed a nasty bug that's been with Armitage since the beginning! I wasn't
+  freeing edges properly in the graph view. If you had pivots setup in graph
+  view and used Armitage long enough--eventually Armitage would slow down until 
+  the program became unusable. At least it's fixed now.
+- Adjusted the d-server state identity hash combination algorithm to better
+  avoid collissions.
+- Armitage now displays 'shell session' below a host if the host info is just
+  the Windows shell banner.
+
+5 Jan 12
+--------
+- Armitage d-server now transmits hosts, service, and session state only 
+  when something has changed. This makes teaming much snappier.
+- Uploading an imported hosts file now shows a progress dialog.
+- File browser upload function no longer blocks the user interface in team
+  mode. A progress dialog is shown for uploading larger files. 
+- Removed Ctrl+R refresh hosts shortcut from graph view (it's no longer 
+  necessary)
+- Armitage now exits if it was unable to connect to the collaboration server.
+- Hosts -> NMap Scans and Hosts -> MSF Scans dialogs are now populated with 
+  the selected values from the target area by default.
+- You may now interact with a Windows command shell through Java meterpreter.
+- Armitage no longer shows Webcam Shot option through Java meterpreter.
+- Armitage now detects when it does not have read permissions for the database
+  YAML file and prompts with something helpful. Before it would just freeze
+  with a blank dialog. Not helpful. :)
+- Armitage now only shows services that are open. 
+- View -> Reporting -> Export Data now has the capability of dumping the whole
+  database (not just the current workspace).
+- Added a dialog to View -> Reporting Export Data. Now you have the ability to
+  dump all hosts or choose to dump one of the dynamic workspaces. This gives
+  you a lot of flexibility with which hosts are included.
+- Cleaned up exported output of vulnerabilities in the Metasploit database:
+  -- duplicate entries are collapsed to one (this was the fault of my query)
+  -- refs column contains references separated by a comma and a space
+  -- added info and module columns. The module column indicates the appropriate
+     Metasploit module
+  -- Metasploit modules now populate name, info, and module in an appropriate
+     way.
+- Values exported to TSV are cleaned up such that newlines are replaced with a
+  literal \n and tabs are converted to three spaces.
+
+30 Dec 11 - last release of the year?
+---------
+- Hosts -> Clear Database now clears the sessions and clients tables 
+- Fixed a bug preventing dynamic workspace port/session filter from 
+  working on a fresh database. This was a fun one. This only affected 
+  folks with a completely fresh database and because Hosts -> Clear 
+  Database didn't clear everything, this went unnoticed until now.
+- Added various reverse shell payloads to payload helper dialog.
+- Added file chooser helper for SigningCert and SigningKey options.
+- Added hack to return correct route info when setting up pivoting through
+  Java meterpreter.
+- Armitage now posts a note to the event log when a user starts a browser 
+  exploit or a server module.
+- Armitage now supports dragging and dropping a module onto a host in graph
+  and table view. This action opens the module launcher configured to work
+  with that host.
+- Drastically rewrote MSF Scans. MSF Scans now intelligently builds a list
+  of ports to scan based on what Metasploit can do. After an initial port
+  scan, MSF Scans runs discovery modules against relevant hosts. As a bonus
+  you will see all of the output of these scans. 
+- Enhanced the Windows heuristic used to guess which OS image to display
+- The deconfliction server throttle is now less draconian about how long it
+  throttles a call.
+- Armitage no longer posts to the event log from the UI thread (this will
+  prevent the UI from blocking in some cases)
+- Command shell now handles interaction with d-server in a separate thread
+  from the UI thread. This will prevent UI blocking in some cases.
+- Added Ping Sweep... option for non-Windows meterpreter sessions. Now Java
+  meterpreter users have a quick host discovery option.
+- Change Host OS option now matches new Metasploit database schema.
+- Deconfliction server now sets LHOST to the IP address you provided. Also,
+  Armitage clients do not overwrite LHOST once it is set.
+- Interacting with a shell in team mode no longer blocks UI to communicate
+  with d-server.
+
+12 Dec 11
+---------
+- Armitage teaming mode now downloads the resulting file for any fileformat
+  exploit.
+- Armitage -> Set Exploit Rank and Set Target View now show a * next to an 
+  item to indicate the current setting.
+- Shift+click on Launch in a module launch dialog will not close the module
+  launch dialog. One use case for this: set up a payload multi/handler, 
+  shift+click Launch to do it, then change output type to exe, click Launch
+  and you're all set.
+- Dynamic Workspace editor now trims whitespace from your entries. Errant
+  whitespace causes Armitage to reject the entry and your workspace never
+  acivates.
+- Updated the "msfrpcd died" troubleshooting dialog. The new one takes folks
+  to a website with detailed information. 
+- Armitage now uses "load" to load a meterpreter module instead of "use"
+- Key logger event log announcement now notes the session ID. This is so 
+  your teammates will know not to migrate that session since it's recording
+  key strokes.
+- Right-click X in tab -> Save Screenshot now displays filename without the
+  path.
+- Deconfliction server now detects when database is not available and offers
+  troubleshooting steps. 
+- Loot/Downloads viewer now has a right-click menu to Copy selected text.
+
+22 Nov 11 - A big improvement...
+---------
+- Services refresh is now set to 30s (vs. 60s before)
+- Workspaces -> Manage now opens as a tab and shows all data about workspaces
+- Fixed a bug with Edit Workspace not auto-checking session box when set.
+- Meterpreter -> Access -> Escalate Privileges now highlights the priv esc
+  options in the post module true. This is viable now that getsystem is a   
+  module.
+- Payload module launcher now lets you set Template, Iterations, Encoder, and
+  KeepTemplateWorking for any Windows payload. Also, payload is generated and
+  saved locally without opening a tab. 
+- sessions -i ## trap is now smarter and opens a shell tab for shell sessions,
+  a meterpreter tab for meterpreter sessions, and offers an error when you
+  try to interact with a session that doesn't exist.
+- Armitage no longer shows a host until it receives a db.hosts reply.
+- Right-click a module and select Relevant Targets to create a dynamic 
+  workspace that shows only targets that meet the host/port criteria for that
+  module. Use Ctrl+A to select all of those hosts and rock'n'roll. :)
+- Hosts -> Import Hosts now works when the folder/file has spaces in it.
+- Dynamic workspaces are now local to the current Armitage client. They no
+  longer have a global effect in teaming mode.
+- Added an Activate button to workspace management dialog.
+- Fixed a bug with sessions only dyn workspace sometimes showing hosts that
+  do not have sessions.
+- You may now highlight multiple jobs in View -> Jobs and select Kill to get
+  rid of all them at once.
+
+11.17.11 - All the things I wanted to do, but didn't have time
+--------
+Release Note 1: if you use Armitage teaming, things changed. You have to start 
+msfrpcd with a different set of flags and your team must use the latest version 
+of Armitage. If you have a script that starts msfrpcd, you must update it. 
+
+More information is at: http://www.fastandeasyhacking.com/manual#7
+
+Release Note 2: Armitage requires a Metasploit base install of 4.0 or greater. 
+If you use msfupdate to update a Metasploit install prior to 4.0, then Armitage
+will not work. The Metasploit pre-4.0 installers did not install dependencies
+that Armitage requires today. Missing are certain Java cryptography extensions
+and the msgpack Ruby gem. BackTrack 5 is Metasploit 3.7. BackTrack 5r1 is 4.0.
+
+- db.services now limits its results to hosts that are returned by db.hosts. 
+  This fixes a bug where services data for some hosts was not returned when
+  when >3,500 hosts are in the armitage database.
+- MSF Scans menu is now available under Hosts menu again.
+- Removed Browser Autopwn menu as its future in Metasploit is undecided.
+- Find Attacks/Hail Mary now pull latest service info from DB before resolving
+  the attacks. This prevents a situation where Find Attacks after a scan yielded
+  nothing because Armitage had not synced with the database yet.
+- Deconfliction server now complains when you try to use 127.0.0.1 as your host
+- Added cut/copy/paste/clear menu to most textfields. (for Glen)
+- Added Workspaces -> Manage to edit, add, and remove dynamic workspaces.
+- Added code to intercept "sessions -i ##" and open a meterpreter tab instead.
+- Armitage now honors port setting when starting msfrpcd for you.
+- Armitage now detects msfrpcd shutdown and offers user advice to fix it. The
+  most common cause is probably a lack of msgpack.
+- Fixed a deadlock that happened when generating a payload.
+
+11.13.11 - A major rewrite of a lot of stuff.
+--------
+- Moved from XML/RPC interface to MSGPACK. This should be much faster.
+- Removed Armitage dependence on Metapsloit db.* API--since it may go away soon.
+- Attack recommendations and Hail Mary no longer depend on db_autopwn. New code
+  offers same results with improved speed.
+- Simplified Hail Mary and Find Attacks to use port/OS information only.
+- Greatly improved keystroke recorder. The option is now called "Log Keystrokes".
+  It uses the Metasploit keystroke_recorder post module. Results are regularly 
+  dumped into the post module window. Also, the results are stored as loot 
+  available for the team to view.
+- Launching the keystroke_recorder post module now makes an announcement to the
+  event log.
+- Added a button to Processes tab to log keystrokes. This will bring up a the
+  keystroke_recorder module configured to migrate to the process and record 
+  keystrokes there.
+- Removed Workspaces menu. Armitage now works from the default workspace.
+- Simplified Hosts menu.
+- Meterpreter -> Access -> Persistence now calls persistence post module.
+- Improved Meterpreter -> Access -> Steal Tokens, it's still wonky but it's a 
+  little better now.
+- Host import now uses db_import command running in a console.
+- Added Armitage -> Set Exploit Rank to update the minimum exploit rank value.
+- Armitage now displays up to 512 hosts and 12,288 services at any given time.
+  This keeps Armitage operable even if you scan a big freaking network.
+- Added dynamic workspaces. This feature gives you the ability to define a filter
+  on the database and Armitage will display only hosts that match this filter.
+  You may define filters based on operating system, open ports, and network address.
+  Go to Workspaces -> Create to create a filter. Filters show up under the 
+  Workspaces menu and you may switch back and forth betweem them too.
+- Simplified the Connect dialog. One button. :)
+- Right-click Scan option now scans for HTTPS.
+- Check all credentials option no longer tries blank passwords/username as pass
+- Added a read optimization to the console code. This will reduce load in a team 
+  engagement + make consoles feel faster when there is output.
+- Armitage now opens the event log tab instead of a metasploit console tab in team
+  mode.
+- Fixed a host sorting issue in table view.
+- Moved View -> Targets to Armitage -> Set Target View
+- Overhauled how Armitage handles downloaded files. Downloads are saved to a set
+  place on the attack server. Downloads are available to the whole team through
+  View -> Downloads. This works like the loot viewer. Team members may view text 
+  files or download binary files. This method is friendlier when downloading whole
+  directories of stuff.
+
+10.20.11
+--------
+- Modified hail mary attack to get a little more success with some common Windows
+  attacks.
+
+10.17.11 
+--------
+- Added menu item to dump hashes using the old lsass method or the smart hashdump
+  registry method.
+
+10.13.11 take II?
+--------
+- updated msf3/data directories to account for new install locations.
+- Removed Meterpreter -> Access - > Duplicate because it is now redundant with
+  Meterpreter -> Access -> Pass Session
+- Updated Meterpreter -> Access -> Pass Session to have LPORT of default 
+  Meterpreter listener. Click Launch to simply duplicate your current session.
+- Added Meterpreter -> Access -> Steal Token to list and steal user/group tokens
+- Updated meterpreter multiplexer to not expect output from rev2self. 
+
+10.13.11
+--------
+- added ability to set up VNC on a target when connected to a remote Metasploit
+- Armitage now tells you where to connect your VNC client to access the desktop
+  of a compromised host. You'll need to have a local VNC client available.
+
+10.12.11 - oooh SECKSY
+-------- 
+- fixed a typo in the default armitage settings file.
+- made PAYLOAD helper friendly to post/windows/manage/payload_inject
+- Meterpreter -> Access -> Pass Session now uses payload_inject
+
+10.12.11
+--------
+- Meterpreter N -> Hashdump now runs post/windows/gather/smart_hashdump module.
+  This gives you the benefit of seeing its output and it works in more
+  situations. 
+- Right-click the tab X button and select Save Screenshot to take a screenshot
+  of the current tab. This image will render the tab contents exactly as seen
+  on the screen. Useful for putting together a report or presentation.
+  (thanks Rob for the suggestion)
+- Added a module launcher helper for RHOSTS and RHOST. This helper will let you
+  import a list of IPs (separated by newlines) from a file into these fields.
+- View -> Reporting -> Export Data no longer fails if there are no hosts to
+  export data about.
+- Armitage now runs post/auxiliary modules as jobs (meaning you may kill them
+  using View -> Jobs)
+- hashdump and smart_hashdump post modules will now announce to the event log
+  that hashes were dumped when they're run (whether through the menu or 
+  the module browser).
+- View -> Reporting -> Export Data now takes a screenshot of the table view
+  and includes it in the artifacts (when table view is active)
+
+09.26.11 - take 2
+--------
+- Improved performance when launching exploits and other modules that open
+  a new tab.
+- Launching an exploit will only open a tab when fewer than four hosts are 
+  highlighted. If four or more are highlighted, then Armitage will use the old
+  behavior of silently launching each exploit. [You're supposed to be able to
+  attack hundreds of hosts at once--hence my desire to add this caveat]
+- When launching an exploit in the background, Armitage will show a dialog 
+  indicating that the exploit was launched against X hosts.
+
+09.26.11 
+--------
+- You may now drag and drop Armitage tabs to rearrange their order.
+- Armitage "show all commands" option (for better exploit feedback) is now on 
+  by default. 
+- You may now right-click a screenshot/webcam shot to zoom in or out on the 
+  image. The zoom-level stays fixed (in case you refresh the image later)
+- Added a menu to the X button in the tabs. Through this menu you may open the
+  current tab in its own window or close all like tabs.
+- Updated Hosts -> Import Hosts to reflect the current importable file types.
+- Added View -> Reporting -> Export Data to dump most Metasploit tables into 
+  TSV and XML files suitable for parsing (by you!) into a report format of 
+  some sort. 
+- Armitage now encodes (-e x86/shikata_ga_nai -i 3) any Windows meterpreter 
+  payload generated from the module launcher dialog.
+- [host] -> Meterpreter -> Access -> Duplicate now uses multi_meter_inject to
+  launch Meterpreter into memory directly (rather than upload and execute a file)
+- In teaming mode, Armitage will now automatically upload a file selected through
+  the + option (e.g., USER_FILE +) to the Metasploit server and set the value
+  in Metasploit accordingly.
+- Modified error output for a failed Metasploit method to only display the
+  method name and error message. Displaying a large input would cause Armitage
+  UI to start flashing in some weird disco mode until a hard reset. Yeaah.
+
+09.08.11
+--------
+- Armitage now highlights the event log tab when something new is posted and the
+  tab is not active. Control the color by editing tab.highlight.color pref.
+- Fixed a bug preventing preference values from saving properly (and having an
+  effect).
+- Added "Check all credentials" option to the login dialogs. This option will 
+  login to the service to test each credential. Successful logins will populate
+  the credentials table.
+- Fixed a bug preventing the first open console from scrolling all the way to 
+  the bottom when open.
+- Credential export button now escapes the file path (making the button work on
+  Windows). This bug is another good example of why you should use Armitage on
+  Linux. It'll just work. Windows users: expect surprises.
+- Use Ctrl+Shift on a tab X button to remove the tab and create a desktop window 
+  with its contents. I suspect you'll find this really useful at times.
+- Armitage now remembers your auto-layout setting. Right-click in the graph area
+  to change it.
+- Setting armitage.show_all_commands.boolean to true will now run each exploit in 
+  its own tab. Setting this is a good way to get feedback on the attacks you
+  launch and to learn the Metasploit console better.
+
+07.31.11
+--------
+- Fixed bug preventing Meterpreter -> Access -> Hashdump from noting all hashes
+  into the credentials table.
+
+07.30.11 - Paying down some engineering debt.
+--------
+- Loot viewer no longer displays non-text files. If you try to "view" a 
+  binary loot, it will the folder containing it.
+- Improved UI responsiveness by making sure all communication with Metasploit
+  happens in some thread other than the UI thread. This will prevent latency
+  from bogging the UI down and making it feel locked up. Armitage will also
+  feel a lot faster for many actions.
+- The code that creates a console, executes a command, and calls a callback
+  now uses a much tighter sleeping schedule (10ms vs 500ms). This greatly
+  improves Armitage responsiveness.
+- Armitage connect progress dialog now shows progress setting up the Armitage
+  environment once a connection is successful. Chances are it'll happen fast
+  enough that you won't see it. 
+- View -> Activity Log now opens activity log folder on MacOS X.
+- Removed restriction that prevents user from deleting/clearing default 
+  workspace.
+- File chooser helper used to set values in the module launch dialog now 
+  escapes all backslashes in the path. This fixes a problem on Windows caused 
+  by the console stripping the unescaped backslashes.
+
+07.28.11 - Armed for Metasploit 4
+--------
+- Armitage now sends use prive with use stdapi when it gets a command not
+  found error in Meterpreter.
+- Armitage now sends BLANK_PASSWORDS 0 with any Login menu items. This
+  should speed up the login by forcing Metasploit to not try a blank
+  user/password first.
+- Armitage no longer sends payload related variables to auxiliary modules.
+  (note to programmer: auxiliary modules don't use PAYLOADs :P~~~)
+- Module launch dialog for client-side attacks (fileformat and browser) 
+  now presents payload options to you. They're still configured to a 
+  reasonable default (and updated as the exploit target changes).
+- Client-side payload "guess" is now better about selecting an OS X specific
+  payload when appropriate.
+- Double-click the PAYLOAD option in the module launch dialog to open a 
+  chooser that lets you select a payload and choose whether to create a 
+  handler for it or not. This will configure the appropriate payload vars
+  for you. You're welcome to tweak them from there.
+- Simplified some of the logic in the file browser and added better error
+  reporting.
+- Added a visual hint to clickable option names in the module launcher.
+  Double-clicking these options will open a dialog to assist setting the value.
+- Added a visual hint to clickable preference types in the preferences window.
+  Double-clicking these types will open a dialog to assist setting the value.
+- Fixed a potential deadlock caused by launching modules while Armitage is
+  still initializing.
+- Added a preference to disable displaying the MSF ASCII banner when a new
+  console opens. This preference is set to show the banner by default.
+- Added a regexp to strip non-ascii chars from usernames collected with dump
+  hashes. The RPC daemon throws an exception when I try to report usernames
+  with these chars in them.
+
+23 Jul 11 - Change Log
+---------
+- Ooops! My baaad. I broke db.creds in MSF. Someone else unbroke it. Now
+  I call it the right way from Armitage so everything works like it's 
+  supposed to. :)
+
+21 Jul 11 - Change Log
+---------
+- loots dialog is now populated by db.loots RPC call. This is faster
+  and compatible with changes made to MSF.
+- credentials dialog is now populated by.creds RPC call. This is 
+  faster and compatible with changes made to MSF.
+- RPC connection code now strips out more characters that may cause 
+  the XML parser to complain. 
+
+  ** There were a few changes made to MSF over the past few days that
+     broke the credentials and loots dialog. This update brings Armitage
+     back to compatability with what exists in MSF trunk. **
+
+19 Jul 11 - Change Log
+---------
+- You may now execute a post module against multiple hosts at once.
+  Simply highlight the hosts, find your post module, double-click it
+  and watch the magic happen. The drawback--each session will open a
+  new tab to display the output of the post module.
+- You may now hold down shift and click on a tab to close all tabs
+  with the same title. If you run a post module against multiple hosts
+  this is a good way to get rid of all those tabs.
+- Graph view Ctrl+P shortcut (save screenshot of graph view) now shows
+  pivots.
+- post module output now logs to ~/.armitage/[host]/post.log
+- Fixed some weirdness with popup menu mouse events not being consumed
+- Added View -> Activity Logs to open folder containing Armitage logs
+- Fixed command history so up arrow really gives the previous command
+- Keystrokes dumped using dump button on key scan dialog are now logged
+  to ~/.armitage/[host]/keyscan.log
+
+  *Respun* Armitage.dmg with .app file fix for MacOS X Lion. Thanks to
+  @NightLion for contributing this.
+
+12 Jul 11 - Change Log
+---------
+- Fixed a race condition causing some file browser actions to fail on 
+  Windows hosts at times.
+- Files downloaded through file browser are now archived in:
+  [host]\Downloads
+- Hail Mary output nows goes to [log dir]\all\hailmary.log
+- Added Crack Passwords button to Credentials tab. This opens the 
+  launcher for John the Ripper: auxiliary/analyze/jtr_crack_fast
+- Added Post Modules item to Meterpreter N -> Explore and Shell N menus. 
+  This menu item will show applicable post-exploitation modules in 
+  the module browser.
+- Loot browser now opens loot viewer as a tab.
+- Loot viewer now has many of the same keyboard shortcuts as a console
+  tab. You can Ctrl+F to search for stuff, Ctrl+Plus/Minus to increase
+  and shrink the font, and Ctrl+A to select everything.
+
+02 Jul 11 - Change Log
+--------- 
+- Doubled wait time for Meterpreter ls command to complete.
+- Armitage now shows psexec option instead of smb on Login menu for
+  Windows hosts (when smb service is present).
+- Fixed bug preventing manual import of a single host
+- Removed automatic resending of console commands that didn't appear
+  sent. This was a work-around for a msf bug that may not be present
+  anymore. We'll find out.
+- Removed --script-all from NMap profiles. I saw quite a discussion
+  about this on the NMap mailing list. Oops. Oh well :)
+	http://seclists.org/nmap-dev/2011/q2/572
+- All host import options now use Metasploit's import_data RPC call.
+  This is what all the remote calls map to anyways.
+- Added Help button to start dialog.
+- Armitage now opens cmd.exe and executes programs from the file 
+  browser using the current process token (execute -t in Meterpreter)
+- Added logging. Logs are stored in ~/.armitage organized as
+  [date]/[host]/[file]. The logging captures:
+
+  - all Console tab output (console.log)
+  - the collaboration event log (event.log)
+  - all Meterpreter tab output (meterpreter_[session].log)
+  - all Command Shell tab output (cmd_[session]_[pid].log)
+  - all Shell tab output (shell_[session].log)
+  - all Screenshots captured through Armitage (.../Screenshots/)
+  - all Webcam shots captured through Armitage (.../Webcam Shots/)
+
+  You can turn this off by setting armitage.log_everything.boolean
+  to false in the Armitage preferences.
+- Added a Reset button to preferences dialog to reset Armitage 
+  preferences.
+- SSL now defaults to off on all platforms
+- Added a Default button to the database settings helper. This 
+  button loads the default database settings ignoring what is in the
+  config file.
+- Loot viewer now uses the same colors and font as a console tab
+- Fixed bug preventing Loot browser from populating data/time column
+- Preferences dialog now brings font and shortcut dialogs to front
+  to prevent them from being hidden by prefs dialog.
+
+24 Apr 11 - Happy Birthday Gerry Edition
+---------
+- Added a check to prevent jerk faces from entering an empty nick in
+  collaborative mode. :)
+- Fixed a potential dead-lock condition with the screenshot/webcam
+  shot tab.
+- Armitage -> Listeners -> Reverse now binds to 0.0.0.0. 
+- Host import now posts an event to the collab mode shared event log
+- added an option to display an MOTD message to clients that connect
+  to Armitage in the collaboration mode. Use -m or --motd before
+  --server and specify a file, e.g.:
+
+  armitage -m /path/to/motd.txt --server ...
+
+  Clients will see this message when they connect.
+- Added Meterpreter -> Access -> Pass Session to send a meterpreter
+  session to a handler set up on another host.
+- Armitage now sets ExitOnSession to false for multi/handlers started
+  within Armitage.
+- Pivoting and ARP Scan dialogs now highlight first option by default.
+- Added a sanity check to the Route class to prevent malformed IPs
+  from screwing up sorting.
+- Removed sqlite3 from the database options. I should have done this
+  long ago--it has no place in Armitage.
+- Armitage now intercepts meterpreter "shell" command and opens a 
+  new tab with the cmd.exe interaction in it.
+
+17 Apr 11 - Change Log 
+---------
+- Windows command shell interactions are now less likely to die. How
+  oh how did we get here? Armitage interacts with cmd.exe through a
+  Meterpreter channel. If an unnecessary read happens, it ties up the
+  meterpreter session for 10-20s AND the channel dies. If you typed
+  commands in too quickly, it's probable that Armitage would do an
+  unnecessary read and the channel would die. I believe I've headed 
+  off this problem. Armitage now locks the channel until the command 
+  completes. If the command times out or completes, the channel 
+  becomes unlocked. This should prevent most out of place reads. In
+  collaboration mode, this was a great way for excited teammates to
+  tie up the meterp session for everyone. :) "I typed this command
+  20 times and nothing happened!!!" Doh! You queued 20 reads with a
+  10-20S timeout each and destroyed that channel. -- Armitage 
+  protects against this situation now.
+- Command history no longer saves empty commands.
+- Armitage server mode now provides all details that a client needs
+  to connect to the server.
+
+13 Apr 11 - Change Log (Dayton, OH Capstone Edition)
+---------
+- Metasploit now has host normalization (this is great news). I've 
+  removed the OS reporting code from Armitage as a consequence. This 
+  means less overhead communicating with Metasploit
+- Fixed a potential deadlock triggered when interacting with a Windows
+  command shell. Sorry about the freezes Matt and Brant.
+- Fixed a strange condition in Armitage that sometimes caused shell
+  sessions to die.
+- Download from file browser now notifies user when a file is downloaded.
+- Armitage server mode now prints database connect string to console to
+  assist with set up of Metasploit teaming.
+- Fixed a bug causing exploit recommendations to not show for Windows 
+  hosts due to host normalization
+- Added a check to prevent cd .. button in file browser from retriggering
+  too quickly. This will prevent the meterpreter command queue from 
+  becoming very backed up doing a cd/ls over and over again.
+- Graph view no longer counts edges as a selected item when creating a
+  list of hosts to apply an action to.
+- Added another heuristic to prevent Windows cmd.exe interaction from 
+  locking up.
+
+10 Apr 11 - Change Log
+---------
+- Fixed key logger dump button.
+- Process migrate function displays success or fail message again.
+- Armitage now displays nmap output in a tab. You can thank scriptjunkie
+  for making this work in Metasploit. Please send cash, check, or money
+  order directly to him.
+- Greatly improved post-pivot host discovery workflow... here's the deal:
+  -- [host] -> Meterpreter -> ARP Scan menu now shows networks local to
+     host and lets you choose to launch an ARP scan from that Meterpreter
+     session.  
+  -- Highlight one or more hosts, right-click, and select Scan to launch
+     MSF discovery scans against the highlighted hosts.
+- Added a rudimentary loot browser/viewer to Armitage. Go to View -> Loot
+  to see the currently captured loots. Loot is the Metasploit term for 
+  data captured by certain post/ modules.
+- Armitage now presents a warning when it detects a second Metasploit 
+  user connected to the same Metasploit server without the collaboration
+  server in place.
+- Armitage collaboration mode now updates target information more often
+- Updated Armitage to work with Metasploit's new normalized host OS 
+  constants and to restore the os_flavor value when it is wiped out.
+
+16 Mar 11
+---------
+- Shell -> Disconnect now executes in a separate thread.
+- Armitage now creates ~/armitage-tmp and writes there if the current dir
+  is /Applications or it can't write to the current directory.
+- Fixed a potential deadlock issue in the file browser
+- Directory up button in file browser now shows that it has been pressed
+- Added Execute option to file browser (now you can run a program by
+  right-clicking on it and selecting Execute--for Jesse)
+- Multiple improvements to responsiveness of command shell and meterpreter
+  tabs. This should benefit collaboration mode too.
+
+12 Mar 11 (MACCDC Post Day 1 Update)
+---------
+- Fixed a bug preventing host import from working with a remote connection
+- Armitage client now increases default wait for meterpreter commands to
+  complete when in teaming mode.
+- Increased wait time to download a generated payload file to 8s.
+
+11 Mar 11 Update (0100h EST)
+---------
+- Fixed a deadlock condition in the module launcher (caused by the changes
+  to increase responsiveness... oops).
+
+10 Mar 11 Update (2230h EST)
+---------
+- Fixed race condition importing manual list of hosts (sometimes the file
+  would get deleted). Grr.
+- Added a lock to prevent multiple Armitage clients from trying to 
+  determine what OS a box has. This should help in CTF situations.
+
+10 Mar 11 Changes
+---------
+
+Quick story: NECCDC 2011 Red Team. TJ launches a script that lands 70
+sessions in the first few seconds. 11 red team members are connected to
+Armitage eager to carry out their pieces of pwnage. The Ruby process pegs
+the CPU and Armitage fails spectacularly. Very funny. This releases fixes
+that. 
+
+- Armitage YAML parser now accepts quoted strings in the YAML fields
+- Added caching of sessions.list, db.hosts, and db.services to Armitage 
+  collaboration server. This should help prevent msfrpcd from overloading
+  when many clients are connected and owning boxen at one time.
+- Improved GUI responsiveness by making several parts of the Armitage GUI
+  spawn a new thread to avoid blocking while communicating with Metasploit
+- Added a tooltip to the "Start MSF" and "Connect" buttons to clarify use
+- Export credentials button now prompts for a remote file when connected 
+  to a remote Metasploit instance.
+- Export credentials and payload generate output now transparently  
+  downloads to your local host when connected to Armitage's collab server.
+- Armitage now loads stdapi in Meterpreter if it finds it's not loaded. 
+  Armitage also prompts you to rerun the failed command when this happens.
+- Right-click in services now shows popup for taking actions against 
+  selected hosts. Now you can do mass actions against hosts sorted by port.
+- Added Access -> Persist to Meterpreter menu. This will run Meterpreter's
+  persistence script using the default Armitage handler. Meterpreter will
+  start at boot and at login.
+- Added an Armitage.app file for MacOS X. Use Armitage from OS X as a
+  client to connect to Metasploit hosted in other places.
+- Added a check for whether current working directory is writeable or not.  
+  If it's not, Armitage does all of its read/write operations in home dir.
+
+Tested with 10 concurrent Armitage clients from four boxes with 140+ shell 
+sessions and a few meterpreter sessions. I think we're ready to rock now.
+
+27 Feb 11 Changes
+---------
+- Webcam snap features works again. Sorry about that. :)
+- Download file button in file browser now works through the collaboration
+  server. This feature has a few limitations / requirements:
+
+  1) Armitage server must have the same $PWD as msfrpcd
+  2) Files must download in less than 12s or else you'll need to retrieve
+     them from the msfrpcd host.
+  3) Recursive downloads of files from a directory are kept on the host with
+     msfrpcd. You'll need to retrieve them with sftp or something else.
+
+25 Feb 11 Changes
+---------
+
+This release is primarily bug fixes. The network attack collaboration 
+feature is further tested and ready for your use.
+
+See: http://www.youtube.com/watch?v=coF8dVLBnOQ
+
+- Armitage now consumes data from msfrpcd's stderr when Start MSF button is
+  used. This means Armitage won't lock up when database tables are 
+  initialized during the first run on Windows.
+- pivoting, logins, hail mary, and pass-the-hash now print to the event log.
+- Pass-the-hash dialog is now available via [host] -> Login -> psexec.
+- Fixed bug causing Event Log menu to be present outside of collab mode.
+- armitage.sh start-up shell script is now named armitage
+- Console destroy and shell unlocking commands on tab close now happen in a
+  new thread to prevent the GUI from blocking.
+- Armitage now stops meterpreter read thread when it detects a dead session.
+- Replaced jyaml with a quick and dirty parser that doesn't mistake ####e#
+  for a double number. This was screwing up connecting to postgres for some
+  of you.
+- Upload button in file browser now works through Armitage's collab server
+- Added Ctrl+P shortcut to save screen capture of hosts graph view 
+  
+22 Feb 11 Changes
+---------
+- Improved shell "when should I read more data from this channel" heuristic. 
+  This means command shell sessions should not freeze on an errant Meterp.
+  read command that blocks until the universe is recreated.
+- Fixed a potential deadlock using Armitage's meterpreter dialogs with a 
+  meterpreter tab open.
+- Command shell tab now only opens when Armitage knows channel and PID 
+  settings
+- Rewrote how Armitage interfaces with Meterpreter. This has a few impacts:
+  -- Armitage now waits for a command to execute and reads its output
+     before executing another command. This prevents Armitage from getting
+     confused when you're doing a lot of stuff at once.
+  -- You can now open multiple meterpreter console tabs for a session 
+  -- Commands executed by Armitage's dialogs will not show up in your 
+     Meterpreter tab(s).
+- File browser now does a cd "current directory" before each action. 
+- Added a network attack collaboration feature to Armitage. This is as 
+  beta as it gets (although it *should* work). To use it, start msfrpcd
+  and connect Armitage's collaboration server (on the same box as msfrcpd!)
+
+  ./armitage --server host port user pass [ssl? 1 or 0]
+
+  This will connect Armitage's collaboration server to the Metasploit RPC 
+  daemon you specify. This server will then bind port+1 and tell future 
+  Armitage clients to use it for extra collaboration features.
+
+  Connect one or more remote Armitage clients as normal. Some of the 
+  features you get in this mode:
+
+  1. View -> Event Log for chatting and watching major events
+  2. Command shell and webcam/screenshot features work for remote clients
+  3. Armitage clients automatically lock a shell session when they're in use
+     and notify other clients that it's locked if they try to use it.
+  4. Transparent real-time sharing of meterpreter amongst multiple clients.
+- Payload generation now works on Windows (I wasn't escaping the backslashes
+  in the paths... doh!)
+- Armitage now prompts you for a path (and not a file chooser) when generating
+  a payload using a remote connection to Metasploit.
+- Armitage now loads database settings from file in MSF_DATABASE_CONFIG env var
+- You can now highlight text in the Armitage console tabs on MacOS X.
+- Fixed a potential deadlock when opening a Windows command shell tab
+
+Update 9am EST
+- Removed a remnant of my development environment from server.sl. If you see:
+  jar file to import package from was not found! at line 25
+
+  Then you need to update.
+
+13 Feb 11 Changes
+---------
+- Organized View menu (it was getting out of control)
+- Added RPC Console item to view menu (Start MSF only). This item will show
+  the STDOUT for msfrpcd. Use this to watch nmap's output.
+- Added Ctrl+A shortcut to select all text in a console tab
+- Kill meterpreter, kill pivots, and credential dumps now use fresh 
+  consoles to execute. This ensures they will execute even if the global
+  console is stale (this sometimes happens.)
+- Added tab completion to Meterpreter window.
+- Hosts -> Import Hosts now lets you select multiple files to import at once.
+- Use SSL is now checked by default on Linux (and unchecked by def. on Win)
+- Updated Armitage to remove or alter some UI options when connected to a 
+  remote Metasploit RPC instance. 
+
+  -- Meterpreter shell is the only interact option 
+  -- Webcam and Screenshot menu items are gone
+  -- Upload asks for a full file name rather than show a file chooser dialog
+
+  These adjustments are necessary during remote connections as Armitage does
+  not have access to the local file system of the Metasploit RPC daemon.
+
+21 Jan 11 Changes
+--------- 
+- Increased wait time between connection attempts to MSF RPC
+- Fixed bug with Windows command shell not working when using Armitage from a
+  Windows host. 
+- Host refresh using sysinfo now only happens when no OS is set for the host.
+- Fixed a deadlock condition caused when an automatic sysinfo request was 
+  made while a Meterpreter tab for the same host was open.
+
+18 Jan 11 Changes
+---------
+- Added a Migrate Now! item to Meterpreter Access menu. Runs migrate -f.
+- Right-click in Meterpreter console now shows menu as before (silly bugs).
+- Armitage now detects hashdump failure and reports possible causes to you.
+- Armitage now binds default handler to 0.0.0.0. 
+- Added a table view for the targets area. Go to View -> Targets to change the
+  setting. If you're working with many hosts, table view may be better for you.
+- Added preliminary support for Metasploit post/ modules. You can launch them 
+  and if a host is highlighted, Armitage will populate the SESSION var for you.
+- Armitage now uses the sysinfo command in a meterpreter session to pull host
+  OS info if it doesn't know it. This also means Armitage will auto-populate
+  the host OS when a client-side attack is successful.
+- Tab completion is now ignored when input field is empty
+
+13 Jan 11 Changes
+---------
+- Hosts reported as Windows Me now display W2K era Windows logo.
+- "Hail Mary" attack is now launched and managed by Armitage. Exploits are 
+  selected using the output of db_autopwn AND the operating system information
+  Armitage knows. Also attacks are launched in a more optimal order (sorted by 
+  exploit rank/age). This is a big improvement over db_autopwn by itself. 
+- Added a link to the Armitage Issue Tracker in the Help menu.
+- Updated remote exploit payload selection to choose Java payloads or Windows 
+  shell payloads before resorting to the generic/* payloads.
+- Updated client-side exploit launcher to let you select the target. Armitage 
+  uses this target (plus the exploit name) to determine which payload to use.
+  multi/java_signed_applet works very nicely now ;)
+- Fixed (once and for all now) the mysterious OS info not refreshing bug.
+  Now those pretty OS pictures will show up if Metasploit knows about the OS.
+- Added a 52 character length limit to a target's description in the target
+  dropdown. This stops weird GUI layouts caused by long target descriptions.
+- Exploit recommendations now take into account FreeBSD hosts.
+- Added an OpenBSD option to the hosts menu.
+- Armitage now does a setg AutoLoadStdapi true when setting up MSF.
+- Last modified field of file browser now sorts properly.
+- Jobs console and its kill feature should now work in all circumstances.
+- Session menus for meterpreter now limited for non-Win meterp sessions.
+- Updated Armitage/Windows to provide a better startup experience. Simply
+  extract the archive over your MSF install and rock n' roll.
+
+22 Dec 10 Changes
+---------
+- Updated meterpreter shell and command shell console to honor your set
+  preferences. I forgot to pass $preferences to the console constructor. Doh!
+- Added a -d/--debug command line option. This will dump System.getProperties()
+  and a log of all exchanges with the MSF server to debug.log in the current
+  working directory.
+- To play nice with existing conventions, Armitage is now licensed under the
+  BSD license. Distribute, use, reuse, recycle.... have fun.
+- Fixed a deadlock condition that arose when a large nmap scan is imported
+- About dialog now shows up centered.
+- Armitage now has a graphic for Cisco IOS. You can mark a host as a Cisco IOS 
+  device. Also Armitage recognizes IOS from an NMAP Scan.	
+- Fixed Armitage "crash" due to read timeouts. This would occur for those of
+  you who ran a really taxing operation (e.g., db_autopwn).
+- Added a time limit flag to db_autopwn (20s)
+- Ctrl+R is now even more aggressive clearing internal data structures.
+- Shell N -> Meterpreter... no longer blocks waiting for the operation to
+  complete.
+
+13 Dec 10 Changes
+---------
+
+- Added Meterpreter -> Browse -> Webcam Shot to grab webcam snap shots.
+- You may now click the image in the webcam/screenshot view to save it.
+- Workspace -> Create menu now automatically switches you to the net workspace.
+- UNIX shell sessions now have an Upload... menu. This item will open a local
+  file and use the printf command on the remote host to put it together. It's 
+  slow but it works. 
+- Removed the rename file menu item from the file browser. It turns out I had 
+  my Windows command shell vs. meterpreter command interface crossed. The 
+  command doesn't exist in Meterpreter.
+- Upload button now waits until file is uploaded to refresh file listing
+- Added Timestomp item to File Browser popup menu. This works like a clipboard.
+  Select Get MACE to capture the MACE values of the current file. Use Set MACE
+  on another file to set the MACE values to the currently known attributes.
+- Dump hashes menu item no longer pulls up a new credentials tab. 
+- Added a Refresh button to the credentials tab.
+- Updated db refresh code to be a little smarter about when it needs to merge
+  db_notes hints into the MSF database.
+
+6 Dec 10 Changes
+--------
+
+- added -y filename.yml command line option for specifying a YAML file with
+  database parameters
+- updated "Start MSF" to launch "ruby msfrpcd" on Windows. This requires the 
+  current working directory of Armitage be set to the Metasploit base directory.
+- jobs view now parses job output with only 3 columns of information.
+- connect dialog is now centered on your screen when you start Armitage
+- Armitage now saves your settings when you use Start MSF.
+- Armitage now forces cells in editor mode to save before launching a module or
+  an exploit. This should prevent a few surprises where things seemed like they
+  weren't working for a few of you.
+- MSF Discovery Scans are now started from a separate thread, preventing 
+  Armitage from "locking up" while the scans launch. A dialog also comes up to
+  state how many scans were launched.
+- MSF Discovery Scans are now limited to 2 threads/scan on Windows and 8 on
+  other operating systems. This prevents serious lag issues caused by 
+  starting too many threads.
+- connect dialog is now a window, meaning it has an icon in whatever your 
+  window manager is and if you close it Armitage exits.
+- updated DB Connect String helper dialog to ask for DB user, DB pass, DB host, 
+  and DB name. This should prevent some of you from confusing the database 
+  user/pass with the MSFRPCD user/pass.
+- Current environment variables are now passed to msfrpcd when executed from
+  Armitage. This will allow msfrpcd to inherit any PATH changes and other 
+  necessary things when Armitage is run from a shell script or batch file.
+- Added .svn folders to the Armitage distribution. Now you can use svn update .
+  to keep your install of Armitage up to date.
+- File browser upload and make directory commands now allow files with spaces
+  in them.
+- Armitage will now exit if it takes longer than 5 seconds to shutdown msfrpcd
+  when cancel is pressed during the connecting phase.
+
+25 Nov 10
+---------
+- start msf button now kills msfrpcd session if db_connect fails
+- set default database options to mysql with BackTrack 4 R2 settings.
+- Armitage -> Exit menu now kills msfrpcd, if the "Start MSF" button was used
+- Added ability to set up a multi/handler from Payload launch dialog
+
+13 Nov 10
+---------
+- fixed file browser directory icon showing up in every field within Windows L&F
+- added an export button to the credentials view. This will save the credentials to 
+  a pwdump format file.
+- fixed console highlighting issue, sadly you'll need to click in the console input 
+  box for it to have focus again. Write once, debug everywhere.
+- added "hail mary" attack option--this launches db_autopwn
+- attack menus now honor the armitage.required_exploit_rank.string setting
+- added Ctrl+R shortcut for refreshing the target view (esp. OS info)
+- fixed db_notes parsing for latest version of MSF (3.5.x?)
+- fixed how auxiliary scans are displayed in the jobs table.
+- db connect helper now prepopulates fields with info taken from connect string
+- added an 8s timeout to abort the database connect if it fails.
+- OS from db_notes to db_hosts refresh is now guaranteed on connect
+- Packaged everything into a single jar file, now I can code in what I like 
+  without hassle from people who are too lazy to look at the code.
+- SSL handshake now fails after 8 seconds (should give those of you trying
+  an SSL connect to a non-SSL server an idea that something is up)
+- added an executable to launch Armitage on Windows
+- fixed command shell interaction bug caused by directories with spaces.
+- Start MSF button now reports an error if it couldn't start MSF-RPC
+
+2 Nov 10
+--------
+- Initial (priv8) release.
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Example plugin changelog</title>
-    <style type="text/css">
-        BODY {
-            font-size : 100%;
-        }
-        BODY, TD, TH {
-            font-family : tahoma, verdana, arial, helvetica, sans-serif;
-            font-size : 0.8em;
-        }
-        H2 {
-             font-size : 10pt;
-             font-weight : bold;
-        }
-        A:hover {
-            text-decoration : none;
-        }
-        H1 {
-            font-family : tahoma, arial, helvetica, sans-serif;
-            font-size : 1.4em;
-            font-weight: bold;
-            border-bottom : 1px #ccc solid;
-            padding-bottom : 2px;
-        }
-
-        TT {
-            font-family : courier new;
-            font-weight : bold;
-            color : #060;
-        }
-        PRE {
-            font-family : courier new;
-            font-size : 100%;
-        }
-        .events TH {
-            font-size: 8pt;
-            font-family: verdana;
-            font-weight: bold;
-            text-align: left;
-            background-color: #eee;
-            border-bottom: 1px #ccc solid;
-        }
-
-        .events .event {
-            font-weight: bold;
-        }
-
-        .events TD {
-            border-bottom: 1px #ccc dotted;
-            vertical-align: top;
-        }
-    </style>
-</head>
-<body>
-
-<h1>
-Example plugin
-</h1>
-
-<h2>Todo</h2>
-
-<p>
-Add changelog content here
-</p>
-</body>
-</html>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-   <class>com.example.openfire.plugin.Example</class>
-   <name>PLUGINNAME</name>
-   <description>PLUGINDESCRIPTION</description>
-   <author>PLUGINAUTHOR</author>
-   <version>1.0.0</version>
-   <date>7/7/2008</date>
-   <minServerVersion>3.5.0</minServerVersion>
-</plugin>
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Example plugin readme</title>
-    <style type="text/css">
-        BODY {
-            font-size : 100%;
-        }
-        BODY, TD, TH {
-            font-family : tahoma, verdana, arial, helvetica, sans-serif;
-            font-size : 0.8em;
-        }
-        H2 {
-             font-size : 10pt;
-             font-weight : bold;
-        }
-        A:hover {
-            text-decoration : none;
-        }
-        H1 {
-            font-family : tahoma, arial, helvetica, sans-serif;
-            font-size : 1.4em;
-            font-weight: bold;
-            border-bottom : 1px #ccc solid;
-            padding-bottom : 2px;
-        }
-
-        TT {
-            font-family : courier new;
-            font-weight : bold;
-            color : #060;
-        }
-        PRE {
-            font-family : courier new;
-            font-size : 100%;
-        }
-        .events TH {
-            font-size: 8pt;
-            font-family: verdana;
-            font-weight: bold;
-            text-align: left;
-            background-color: #eee;
-            border-bottom: 1px #ccc solid;
-        }
-
-        .events .event {
-            font-weight: bold;
-        }
-
-        .events TD {
-            border-bottom: 1px #ccc dotted;
-            vertical-align: top;
-        }
-    </style>
-</head>
-<body>
-
-<h1>
-Example plugin
-</h1>
-
-<h2>Todo</h2>
-
-<p>
-Add readme content here
-</p>
-</body>
-</html>
@@ -1,55 +0,0 @@
-%PDF-1.0
-1 0 obj
-<<
-	/Pages 2 0 R
-	/Type /Catalog
->>
-endobj
-2 0 obj
-<<
-	/Count 1
-	/Kids [ 3 0 R ]
-	/Type /Pages
->>
-endobj
-3 0 obj
-<<
-	/Contents 4 0 R
-	/Parent 2 0 R
-	/Resources <<
-		/Font <<
-			/F1 <<
-				/Type /Font
-				/Subtype /Type1
-				/BaseFont /Helvetica
-				/Name /F1
-			>>
-		>>
-	>>
-	/Type /Page
-	/MediaBox [ 0 0 795 842 ]
->>
-endobj
-4 0 obj
-<<
-	/Length 0
->>stream
-
-endstream
-endobj
-xref
-0 5
-0000000000 65535 f
-0000000010 00000 n
-0000000067 00000 n
-0000000136 00000 n
-0000000373 00000 n
-trailer
-<<
-	/Root 1 0 R
-	/Size 5
-	/Info 0 0 R
->>
-startxref
-429
-%%EOF
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
-<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
-</Relationships>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
-<Template>Normal.dotm</Template>
-<TotalTime>4</TotalTime>
-<Pages>1</Pages>
-<Words>217</Words>
-<Characters>1238</Characters>
-<Application>Microsoft Office Word</Application>
-<DocSecurity>0</DocSecurity>
-<Lines>10</Lines>
-<Paragraphs>2</Paragraphs>
-<ScaleCrop>false</ScaleCrop>
-<Company>home</Company>
-<LinksUpToDate>false</LinksUpToDate>
-<CharactersWithSpaces>1453</CharactersWithSpaces>
-<SharedDoc>false</SharedDoc>
-<HyperlinksChanged>false</HyperlinksChanged>
-<AppVersion>12.0000</AppVersion>
-</Properties>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<dc:creator>Win7</dc:creator>
-<cp:lastModifiedBy>Win7</cp:lastModifiedBy>
-<cp:revision>1</cp:revision>
-<dcterms:created xsi:type="dcterms:W3CDTF">2013-10-03T22:46:00Z</dcterms:created>
-<dcterms:modified xsi:type="dcterms:W3CDTF">2013-10-03T23:17:00Z</dcterms:modified>
-</cp:coreProperties>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" Target="../embeddings/Microsoft_Office_Excel_Worksheet1.xlsx"/>
-</Relationships>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" Target="../embeddings/Microsoft_Office_Excel_Worksheet2.xlsx"/>
-</Relationships>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" Target="../embeddings/Microsoft_Office_Excel_Worksheet3.xlsx"/>
-</Relationships>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" Target="../embeddings/Microsoft_Office_Excel_Worksheet4.xlsx"/>
-</Relationships>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" Target="../embeddings/Microsoft_Office_Excel_Worksheet5.xlsx"/>
-</Relationships>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" Target="../embeddings/Microsoft_Office_Excel_Worksheet6.xlsx"/>
-</Relationships>
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<c:lang val="en-US"/>
-<c:chart>
-<c:view3D>
-<c:perspective val="30"/>
-</c:view3D>
-<c:plotArea>
-<c:layout/>
-<c:bar3DChart>
-<c:barDir val="col"/>
-<c:grouping val="standard"/>
-<c:ser>
-<c:idx val="0"/>
-<c:order val="0"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$B$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 1</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$B$2:$B$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>4.3</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2.5</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3.5</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>4.5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="1"/>
-<c:order val="1"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$C$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 2</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$C$2:$C$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2.4</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>4.4000000000000004</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>1.8</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>2.8</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="2"/>
-<c:order val="2"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$D$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 3</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$D$2:$D$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:shape val="cylinder"/>
-<c:axId val="51657728"/>
-<c:axId val="69190400"/>
-<c:axId val="25292288"/>
-</c:bar3DChart>
-<c:catAx>
-<c:axId val="51657728"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="69190400"/>
-<c:crosses val="autoZero"/>
-<c:auto val="1"/>
-<c:lblAlgn val="ctr"/>
-<c:lblOffset val="100"/>
-</c:catAx>
-<c:valAx>
-<c:axId val="69190400"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="l"/>
-<c:majorGridlines/>
-<c:numFmt formatCode="General" sourceLinked="1"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="51657728"/>
-<c:crosses val="autoZero"/>
-<c:crossBetween val="between"/>
-</c:valAx>
-<c:serAx>
-<c:axId val="25292288"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="69190400"/>
-<c:crosses val="autoZero"/>
-</c:serAx>
-</c:plotArea>
-<c:legend>
-<c:legendPos val="r"/>
-<c:layout/>
-</c:legend>
-<c:plotVisOnly val="1"/>
-</c:chart>
-<c:externalData r:id="rId1"/>
-</c:chartSpace>
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<c:lang val="en-US"/>
-<c:chart>
-<c:view3D>
-<c:rAngAx val="1"/>
-</c:view3D>
-<c:plotArea>
-<c:layout/>
-<c:bar3DChart>
-<c:barDir val="col"/>
-<c:grouping val="clustered"/>
-<c:ser>
-<c:idx val="0"/>
-<c:order val="0"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$B$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 1</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$B$2:$B$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>4.3</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2.5</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3.5</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>4.5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="1"/>
-<c:order val="1"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$C$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 2</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$C$2:$C$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2.4</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>4.4000000000000004</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>1.8</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>2.8</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="2"/>
-<c:order val="2"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$D$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 3</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$D$2:$D$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:shape val="pyramid"/>
-<c:axId val="71774208"/>
-<c:axId val="71776128"/>
-<c:axId val="0"/>
-</c:bar3DChart>
-<c:catAx>
-<c:axId val="71774208"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="71776128"/>
-<c:crosses val="autoZero"/>
-<c:auto val="1"/>
-<c:lblAlgn val="ctr"/>
-<c:lblOffset val="100"/>
-</c:catAx>
-<c:valAx>
-<c:axId val="71776128"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="l"/>
-<c:majorGridlines/>
-<c:numFmt formatCode="General" sourceLinked="1"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="71774208"/>
-<c:crosses val="autoZero"/>
-<c:crossBetween val="between"/>
-</c:valAx>
-</c:plotArea>
-<c:legend>
-<c:legendPos val="r"/>
-<c:layout/>
-</c:legend>
-<c:plotVisOnly val="1"/>
-</c:chart>
-<c:externalData r:id="rId1"/>
-</c:chartSpace>
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<c:lang val="en-US"/>
-<c:chart>
-<c:view3D>
-<c:perspective val="30"/>
-</c:view3D>
-<c:plotArea>
-<c:layout/>
-<c:bar3DChart>
-<c:barDir val="col"/>
-<c:grouping val="standard"/>
-<c:ser>
-<c:idx val="0"/>
-<c:order val="0"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$B$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 1</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$B$2:$B$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>4.3</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2.5</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3.5</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>4.5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="1"/>
-<c:order val="1"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$C$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 2</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$C$2:$C$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2.4</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>4.4000000000000004</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>1.8</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>2.8</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="2"/>
-<c:order val="2"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$D$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 3</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$D$2:$D$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:shape val="pyramid"/>
-<c:axId val="50252800"/>
-<c:axId val="50255744"/>
-<c:axId val="71870208"/>
-</c:bar3DChart>
-<c:catAx>
-<c:axId val="50252800"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="50255744"/>
-<c:crosses val="autoZero"/>
-<c:auto val="1"/>
-<c:lblAlgn val="ctr"/>
-<c:lblOffset val="100"/>
-</c:catAx>
-<c:valAx>
-<c:axId val="50255744"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="l"/>
-<c:majorGridlines/>
-<c:numFmt formatCode="General" sourceLinked="1"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="50252800"/>
-<c:crosses val="autoZero"/>
-<c:crossBetween val="between"/>
-</c:valAx>
-<c:serAx>
-<c:axId val="71870208"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="50255744"/>
-<c:crosses val="autoZero"/>
-</c:serAx>
-</c:plotArea>
-<c:legend>
-<c:legendPos val="r"/>
-<c:layout/>
-</c:legend>
-<c:plotVisOnly val="1"/>
-</c:chart>
-<c:externalData r:id="rId1"/>
-</c:chartSpace>
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<c:lang val="en-US"/>
-<c:chart>
-<c:title>
-<c:layout/>
-</c:title>
-<c:view3D>
-<c:rotX val="30"/>
-<c:perspective val="30"/>
-</c:view3D>
-<c:plotArea>
-<c:layout/>
-<c:bar3DChart>
-<c:barDir val="bar"/>
-<c:grouping val="clustered"/>
-<c:ser>
-<c:idx val="0"/>
-<c:order val="0"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$B$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Sales</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Sq.. 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Sq.. 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Sq.. 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Sq.. 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$B$2:$B$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>8.1999999999999993</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>3.2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>1.4</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>1.2</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:shape val="box"/>
-<c:axId val="50777472"/>
-<c:axId val="50780032"/>
-<c:axId val="0"/>
-</c:bar3DChart>
-<c:valAx>
-<c:axId val="50780032"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:majorGridlines/>
-<c:numFmt formatCode="General" sourceLinked="1"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="50777472"/>
-<c:crossBetween val="between"/>
-</c:valAx>
-<c:catAx>
-<c:axId val="50777472"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="l"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="50780032"/>
-<c:auto val="1"/>
-<c:lblAlgn val="ctr"/>
-<c:lblOffset val="100"/>
-</c:catAx>
-</c:plotArea>
-<c:legend>
-<c:legendPos val="r"/>
-<c:layout/>
-</c:legend>
-<c:plotVisOnly val="1"/>
-</c:chart>
-<c:externalData r:id="rId1"/>
-</c:chartSpace>
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<c:lang val="en-US"/>
-<c:chart>
-<c:view3D>
-<c:perspective val="30"/>
-</c:view3D>
-<c:plotArea>
-<c:layout/>
-<c:line3DChart>
-<c:grouping val="standard"/>
-<c:ser>
-<c:idx val="0"/>
-<c:order val="0"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$B$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 1</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$B$2:$B$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>4.3</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2.5</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3.5</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>4.5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="1"/>
-<c:order val="1"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$C$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 2</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$C$2:$C$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2.4</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>4.4000000000000004</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>1.8</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>2.8</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="2"/>
-<c:order val="2"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$D$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 3</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$D$2:$D$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:axId val="50940928"/>
-<c:axId val="68729472"/>
-<c:axId val="78014208"/>
-</c:line3DChart>
-<c:catAx>
-<c:axId val="50940928"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="68729472"/>
-<c:crosses val="autoZero"/>
-<c:auto val="1"/>
-<c:lblAlgn val="ctr"/>
-<c:lblOffset val="100"/>
-</c:catAx>
-<c:valAx>
-<c:axId val="68729472"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="l"/>
-<c:majorGridlines/>
-<c:numFmt formatCode="General" sourceLinked="1"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="50940928"/>
-<c:crosses val="autoZero"/>
-<c:crossBetween val="between"/>
-</c:valAx>
-<c:serAx>
-<c:axId val="78014208"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="68729472"/>
-<c:crosses val="autoZero"/>
-</c:serAx>
-</c:plotArea>
-<c:legend>
-<c:legendPos val="r"/>
-<c:layout/>
-</c:legend>
-<c:plotVisOnly val="1"/>
-</c:chart>
-<c:externalData r:id="rId1"/>
-</c:chartSpace>
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
-<c:lang val="en-US"/>
-<c:chart>
-<c:view3D>
-<c:perspective val="30"/>
-</c:view3D>
-<c:plotArea>
-<c:layout/>
-<c:surface3DChart>
-<c:ser>
-<c:idx val="0"/>
-<c:order val="0"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$B$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 1</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$B$2:$B$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>4.3</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2.5</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3.5</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>4.5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="1"/>
-<c:order val="1"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$C$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 2</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$C$2:$C$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2.4</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>4.4000000000000004</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>1.8</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>2.8</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:ser>
-<c:idx val="2"/>
-<c:order val="2"/>
-<c:tx>
-<c:strRef>
-<c:f>Sheet1!$D$1</c:f>
-<c:strCache>
-<c:ptCount val="1"/>
-<c:pt idx="0">
-<c:v>Series 3</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:tx>
-<c:cat>
-<c:strRef>
-<c:f>Sheet1!$A$2:$A$5</c:f>
-<c:strCache>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>Category 1</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>Category 2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>Category 3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>Category 4</c:v>
-</c:pt>
-</c:strCache>
-</c:strRef>
-</c:cat>
-<c:val>
-<c:numRef>
-<c:f>Sheet1!$D$2:$D$5</c:f>
-<c:numCache>
-<c:formatCode>General</c:formatCode>
-<c:ptCount val="4"/>
-<c:pt idx="0">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="1">
-<c:v>2</c:v>
-</c:pt>
-<c:pt idx="2">
-<c:v>3</c:v>
-</c:pt>
-<c:pt idx="3">
-<c:v>5</c:v>
-</c:pt>
-</c:numCache>
-</c:numRef>
-</c:val>
-</c:ser>
-<c:bandFmts/>
-<c:axId val="59304576"/>
-<c:axId val="68746240"/>
-<c:axId val="59572224"/>
-</c:surface3DChart>
-<c:catAx>
-<c:axId val="59304576"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="68746240"/>
-<c:crosses val="autoZero"/>
-<c:auto val="1"/>
-<c:lblAlgn val="ctr"/>
-<c:lblOffset val="100"/>
-</c:catAx>
-<c:valAx>
-<c:axId val="68746240"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="l"/>
-<c:majorGridlines/>
-<c:numFmt formatCode="General" sourceLinked="1"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="59304576"/>
-<c:crosses val="autoZero"/>
-<c:crossBetween val="midCat"/>
-</c:valAx>
-<c:serAx>
-<c:axId val="59572224"/>
-<c:scaling>
-<c:orientation val="minMax"/>
-</c:scaling>
-<c:axPos val="b"/>
-<c:tickLblPos val="nextTo"/>
-<c:crossAx val="68746240"/>
-<c:crosses val="autoZero"/>
-</c:serAx>
-</c:plotArea>
-<c:legend>
-<c:legendPos val="r"/>
-<c:layout/>
-<c:txPr>
-<a:bodyPr/>
-<a:lstStyle/>
-<a:p>
-<a:pPr rtl="0">
-<a:defRPr/>
-</a:pPr>
-<a:endParaRPr lang="en-US"/>
-</a:p>
-</c:txPr>
-</c:legend>
-<c:plotVisOnly val="1"/>
-</c:chart>
-<c:externalData r:id="rId1"/>
-</c:chartSpace>
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:fonts xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-<w:font w:name="Calibri">
-<w:panose1 w:val="020F0502020204030204"/>
-<w:charset w:val="CC"/>
-<w:family w:val="swiss"/>
-<w:pitch w:val="variable"/>
-<w:sig w:usb0="E00002FF" w:usb1="4000ACFF" w:usb2="00000001" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
-</w:font>
-<w:font w:name="Times New Roman">
-<w:panose1 w:val="02020603050405020304"/>
-<w:charset w:val="CC"/>
-<w:family w:val="roman"/>
-<w:pitch w:val="variable"/>
-<w:sig w:usb0="E0002AFF" w:usb1="C0007841" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
-</w:font>
-<w:font w:name="Tahoma">
-<w:panose1 w:val="020B0604030504040204"/>
-<w:charset w:val="CC"/>
-<w:family w:val="swiss"/>
-<w:pitch w:val="variable"/>
-<w:sig w:usb0="E1002EFF" w:usb1="C000605B" w:usb2="00000029" w:usb3="00000000" w:csb0="000101FF" w:csb1="00000000"/>
-</w:font>
-<w:font w:name="Cambria">
-<w:panose1 w:val="02040503050406030204"/>
-<w:charset w:val="CC"/>
-<w:family w:val="roman"/>
-<w:pitch w:val="variable"/>
-<w:sig w:usb0="E00002FF" w:usb1="400004FF" w:usb2="00000000" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
-</w:font>
-</w:fonts>
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:settings xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main">
-<w:zoom w:percent="100"/>
-<w:proofState w:spelling="clean" w:grammar="clean"/>
-<w:defaultTabStop w:val="708"/>
-<w:characterSpacingControl w:val="doNotCompress"/>
-<w:compat/>
-<w:rsids>
-<w:rsidRoot w:val="00D15BD0"/>
-<w:rsid w:val="00D15BD0"/>
-<w:rsid w:val="00F8254F"/>
-</w:rsids>
-<m:mathPr>
-<m:mathFont m:val="Cambria Math"/>
-<m:brkBin m:val="before"/>
-<m:brkBinSub m:val="--"/>
-<m:smallFrac m:val="off"/>
-<m:dispDef/>
-<m:lMargin m:val="0"/>
-<m:rMargin m:val="0"/>
-<m:defJc m:val="centerGroup"/>
-<m:wrapIndent m:val="1440"/>
-<m:intLim m:val="subSup"/>
-<m:naryLim m:val="undOvr"/>
-</m:mathPr>
-<w:themeFontLang w:val="en-US"/>
-<w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
-<w:shapeDefaults>
-<o:shapedefaults v:ext="edit" spidmax="1026"/>
-<o:shapelayout v:ext="edit">
-<o:idmap v:ext="edit" data="1"/>
-</o:shapelayout>
-</w:shapeDefaults>
-<w:decimalSymbol w:val=","/>
-<w:listSeparator w:val=";"/>
-</w:settings>
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:styles xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-<w:docDefaults>
-<w:rPrDefault>
-<w:rPr>
-<w:rFonts w:asciiTheme="minorHAnsi" w:hAnsiTheme="minorHAnsi" w:cstheme="minorBidi"/>
-<w:sz w:val="22"/>
-<w:szCs w:val="22"/>
-<w:lang w:val="en-US" w:bidi="ar-SA"/>
-</w:rPr>
-</w:rPrDefault>
-<w:pPrDefault>
-<w:pPr>
-<w:spacing w:after="200" w:line="276" w:lineRule="auto"/>
-</w:pPr>
-</w:pPrDefault>
-</w:docDefaults>
-<w:latentStyles w:defLockedState="0" w:defUIPriority="99" w:defSemiHidden="1" w:defUnhideWhenUsed="1" w:defQFormat="0" w:count="267">
-<w:lsdException w:name="Normal" w:semiHidden="0" w:uiPriority="0" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="heading 1" w:semiHidden="0" w:uiPriority="9" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="heading 2" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 3" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 4" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 5" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 6" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 7" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 8" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="heading 9" w:uiPriority="9" w:qFormat="1"/>
-<w:lsdException w:name="toc 1" w:uiPriority="39"/>
-<w:lsdException w:name="toc 2" w:uiPriority="39"/>
-<w:lsdException w:name="toc 3" w:uiPriority="39"/>
-<w:lsdException w:name="toc 4" w:uiPriority="39"/>
-<w:lsdException w:name="toc 5" w:uiPriority="39"/>
-<w:lsdException w:name="toc 6" w:uiPriority="39"/>
-<w:lsdException w:name="toc 7" w:uiPriority="39"/>
-<w:lsdException w:name="toc 8" w:uiPriority="39"/>
-<w:lsdException w:name="toc 9" w:uiPriority="39"/>
-<w:lsdException w:name="caption" w:uiPriority="35" w:qFormat="1"/>
-<w:lsdException w:name="Title" w:semiHidden="0" w:uiPriority="10" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Default Paragraph Font" w:uiPriority="1"/>
-<w:lsdException w:name="Subtitle" w:semiHidden="0" w:uiPriority="11" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Strong" w:semiHidden="0" w:uiPriority="22" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Emphasis" w:semiHidden="0" w:uiPriority="20" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Table Grid" w:semiHidden="0" w:uiPriority="59" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Placeholder Text" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="No Spacing" w:semiHidden="0" w:uiPriority="1" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Light Shading" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Shading Accent 1" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List Accent 1" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid Accent 1" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1 Accent 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2 Accent 1" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1 Accent 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Revision" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="List Paragraph" w:semiHidden="0" w:uiPriority="34" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Quote" w:semiHidden="0" w:uiPriority="29" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Intense Quote" w:semiHidden="0" w:uiPriority="30" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Medium List 2 Accent 1" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1 Accent 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2 Accent 1" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3 Accent 1" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List Accent 1" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading Accent 1" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List Accent 1" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid Accent 1" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Shading Accent 2" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List Accent 2" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid Accent 2" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1 Accent 2" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2 Accent 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1 Accent 2" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 2 Accent 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1 Accent 2" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2 Accent 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3 Accent 2" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List Accent 2" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading Accent 2" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List Accent 2" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid Accent 2" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Shading Accent 3" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List Accent 3" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid Accent 3" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1 Accent 3" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2 Accent 3" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1 Accent 3" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 2 Accent 3" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1 Accent 3" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2 Accent 3" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3 Accent 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List Accent 3" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading Accent 3" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List Accent 3" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid Accent 3" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Shading Accent 4" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List Accent 4" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid Accent 4" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1 Accent 4" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2 Accent 4" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1 Accent 4" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 2 Accent 4" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1 Accent 4" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2 Accent 4" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3 Accent 4" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List Accent 4" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading Accent 4" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List Accent 4" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid Accent 4" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Shading Accent 5" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List Accent 5" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid Accent 5" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1 Accent 5" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2 Accent 5" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1 Accent 5" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 2 Accent 5" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1 Accent 5" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2 Accent 5" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3 Accent 5" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List Accent 5" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading Accent 5" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List Accent 5" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid Accent 5" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Shading Accent 6" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light List Accent 6" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Light Grid Accent 6" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 1 Accent 6" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Shading 2 Accent 6" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 1 Accent 6" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium List 2 Accent 6" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 1 Accent 6" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 2 Accent 6" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Medium Grid 3 Accent 6" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Dark List Accent 6" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Shading Accent 6" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful List Accent 6" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Colorful Grid Accent 6" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-<w:lsdException w:name="Subtle Emphasis" w:semiHidden="0" w:uiPriority="19" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Intense Emphasis" w:semiHidden="0" w:uiPriority="21" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Subtle Reference" w:semiHidden="0" w:uiPriority="31" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Intense Reference" w:semiHidden="0" w:uiPriority="32" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Book Title" w:semiHidden="0" w:uiPriority="33" w:unhideWhenUsed="0" w:qFormat="1"/>
-<w:lsdException w:name="Bibliography" w:uiPriority="37"/>
-<w:lsdException w:name="TOC Heading" w:uiPriority="39" w:qFormat="1"/>
-</w:latentStyles>
-<w:style w:type="paragraph" w:default="1" w:styleId="Normal">
-<w:name w:val="Normal"/>
-<w:qFormat/>
-<w:rsid w:val="00063BF6"/>
-</w:style>
-<w:style w:type="character" w:default="1" w:styleId="DefaultParagraphFont">
-<w:name w:val="Default Paragraph Font"/>
-<w:uiPriority w:val="1"/>
-<w:semiHidden/>
-<w:unhideWhenUsed/>
-</w:style>
-<w:style w:type="table" w:default="1" w:styleId="TableNormal">
-<w:name w:val="Normal Table"/>
-<w:uiPriority w:val="99"/>
-<w:semiHidden/>
-<w:unhideWhenUsed/>
-<w:qFormat/>
-<w:tblPr>
-<w:tblInd w:w="0" w:type="dxa"/>
-<w:tblCellMar>
-<w:top w:w="0" w:type="dxa"/>
-<w:left w:w="108" w:type="dxa"/>
-<w:bottom w:w="0" w:type="dxa"/>
-<w:right w:w="108" w:type="dxa"/>
-</w:tblCellMar>
-</w:tblPr>
-</w:style>
-<w:style w:type="numbering" w:default="1" w:styleId="NoList">
-<w:name w:val="No List"/>
-<w:uiPriority w:val="99"/>
-<w:semiHidden/>
-<w:unhideWhenUsed/>
-</w:style>
-<w:style w:type="paragraph" w:styleId="BalloonText">
-<w:name w:val="Balloon Text"/>
-<w:basedOn w:val="Normal"/>
-<w:link w:val="BalloonTextChar"/>
-<w:uiPriority w:val="99"/>
-<w:semiHidden/>
-<w:unhideWhenUsed/>
-<w:rsid w:val="00CD271A"/>
-<w:pPr>
-<w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
-</w:pPr>
-<w:rPr>
-<w:rFonts w:ascii="Tahoma" w:hAnsi="Tahoma" w:cs="Tahoma"/>
-<w:sz w:val="16"/>
-<w:szCs w:val="16"/>
-</w:rPr>
-</w:style>
-<w:style w:type="character" w:customStyle="1" w:styleId="BalloonTextChar">
-<w:name w:val="Balloon Text Char"/>
-<w:basedOn w:val="DefaultParagraphFont"/>
-<w:link w:val="BalloonText"/>
-<w:uiPriority w:val="99"/>
-<w:semiHidden/>
-<w:rsid w:val="00CD271A"/>
-<w:rPr>
-<w:rFonts w:ascii="Tahoma" w:hAnsi="Tahoma" w:cs="Tahoma"/>
-<w:sz w:val="16"/>
-<w:szCs w:val="16"/>
-</w:rPr>
-</w:style>
-</w:styles>
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
-<a:themeElements>
-<a:clrScheme name="Office">
-<a:dk1>
-<a:sysClr val="windowText" lastClr="000000"/>
-</a:dk1>
-<a:lt1>
-<a:sysClr val="window" lastClr="FFFFFF"/>
-</a:lt1>
-<a:dk2>
-<a:srgbClr val="1F497D"/>
-</a:dk2>
-<a:lt2>
-<a:srgbClr val="EEECE1"/>
-</a:lt2>
-<a:accent1>
-<a:srgbClr val="4F81BD"/>
-</a:accent1>
-<a:accent2>
-<a:srgbClr val="C0504D"/>
-</a:accent2>
-<a:accent3>
-<a:srgbClr val="9BBB59"/>
-</a:accent3>
-<a:accent4>
-<a:srgbClr val="8064A2"/>
-</a:accent4>
-<a:accent5>
-<a:srgbClr val="4BACC6"/>
-</a:accent5>
-<a:accent6>
-<a:srgbClr val="F79646"/>
-</a:accent6>
-<a:hlink>
-<a:srgbClr val="0000FF"/>
-</a:hlink>
-<a:folHlink>
-<a:srgbClr val="800080"/>
-</a:folHlink>
-</a:clrScheme>
-<a:fontScheme name="Office">
-<a:majorFont>
-<a:latin typeface="Cambria"/>
-<a:ea typeface=""/>
-<a:cs typeface=""/>
-<a:font script="Jpan" typeface="ＭＳ ゴシック"/>
-<a:font script="Hang" typeface="맑은 고딕"/>
-<a:font script="Hans" typeface="宋体"/>
-<a:font script="Hant" typeface="新細明體"/>
-<a:font script="Arab" typeface="Times New Roman"/>
-<a:font script="Hebr" typeface="Times New Roman"/>
-<a:font script="Thai" typeface="Angsana New"/>
-<a:font script="Ethi" typeface="Nyala"/>
-<a:font script="Beng" typeface="Vrinda"/>
-<a:font script="Gujr" typeface="Shruti"/>
-<a:font script="Khmr" typeface="MoolBoran"/>
-<a:font script="Knda" typeface="Tunga"/>
-<a:font script="Guru" typeface="Raavi"/>
-<a:font script="Cans" typeface="Euphemia"/>
-<a:font script="Cher" typeface="Plantagenet Cherokee"/>
-<a:font script="Yiii" typeface="Microsoft Yi Baiti"/>
-<a:font script="Tibt" typeface="Microsoft Himalaya"/>
-<a:font script="Thaa" typeface="MV Boli"/>
-<a:font script="Deva" typeface="Mangal"/>
-<a:font script="Telu" typeface="Gautami"/>
-<a:font script="Taml" typeface="Latha"/>
-<a:font script="Syrc" typeface="Estrangelo Edessa"/>
-<a:font script="Orya" typeface="Kalinga"/>
-<a:font script="Mlym" typeface="Kartika"/>
-<a:font script="Laoo" typeface="DokChampa"/>
-<a:font script="Sinh" typeface="Iskoola Pota"/>
-<a:font script="Mong" typeface="Mongolian Baiti"/>
-<a:font script="Viet" typeface="Times New Roman"/>
-<a:font script="Uigh" typeface="Microsoft Uighur"/>
-<a:font script="Geor" typeface="Sylfaen"/>
-</a:majorFont>
-<a:minorFont>
-<a:latin typeface="Calibri"/>
-<a:ea typeface=""/>
-<a:cs typeface=""/>
-<a:font script="Jpan" typeface="ＭＳ 明朝"/>
-<a:font script="Hang" typeface="맑은 고딕"/>
-<a:font script="Hans" typeface="宋体"/>
-<a:font script="Hant" typeface="新細明體"/>
-<a:font script="Arab" typeface="Arial"/>
-<a:font script="Hebr" typeface="Arial"/>
-<a:font script="Thai" typeface="Cordia New"/>
-<a:font script="Ethi" typeface="Nyala"/>
-<a:font script="Beng" typeface="Vrinda"/>
-<a:font script="Gujr" typeface="Shruti"/>
-<a:font script="Khmr" typeface="DaunPenh"/>
-<a:font script="Knda" typeface="Tunga"/>
-<a:font script="Guru" typeface="Raavi"/>
-<a:font script="Cans" typeface="Euphemia"/>
-<a:font script="Cher" typeface="Plantagenet Cherokee"/>
-<a:font script="Yiii" typeface="Microsoft Yi Baiti"/>
-<a:font script="Tibt" typeface="Microsoft Himalaya"/>
-<a:font script="Thaa" typeface="MV Boli"/>
-<a:font script="Deva" typeface="Mangal"/>
-<a:font script="Telu" typeface="Gautami"/>
-<a:font script="Taml" typeface="Latha"/>
-<a:font script="Syrc" typeface="Estrangelo Edessa"/>
-<a:font script="Orya" typeface="Kalinga"/>
-<a:font script="Mlym" typeface="Kartika"/>
-<a:font script="Laoo" typeface="DokChampa"/>
-<a:font script="Sinh" typeface="Iskoola Pota"/>
-<a:font script="Mong" typeface="Mongolian Baiti"/>
-<a:font script="Viet" typeface="Arial"/>
-<a:font script="Uigh" typeface="Microsoft Uighur"/>
-<a:font script="Geor" typeface="Sylfaen"/>
-</a:minorFont>
-</a:fontScheme>
-<a:fmtScheme name="Office">
-<a:fillStyleLst>
-<a:solidFill>
-<a:schemeClr val="phClr"/>
-</a:solidFill>
-<a:gradFill rotWithShape="1">
-<a:gsLst>
-<a:gs pos="0">
-<a:schemeClr val="phClr">
-<a:tint val="50000"/>
-<a:satMod val="300000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="35000">
-<a:schemeClr val="phClr">
-<a:tint val="37000"/>
-<a:satMod val="300000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="100000">
-<a:schemeClr val="phClr">
-<a:tint val="15000"/>
-<a:satMod val="350000"/>
-</a:schemeClr>
-</a:gs>
-</a:gsLst>
-<a:lin ang="16200000" scaled="1"/>
-</a:gradFill>
-<a:gradFill rotWithShape="1">
-<a:gsLst>
-<a:gs pos="0">
-<a:schemeClr val="phClr">
-<a:shade val="51000"/>
-<a:satMod val="130000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="80000">
-<a:schemeClr val="phClr">
-<a:shade val="93000"/>
-<a:satMod val="130000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="100000">
-<a:schemeClr val="phClr">
-<a:shade val="94000"/>
-<a:satMod val="135000"/>
-</a:schemeClr>
-</a:gs>
-</a:gsLst>
-<a:lin ang="16200000" scaled="0"/>
-</a:gradFill>
-</a:fillStyleLst>
-<a:lnStyleLst>
-<a:ln w="9525" cap="flat" cmpd="sng" algn="ctr">
-<a:solidFill>
-<a:schemeClr val="phClr">
-<a:shade val="95000"/>
-<a:satMod val="105000"/>
-</a:schemeClr>
-</a:solidFill>
-<a:prstDash val="solid"/>
-</a:ln>
-<a:ln w="25400" cap="flat" cmpd="sng" algn="ctr">
-<a:solidFill>
-<a:schemeClr val="phClr"/>
-</a:solidFill>
-<a:prstDash val="solid"/>
-</a:ln>
-<a:ln w="38100" cap="flat" cmpd="sng" algn="ctr">
-<a:solidFill>
-<a:schemeClr val="phClr"/>
-</a:solidFill>
-<a:prstDash val="solid"/>
-</a:ln>
-</a:lnStyleLst>
-<a:effectStyleLst>
-<a:effectStyle>
-<a:effectLst>
-<a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0">
-<a:srgbClr val="000000">
-<a:alpha val="38000"/>
-</a:srgbClr>
-</a:outerShdw>
-</a:effectLst>
-</a:effectStyle>
-<a:effectStyle>
-<a:effectLst>
-<a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0">
-<a:srgbClr val="000000">
-<a:alpha val="35000"/>
-</a:srgbClr>
-</a:outerShdw>
-</a:effectLst>
-</a:effectStyle>
-<a:effectStyle>
-<a:effectLst>
-<a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0">
-<a:srgbClr val="000000">
-<a:alpha val="35000"/>
-</a:srgbClr>
-</a:outerShdw>
-</a:effectLst>
-<a:scene3d>
-<a:camera prst="orthographicFront">
-<a:rot lat="0" lon="0" rev="0"/>
-</a:camera>
-<a:lightRig rig="threePt" dir="t">
-<a:rot lat="0" lon="0" rev="1200000"/>
-</a:lightRig>
-</a:scene3d>
-<a:sp3d>
-<a:bevelT w="63500" h="25400"/>
-</a:sp3d>
-</a:effectStyle>
-</a:effectStyleLst>
-<a:bgFillStyleLst>
-<a:solidFill>
-<a:schemeClr val="phClr"/>
-</a:solidFill>
-<a:gradFill rotWithShape="1">
-<a:gsLst>
-<a:gs pos="0">
-<a:schemeClr val="phClr">
-<a:tint val="40000"/>
-<a:satMod val="350000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="40000">
-<a:schemeClr val="phClr">
-<a:tint val="45000"/>
-<a:shade val="99000"/>
-<a:satMod val="350000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="100000">
-<a:schemeClr val="phClr">
-<a:shade val="20000"/>
-<a:satMod val="255000"/>
-</a:schemeClr>
-</a:gs>
-</a:gsLst>
-<a:path path="circle">
-<a:fillToRect l="50000" t="-80000" r="50000" b="180000"/>
-</a:path>
-</a:gradFill>
-<a:gradFill rotWithShape="1">
-<a:gsLst>
-<a:gs pos="0">
-<a:schemeClr val="phClr">
-<a:tint val="80000"/>
-<a:satMod val="300000"/>
-</a:schemeClr>
-</a:gs>
-<a:gs pos="100000">
-<a:schemeClr val="phClr">
-<a:shade val="30000"/>
-<a:satMod val="200000"/>
-</a:schemeClr>
-</a:gs>
-</a:gsLst>
-<a:path path="circle">
-<a:fillToRect l="50000" t="50000" r="50000" b="50000"/>
-</a:path>
-</a:gradFill>
-</a:bgFillStyleLst>
-</a:fmtScheme>
-</a:themeElements>
-<a:objectDefaults/>
-<a:extraClrSchemeLst/>
-</a:theme>
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:webSettings xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-<w:optimizeForBrowser/>
-</w:webSettings>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tod Beardsley	52b19952e6	Updating MSXML module with more targets	2012-06-20 15:07:47 -05:00
Tod Beardsley	cd1a3d543f	Remove trailing space	2012-06-19 16:43:37 -05:00
Tod Beardsley	d8f9bfb0d7	Merge branch 'master' into release	2012-06-18 20:06:01 -05:00
Tod Beardsley	ee66cce176	Merge branch 'master' into release	2012-06-15 15:11:04 -05:00
HD Moore	6fc5152f96	MDM update to support fusion import	2012-06-14 10:36:33 -05:00
Tod Beardsley	c585a95dba	Language on Skype enum module	2012-06-13 14:34:15 -05:00
Tod Beardsley	dfe6afc48a	Language on MS12-005	2012-06-13 14:21:56 -05:00
Tod Beardsley	ce851dcaca	Caps in title	2012-06-13 14:19:39 -05:00
Tod Beardsley	cd4cb8aceb	Fixing print message in snort module	2012-06-13 14:10:05 -05:00
Tod Beardsley	066905f2d0	Cleaning up Modbus scanner	2012-06-13 13:58:48 -05:00
Tod Beardsley	aabdfdc212	Fixing up mysql module text	2012-06-13 13:33:36 -05:00
Tod Beardsley	3bf0d47a64	Fixing CRLFs on winlog_runtime_2	2012-06-13 13:18:47 -05:00
Tod Beardsley	550dde59c5	Fixing indents on msadc module	2012-06-13 13:16:55 -05:00
Tod Beardsley	5c57870d97	Whitespace on mysql module.	2012-06-13 13:14:25 -05:00
Tod Beardsley	5ea86ef1db	Adding carrierwave to metasploit's gemcache.	2012-06-12 12:50:58 -05:00
Tod Beardsley	cef388812d	Merge branch 'master' into release	2012-06-11 19:54:15 -05:00
Joe Vennix	ec0153a83c	Rollback rails to 3.2.2 to fix asset pipeline issues.	2012-06-06 11:22:01 -05:00
Joe Vennix	c556a7e6be	Rollback activerecord to 3.2.2 to prevent asset inclusion issues.	2012-06-06 11:21:52 -05:00
Tod Beardsley	b504b23d2d	msftidy found EOL spaces on new modules	2012-06-06 10:40:56 -05:00
Tod Beardsley	524ce94ecd	Merge branch 'release' of github_r7:rapid7/metasploit-framework into release	2012-06-05 10:14:46 -05:00
HD Moore	7d07722767	Straighten out the login error path for nexpose API calls	2012-06-04 16:07:21 -05:00
Steve Tornio	be00eff5b6	Adding swtornio's OSVDB ref Watch the trailing commas, that wangs up Ruby 1.8.7 and prior. Squashed commit of the following: commit c00363993a726cd0c87fbaee769c44f680feff72 Author: Tod Beardsley <todb@metasploit.com> Date: Mon Jun 4 09:33:18 2012 -0500 Removing trailing comma commit `594cae0cab` Author: Steve Tornio <swtornio@gmail.com> Date: Mon Jun 4 09:10:36 2012 -0500 add osvdb ref	2012-06-04 16:07:21 -05:00
jvazquez-r7	00927eec85	Use of TARGETURI	2012-06-04 16:07:21 -05:00
jvazquez-r7	097dca22bd	Verbose messages cleanup	2012-06-04 16:07:20 -05:00
jvazquez-r7	3ceabbd1f2	Fix typo in the URI param	2012-06-04 16:07:20 -05:00
jvazquez-r7	8fef08275d	Added module for CVE-2012-0391	2012-06-04 16:07:20 -05:00
sinn3r	d9b8c653b7	Change how we handle the password complexity failure	2012-06-04 16:07:20 -05:00
Chris John Riley	af5bf45b31	Altered description to include information on the password complexity check Altered the default password to meet the complexity checks Note: The complexity checks (even if they fail) don't prevent the payload from running. At this point it only raises an warning and continues on. I can change this if it's more desirable however!	2012-06-04 16:07:20 -05:00
sinn3r	7a8824ab5e	Fix typo thanks to juan	2012-06-04 16:07:20 -05:00
Chris John Riley	61e208af37	Added WMIC and complexity checks	2012-06-04 16:07:20 -05:00
Chris John Riley	2080617029	Added WMIC and complexity checks	2012-06-04 16:07:20 -05:00
Christian Mehlmauer	21d76f1589	Adding FireFart's RPORT(80) cleanup This was tested by creating a resource script to load every changed module and displaying the options, like so: ```` use auxiliary/admin/2wire/xslt_password_reset show options use auxiliary/admin/http/contentkeeper_fileaccess show options ```` ...etc. This was run in both the master branch and FireFart's branch while spooling out the results of msfconsole, then diffing those results. All modules loaded successfully, and there were no changes to the option sets, so it looks like a successful fix. Thanks FireFart! Squashed commit of the following: commit 7c1eea53fe3743f59402e445cf34fab84cf5a4b7 Author: Christian Mehlmauer <FireFart@gmail.com> Date: Fri May 25 22:09:42 2012 +0200 Cleanup Opt::RPORT(80) since it is already registered by Msf::Exploit::Remote::HttpClient	2012-06-04 16:07:20 -05:00
sinn3r	2dda99c5ae	Change filename	2012-06-04 16:07:20 -05:00
sinn3r	2258139d3e	Correct name	2012-06-04 16:07:20 -05:00
sinn3r	bb5a243705	Add CVE-2011-4825 module	2012-06-04 16:07:19 -05:00
Christian Mehlmauer	06c64161f7	Adding FireFart's hashcollision DoS module Have some minor edits below, looks like it all works now though. Squashed commit of the following: commit b7befd4889f12105f36794b1caca316d1691b335 Author: Tod Beardsley <todb@metasploit.com> Date: Fri Jun 1 14:31:32 2012 -0500 Removing ord in favor of unpack. Also renaming a 'character' variable to 'c' rather than 'i' which is easy to mistake for an Integer counter variable. commit e80f6a5622df2136bc3557b2385822ba077e6469 Author: Tod Beardsley <todb@metasploit.com> Date: Fri Jun 1 14:24:41 2012 -0500 Cleaning up print msgs commit 5fd65ed54cb47834dc646fdca8f047fca4b74953 Author: Tod Beardsley <todb@metasploit.com> Date: Fri Jun 1 14:19:10 2012 -0500 Clean up hashcollision_dos description Caps, mostly. One sentence I still don't get but it's not really a show stopper. commit bec0ee43dc9078d34a328eb416970cdc446e6430 Author: Christian Mehlmauer <FireFart@gmail.com> Date: Thu May 24 19:11:32 2012 +0200 Removed RPORT, ruby 1.8 safe, no case insensitive check, error handling commit 20793f0dfd9103c4d7067a71e81212b48318d183 Author: Christian Mehlmauer <FireFart@gmail.com> Date: Tue May 22 23:11:53 2012 +0200 Hashcollision Script (again)	2012-06-04 16:07:19 -05:00
Joe Vennix	2361a529c5	Add fix for counter_cache migration to keep from throwing readonly column error.	2012-06-04 16:07:19 -05:00
Tod Beardsley	ad8f14432b	Whitespace fix for script-fu module This is really just to check the GitHub IRC bot thinger.	2012-06-04 16:07:19 -05:00
Joe Vennix	1fc8e8ff96	Add migrations for counter_cache columns to framework.	2012-06-04 16:07:19 -05:00
sinn3r	d6a8e7a5f5	Modify the description	2012-06-04 16:07:19 -05:00
jvazquez-r7	87a9fefb3e	Added module for CVE-2012-2763	2012-06-04 16:07:19 -05:00
David Maloney	42cd97e834	Bringin in new version of pcanywhere_login	2012-06-04 16:07:19 -05:00
David Maloney	e6a53c834b	trying to work around wierd git issue	2012-06-04 16:07:19 -05:00
Samuel Huckins	660c41efc6	MDM Update	2012-06-04 16:07:19 -05:00
David Maloney	ac6661fadb	Fix nil responses	2012-06-04 16:07:18 -05:00
James Lee	2ee620cee4	Whitespace, thanks msftidy.rb!	2012-06-04 16:07:18 -05:00
James Lee	e0ce84a6e9	Chdir to TMP before writing files	2012-06-04 16:07:18 -05:00
Samuel Huckins	a33c7db47e	Now only loading MetasploitDataModels when not already loaded and contained objects not in namespace [Story #30430877]	2012-06-04 16:07:18 -05:00
James Lee	bbaceffb8b	Work around a bug in rubinius	2012-06-04 16:07:18 -05:00
Joe Vennix	84af16a8b4	Updating to Rails 3.2.4. Among other fixes, this addresses the Rails security advisory from 5/31/2012: http://groups.google.com/group/rubyonrails-security/browse_thread/thread/7546a238e1962f59 http://groups.google.com/group/rubyonrails-security/browse_thread/thread/f1203e3376acec0f Thanks Joe and Trevor! Squashed commit of the following: commit `d7031cebcc` Author: Joe Vennix <Joe_Vennix@rapid7.com> Date: Thu May 31 16:57:29 2012 -0500 Update activerecord in gemcache to support rails 3.2.4. [#30507689] commit `c7369f6d66` Author: Joe Vennix <Joe_Vennix@rapid7.com> Date: Thu May 31 16:53:01 2012 -0500 Bump rails version.	2012-06-04 16:07:18 -05:00
Tod Beardsley	9a25b10059	Fixing description for citrix module	2012-06-04 16:07:18 -05:00
Tod Beardsley	080a231770	Fixing description for citrix module	2012-06-04 16:07:18 -05:00
Tod Beardsley	f5bf954bf1	Fixing description for juan's Citrix module	2012-06-04 16:07:18 -05:00
jvazquez-r7	145747b48e	Fixed name module	2012-06-04 16:07:17 -05:00
jvazquez-r7	6ca474e0d9	Citrix Provisioning Services 5.6 SP1 Streamprocess Opcode 0x40020002 Buffer Overflow	2012-06-04 16:07:17 -05:00
jvazquez-r7	4842be014a	Added module for Citrix Streamprocess Opcode 0x40020002 Buffer Overflow	2012-06-04 16:07:17 -05:00
jvazquez-r7	df389bcd63	description updated	2012-06-04 16:07:17 -05:00
jvazquez-r7	82aa0185da	Added module for ZDI-12-010	2012-06-04 16:07:17 -05:00
HD Moore	60bfe2ba1c	Handle cases where a user-agent was set via headers	2012-06-04 16:07:17 -05:00
HD Moore	7e7690e5fb	Handle cisco devices better with ssh logins	2012-06-04 16:07:17 -05:00
David Maloney	cb4ccd427d	Adds thelightcosine's pcanywhere module Adds PCAnywhere bruteforce capabilities Squashed commit of the following: commit 5354fd849f0c009c534d7ce18369382dd56de550 Author: David Maloney <DMaloney@rapid7.com> Date: Thu May 31 14:35:23 2012 -0500 Add explicit pack to encrypted header commit 7911dd309a94df2729c8247c3817cf5de6b99aad Author: David Maloney <DMaloney@rapid7.com> Date: Thu May 31 13:11:19 2012 -0500 adds pcanywhere_login module	2012-06-04 16:07:17 -05:00
Steve Tornio	8d460f8343	add osvdb ref	2012-06-04 16:07:17 -05:00
sinn3r	2ea6795e02	Add s40 dir traversal vuln I can't believe I stayed up all night, and this is all I could find.	2012-06-04 16:07:17 -05:00
Raphael Mudge	ea18387d9c	Adding rsmudge's Armitage update Squashed commit of the following: commit `60be1b2d1d` Author: Raphael Mudge <rsmudge@gmail.com> Date: Wed May 30 19:43:07 2012 -0400 Armitage 05.30.12 A small collection of bug fixes.	2012-06-04 16:07:17 -05:00
James Lee	ff556cdbe1	But not that verbose	2012-06-04 16:07:16 -05:00
James Lee	8e46799e7a	Make meterpreter test a little more verbose	2012-06-04 16:07:16 -05:00
James Lee	f6bda30545	Add cd and pwd to Post::File API Also changes working dir to /tmp (or %TMP% on Windows) when testing file stuff.	2012-06-04 16:07:16 -05:00
sinn3r	7bf6431685	Print IP/Port for each message	2012-06-04 16:07:16 -05:00
sinn3r	785407b444	If we don't get a new file, we assume the upload failed. This is possible when we actually don't have WRITE permission to the 'uploads/' directory.	2012-06-04 16:07:16 -05:00
sinn3r	6f7ab508c9	Don't really care about the return value for the last send_request_raw	2012-06-04 16:07:16 -05:00
sinn3r	0c50f9eac2	Allow the login() function to be a little more verbose for debugging purposes	2012-06-04 16:07:16 -05:00
James Lee	476cfb642d	Committing Egypt's README updates This is all documentation changes -- adds THIRD-PARTY licenses, updates readme to be more like a readme, and moves the old readme to a COPYING file. Note that while this lands pull #388, it skips the Meterpreter changes that were brought in almost certainly by accident. Squashed commit of the following: commit `7125509e8b` Author: James Lee <egypt@metasploit.com> Date: Wed May 23 13:12:45 2012 -0600 Add license info for rkelly and anemone commit `14367041c3` Author: James Lee <egypt@metasploit.com> Date: Wed May 23 12:49:14 2012 -0600 Add licenses for gemcache stuff to THIRD-PARTY commit `c22138cf24` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 17:24:14 2012 -0600 Add useful links commit `47a9df3d54` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 16:41:21 2012 -0600 Add copyright notices commit `687567dfe2` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 16:28:17 2012 -0600 Give THIRD-PARTY an md extension Should make display on Github nicer commit `e322676413` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 16:22:55 2012 -0600 Break licenses for bundled stuff into THIRD-PARTY commit `e6463c6e7f` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 14:06:01 2012 -0600 Move README to COPYING commit `8a6a6bb63f` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 12:53:31 2012 -0600 Better wording. commit `5ac46d4f68` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 12:51:58 2012 -0600 Add a little more explanitory text to Contributing. commit `54dab50d98` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 12:37:09 2012 -0600 Missed one commit `e23c80f01e` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 12:36:33 2012 -0600 Better links commit `47b944ec65` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 12:26:12 2012 -0600 Meh, GFM doesn't like my headings commit `12a7651e91` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 12:24:42 2012 -0600 Initial stab at a better README commit `e3a0d4731b` Author: James Lee <egypt@metasploit.com> Date: Mon May 14 11:59:41 2012 -0600 LLC -> Inc. commit `5b32b4245c` Author: James Lee <egypt@metasploit.com> Date: Sun May 13 17:50:04 2012 -0600 Whitespace at EOL commit `e6719f18ab` Author: James Lee <egypt@metasploit.com> Date: Sun May 13 17:48:50 2012 -0600 Only open /dev/null if we need it	2012-06-04 16:07:16 -05:00
sinn3r	7c5ede47f9	Add PHP Volunteer Management System exploit	2012-06-04 16:07:16 -05:00
Tod Beardsley	953c54aab9	Minor updates; added BID, fixed grammar Modules should not refer to themselves in the first person unless they are looking for Sarah Connor.	2012-05-30 16:17:01 -05:00
David Maloney	142a1727c9	Revert " Sets the passive flag on the JtR modules" This reverts commit `e70ccddc9a`.	2012-05-30 10:14:13 -05:00