Merge pull request #3 from tabassassin/retab/pr/2107

Retab/pr/2107
kernelsmith · Sep 5, 2013 · b72f425 · b72f425
2 parents 79a1277 + 874ed2a
commit b72f425
Show file tree

Hide file tree

Showing 3,222 changed files with 531,164 additions and 518,950 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 .bundle
 # Rubymine project directory
 .idea
+# Sublime Text project directory (not created by ST by default)
+.sublime-project
 # Portable ruby version files for rvm
 .ruby-gemset
 .ruby-version
@@ -40,3 +42,5 @@ tags
 *.orig
 *.rej
 *~
+# Ignore backups of retabbed files
+*.notab
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ group :db do
 	# Needed for Msf::DbManager
 	gem 'activerecord'
 	# Database models shared between framework and Pro.
-	gem 'metasploit_data_models', '~> 0.16.1'
+	gem 'metasploit_data_models', '~> 0.16.6'
 	# Needed for module caching in Mdm::ModuleDetails
 	gem 'pg', '>= 0.11'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,7 +23,7 @@ GEM
     i18n (0.6.1)
     json (1.7.7)
     metaclass (0.0.1)
-    metasploit_data_models (0.16.1)
+    metasploit_data_models (0.16.6)
       activerecord (>= 3.2.13)
       activesupport
       pg
@@ -67,7 +67,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl (>= 4.1.0)
   json
-  metasploit_data_models (~> 0.16.1)
+  metasploit_data_models (~> 0.16.6)
   msgpack
   network_interface (~> 0.0.1)
   nokogiri

diff --git a/data/exploits/CVE-2013-2465/Exploit$MyColorModel.class b/data/exploits/CVE-2013-2465/Exploit$MyColorModel.class
diff --git a/data/exploits/CVE-2013-2465/Exploit$MyColorSpace.class b/data/exploits/CVE-2013-2465/Exploit$MyColorSpace.class
diff --git a/data/exploits/CVE-2013-2465/Exploit.class b/data/exploits/CVE-2013-2465/Exploit.class