Merge remote-tracking branch 'upstream/master' into web-modules

Author: tasos-r7

.gitignore

@@ -22,3 +22,4 @@ tags
 *.swp
 *.orig
 *.rej
+*~

CONTRIBUTING.md

@@ -12,6 +12,11 @@ If your bug is new and you'd like to report it you will need to
 first](https://dev.metasploit.com/redmine/account/register). Don't
 worry, it's easy and fun and takes about 30 seconds.
 
+When you file a bug report, please inclue your **steps to reproduce**,
+full copy-pastes of Ruby stack traces, and any relevant details about
+your environment. Without repro steps, your bug will likely be closed.
+With repro steps, your bugs will likely be fixed.
+
 ## Contributing Metasploit Modules
 
 If you have an exploit that you'd like to contribute to the Metasploit

COPYING

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

THIRD-PARTY.md

@@ -60,7 +60,7 @@ sure you peruse the FAQ and Manual first.
 7. License
    -------
 
-(c) 2010-2012 Raphael Mudge. This project is licensed under the BSD license. 
+(c) 2010-2013 Raphael Mudge. This project is licensed under the BSD license. 
 See section 8 for more information.
 
 lib/jgraphx.jar is used here within the terms of the BSD license offered by

data/armitage/armitage.jar

@@ -1,6 +1,24 @@
 Armitage Changelog
 ==================
 
+4 Jan 13 (tested against msf 16252)
+--------
+- Added a helper to set REXE option
+- Added an icon to represent Windows 8
+- [host] -> Login menu is now built using open services for all 
+  highlighted hosts, not just the first one.
+- [host] -> Login items now escape punctuation characters in passwords
+  before passing them to a framework module.
+- Added the windows and linux postgres_payload exploits to the use a
+  reverse payload by default list.
+- Small tweak to allow Armitage to work with Metasploit 4.5 installed
+  environment on Windows.
+
+Cortana Updates (for scripters)
+--------
+- &credential_add and &credential_delete no longer break when a 
+  password has creative punctuation in it.
+
 26 Nov 12 (tested against msf 16114)
 ---------
 - Windows command shell tab is now friendlier to commands that prompt

data/armitage/cortana.jar

@@ -9,7 +9,9 @@
 puts "-----------------------------------------------------------------"
 #uncoment to force ioctl on non windows systems
 #@force_ioctl = true
-@supported_archs = ["i386-mingw32", "i486-linux", "universal-darwin10.0", "i386-openbsd4.8","i386-freebsd8","arm-linux-eabi"]
+@supported_archs = [ "i386-mingw32", "i486-linux", "x86_64-linux",
+	"universal-darwin10.0", "i386-openbsd4.8", "i386-freebsd8",
+	"arm-linux-eabi" ]
 #arm-linux-eabi tested on maemo5 / N900
 puts "[*] Warning : this platform as not been tested" unless @supported_archs.include? RUBY_PLATFORM
 

data/armitage/readme.txt

@@ -60,7 +60,7 @@ sure you peruse the FAQ and Manual first.
 7. License
    -------
 
-(c) 2010-2012 Raphael Mudge. This project is licensed under the BSD license. 
+(c) 2010-2013 Raphael Mudge. This project is licensed under the BSD license. 
 See section 8 for more information.
 
 lib/jgraphx.jar is used here within the terms of the BSD license offered by