Skip to content

Commit 1a487e4

Browse files
committed
Merge branch 'master' into bug/module-load-cache-update
2 parents 2b70ec2 + ff08fed commit 1a487e4

File tree

113 files changed

+1172
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1172
-278
lines changed

data/exploits/cve-2013-0758.swf

926 Bytes
Binary file not shown.

lib/msf/base/sessions/command_shell_options.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# -*- coding: binary -*-
2-
##
3-
# $Id$
4-
##
52

63
##
74
# This file is part of the Metasploit Framework and may be subject to

lib/msf/base/sessions/meterpreter.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base'
54
require 'msf/base/sessions/scriptable'

lib/msf/base/sessions/meterpreter_java.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base/sessions/meterpreter'
54

lib/msf/base/sessions/meterpreter_options.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'shellwords'
54

lib/msf/base/sessions/meterpreter_php.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base/sessions/meterpreter'
54

lib/msf/base/sessions/meterpreter_x86_bsd.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base/sessions/meterpreter'
54

lib/msf/base/sessions/meterpreter_x86_linux.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base/sessions/meterpreter'
54

lib/msf/base/sessions/meterpreter_x86_win.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base/sessions/meterpreter'
54
require 'msf/windows_error'

lib/msf/base/sessions/tty.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# -*- coding: binary -*-
2-
# $Id$
32

43
require 'msf/base'
54

0 commit comments

Comments
 (0)