From 9d56e58e8450a60ea5ea56a0dabb512496915a8c Mon Sep 17 00:00:00 2001 From: James Lee Date: Wed, 17 Jul 2013 15:46:54 -0500 Subject: [PATCH 1/3] Rely on object detection for '5716599' [SeeRM #7252] --- lib/rex/exploitation/javascriptosdetect.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/rex/exploitation/javascriptosdetect.js b/lib/rex/exploitation/javascriptosdetect.js index 3b62f66230..0957960375 100644 --- a/lib/rex/exploitation/javascriptosdetect.js +++ b/lib/rex/exploitation/javascriptosdetect.js @@ -712,9 +712,13 @@ window.os_detect.getVersion = function(){ os_sp = "SP2"; break; case "5716599": + // IE 7.0.5730.13, XP Professional SP3 English // IE 6.0.2900.5512, XP Professional SP3 English // IE 6.0.2900.5512, XP Professional SP3 Spanish - ua_version = "6.0"; + // + // 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_sp = "SP3"; break; From 8d1a760b1f8a6a8f651ea34ebfa780f59f422fb0 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Wed, 17 Jul 2013 16:42:37 -0500 Subject: [PATCH 2/3] Bump version to -rls --- lib/msf/core/framework.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/msf/core/framework.rb b/lib/msf/core/framework.rb index c84288116b..9e90190b70 100644 --- a/lib/msf/core/framework.rb +++ b/lib/msf/core/framework.rb @@ -19,7 +19,7 @@ class Framework Major = 4 Minor = 7 Point = 0 - Release = "-dev" + Release = "-rls" if(Point) Version = "#{Major}.#{Minor}.#{Point}#{Release}" From 72df070b8003181f9ad9e3c1d9ad320a1e63c13c Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Wed, 17 Jul 2013 16:43:24 -0500 Subject: [PATCH 3/3] Bump version to 4.8.0-dev, -rls is so fleeting --- lib/msf/core/framework.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/msf/core/framework.rb b/lib/msf/core/framework.rb index 9e90190b70..e506f6d800 100644 --- a/lib/msf/core/framework.rb +++ b/lib/msf/core/framework.rb @@ -17,9 +17,9 @@ class Framework # Major = 4 - Minor = 7 + Minor = 8 Point = 0 - Release = "-rls" + Release = "-dev" if(Point) Version = "#{Major}.#{Minor}.#{Point}#{Release}"