Merge remote branch 'rcvalle/rcvalle-update-author-information'

Resolved the conflict by accepting Ramon's preferred alias of his name.

[Closes #806]

Conflicts:
	lib/msf/core/module/author.rb
unstable 2012091901
Tod Beardsley 2012-09-19 12:28:16 -05:00
commit c19e9a8053
40 changed files with 40 additions and 41 deletions

View File

@ -24,7 +24,7 @@ class Msf::Module::Author
'pusscat' => 'pusscat' + 0x40.chr + 'metasploit.com',
'skylined' => 'skylined' + 0x40.chr + 'edup.tudelft.nl',
'patrick' => 'patrick' + 0x40.chr + 'osisecurity.com.au',
'ramon' => 'rcvalle' + 0x40.chr + 'metasploit.com',
'Ramon de C Valle'=> 'rcvalle' + 0x40.chr + 'metasploit.com',
'I)ruid' => 'druid' + 0x40.chr + 'caughq.org',
'egypt' => 'egypt' + 0x40.chr + 'metasploit.com',
'kris katterjohn' => 'katterjohn' + 0x40.chr + 'gmail.com',
@ -141,4 +141,3 @@ class Msf::Module::Author
attr_accessor :email
attr_reader :name
end

View File

@ -32,7 +32,7 @@ class Metasploit3 < Msf::Auxiliary
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'License' => MSF_LICENSE

View File

@ -25,8 +25,8 @@ class Metasploit3 < Msf::Auxiliary
'Description' => 'AIX SNMP Scanner Auxiliary Module',
'Author' =>
[
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'ramon'
],
'License' => MSF_LICENSE
)

View File

@ -27,8 +27,8 @@ class Metasploit3 < Msf::Exploit::Remote
},
'Author' =>
[
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'ramon'
],
'Version' => '$Revision$',
'Platform' => [ 'aix' ],

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -28,7 +28,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
},
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'hdm'
],

View File

@ -30,7 +30,7 @@ class Metasploit3 < Msf::Exploit::Remote
},
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'hdm'
],

View File

@ -32,7 +32,7 @@ class Metasploit3 < Msf::Exploit::Remote
},
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'hdm'
],

View File

@ -38,8 +38,8 @@ class Metasploit3 < Msf::Exploit::Remote
},
'Author' =>
[
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
'ramon',
],
'Version' => '$Revision$',
'Arch' => ARCH_X86,

View File

@ -116,7 +116,7 @@ class Metasploit3 < Msf::Exploit::Remote
],
#
# Supplied by ramon[at]risesecurity.org
# Supplied by Ramon de C Valle
#
# call [ebx+4]

View File

@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
'Version' => '$Revision$',
'Author' =>
[
'ramon',
'Ramon de C Valle',
'Adriano Lima <adriano[at]risesecurity.org>',
],
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'AIX Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'aix',
'Arch' => ARCH_PPC,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'AIX Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'aix',
'Arch' => ARCH_PPC,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'AIX Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'aix',
'Arch' => ARCH_PPC,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'BSD Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'bsd',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'BSD Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'bsd',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'BSD Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'bsd',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC, ARCH_CBEA ],

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC, ARCH_CBEA ],

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC, ARCH_CBEA ],

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC64, ARCH_CBEA64 ],

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC64, ARCH_CBEA64 ],

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => [ ARCH_PPC64, ARCH_CBEA64 ],

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Linux Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'linux',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'OS X Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'osx',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'OS X Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'osx',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'OS X Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'osx',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Solaris Command Shell, Bind TCP Inline',
'Version' => '$Revision$',
'Description' => 'Listen for a connection and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'solaris',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Solaris Command Shell, Find Port Inline',
'Version' => '$Revision$',
'Description' => 'Spawn a shell on an established connection',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'solaris',
'Arch' => ARCH_X86,

View File

@ -25,7 +25,7 @@ module Metasploit3
'Name' => 'Solaris Command Shell, Reverse TCP Inline',
'Version' => '$Revision$',
'Description' => 'Connect back to attacker and spawn a command shell',
'Author' => 'ramon',
'Author' => 'Ramon de C Valle',
'License' => MSF_LICENSE,
'Platform' => 'solaris',
'Arch' => ARCH_X86,