From a040b3708a42e82c8d4420b8d457a3a3a3c9be35 Mon Sep 17 00:00:00 2001
From: Joshua Drake <github.jdrake@qoop.org>
Date: Tue, 15 Jun 2010 23:49:17 +0000
Subject: [PATCH] add some MSB numbers that were missing, rename ms08-070
 msmask32 module

git-svn-id: file:///home/svn/framework3/trunk@9532 4d416f70-5f16-0410-b530-b9f4589650da
---
 modules/exploits/windows/browser/ms06_067_keyframe.rb        | 4 ++--
 ...ual_studio_msmask.rb => ms08_070_visual_studio_msmask.rb} | 5 +++--
 modules/exploits/windows/browser/ms08_078_xml_corruption.rb  | 1 +
 .../exploits/windows/browser/ms09_002_memory_corruption.rb   | 3 ++-
 modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb   | 4 ++--
 modules/exploits/windows/iis/ms01_026_dbldecode.rb           | 1 +
 6 files changed, 11 insertions(+), 7 deletions(-)
 rename modules/exploits/windows/browser/{ms_visual_studio_msmask.rb => ms08_070_visual_studio_msmask.rb} (97%)

diff --git a/modules/exploits/windows/browser/ms06_067_keyframe.rb b/modules/exploits/windows/browser/ms06_067_keyframe.rb
index bee72f028c..1124cf3908 100644
--- a/modules/exploits/windows/browser/ms06_067_keyframe.rb
+++ b/modules/exploits/windows/browser/ms06_067_keyframe.rb
@@ -52,8 +52,8 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2006-4777' ],
 					[ 'OSVDB', '28842' ],
 					[ 'BID', '20047' ],
-					[ 'URL', 'https://www.blackhat.com/presentations/bh-eu-07/Sotirov/Sotirov-Source-Code.zip' ],
-					[ 'URL', 'http://www.microsoft.com/technet/security/Bulletin/MS06-067.mspx' ]
+					[ 'MSB', 'MS06-067' ],
+					[ 'URL', 'https://www.blackhat.com/presentations/bh-eu-07/Sotirov/Sotirov-Source-Code.zip' ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/ms_visual_studio_msmask.rb b/modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
similarity index 97%
rename from modules/exploits/windows/browser/ms_visual_studio_msmask.rb
rename to modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
index 125710448c..3abddc89a9 100644
--- a/modules/exploits/windows/browser/ms_visual_studio_msmask.rb
+++ b/modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
@@ -30,9 +30,10 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision$',
 			'References'     =>
 				[
-				    	[ 'CVE', '2008-3704' ],
-					[ 'OSVDB', '47475'],
+					[ 'CVE', '2008-3704' ],
+					[ 'OSVDB', '47475' ],
 					[ 'BID', '30674' ],
+					[ 'MSB', 'MS08-070' ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/browser/ms08_078_xml_corruption.rb b/modules/exploits/windows/browser/ms08_078_xml_corruption.rb
index 48101d7aa0..bb3c4cc472 100644
--- a/modules/exploits/windows/browser/ms08_078_xml_corruption.rb
+++ b/modules/exploits/windows/browser/ms08_078_xml_corruption.rb
@@ -49,6 +49,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					['CVE', '2008-4844'],
 					['OSVDB', '50622'],
 					['BID', '32721'],
+					['MSB', 'MS08-078'],
 					['URL', 'http://www.microsoft.com/technet/security/advisory/961051.mspx'],
 					['URL', 'http://taossa.com/archive/bh08sotirovdowd.pdf'],
 				],
diff --git a/modules/exploits/windows/browser/ms09_002_memory_corruption.rb b/modules/exploits/windows/browser/ms09_002_memory_corruption.rb
index 54b42ef6d3..6a1de5134b 100644
--- a/modules/exploits/windows/browser/ms09_002_memory_corruption.rb
+++ b/modules/exploits/windows/browser/ms09_002_memory_corruption.rb
@@ -40,7 +40,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2009-0075' ],
-					[ 'OSVDB', '51839'],
+					[ 'OSVDB', '51839' ],
+					[ 'MSB', 'MS09-002' ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb b/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb
index 9ff57c9600..1b59ff945c 100644
--- a/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb
+++ b/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb
@@ -31,8 +31,8 @@ class Metasploit3 < Msf::Exploit::Remote
 			'References'     =>
 				[
 					[ 'CVE', '2007-4776' ],
-					[ 'OSVDB', '36936'],
-					[ 'BID', '25629' ],
+					[ 'OSVDB', '36936' ],
+					[ 'BID', '25629' ]
 				],
 			'DefaultOptions' =>
 				{
diff --git a/modules/exploits/windows/iis/ms01_026_dbldecode.rb b/modules/exploits/windows/iis/ms01_026_dbldecode.rb
index 17bfe26972..ddf0220c50 100644
--- a/modules/exploits/windows/iis/ms01_026_dbldecode.rb
+++ b/modules/exploits/windows/iis/ms01_026_dbldecode.rb
@@ -35,6 +35,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					[ 'CVE', '2001-0333' ],
 					[ 'OSVDB', '556' ],
 					[ 'BID', '2708' ],
+					[ 'MSB', 'MS01-026' ],
 					[ 'URL', 'http://marc.info/?l=bugtraq&m=98992056521300&w=2' ]
 				],
 			'Platform'       => 'win',