From e07bce010174740d753bb9767cac37507c9ec6a8 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Wed, 21 Oct 2009 12:58:56 +0000 Subject: [PATCH] Copyright updates reflecting the news git-svn-id: file:///home/svn/framework3/trunk@7222 4d416f70-5f16-0410-b530-b9f4589650da --- README | 8 ++++---- documentation/users_guide.tex | 4 ++-- external/ruby-lorcon/Lorcon.c | 2 +- .../source/shellcode/windows/stager_bind_ipv6_tcp_nx.asm | 2 +- .../shellcode/windows/stager_reverse_ipv6_tcp_nx.asm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index 42c59b0a51..84c69fa96a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Copyright (C) 2006-2009, Metasploit LLC +Copyright (C) 2006-2009, Rapid7 LLC All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Metasploit LLC nor the names of its contributors + * Neither the name of Rapid7 LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -30,13 +30,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The Metasploit Framework is provided under the 3-clause BSD license above. -The copyright on this package is held by Metasploit LLC. +The copyright on this package is held by Rapid7 LLC. This license does not apply to the following components: - The OpenSSL library embedded into the Meterpreter payload binaries and the corresponding header files in the source tree - The Packet Sniffer SDK (MicroOLAP) library embedded into the Meterpreter - Sniffer extension. Metasploit LLC has a single-seat developer license. + Sniffer extension. HD Moore has a single-seat developer license. - The vncdll.dll binary and its associated source code (modified RealVNC) - The icons used by msfweb that were not created by Metasploit - The BinData library located under lib/bindata diff --git a/documentation/users_guide.tex b/documentation/users_guide.tex index aa074dfb70..5dcaf2e1d5 100644 --- a/documentation/users_guide.tex +++ b/documentation/users_guide.tex @@ -878,7 +878,7 @@ The Metasploit Framework is distributed under the modified-BSD license defined b {\footnotesize \begin{verbatim} -Copyright (c) 2008, Metasploit LLC +Copyright (c) 2008, Rapid7 LLC All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -891,7 +891,7 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Metasploit LLC nor the names of its contributors + * Neither the name of Rapid7 LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/external/ruby-lorcon/Lorcon.c b/external/ruby-lorcon/Lorcon.c index 182b5a1c5b..bfd427b744 100644 --- a/external/ruby-lorcon/Lorcon.c +++ b/external/ruby-lorcon/Lorcon.c @@ -33,7 +33,7 @@ */ /* - All ruby-lorcon/rubyisms are by Metasploit LLC (C) 2006-2007 + All ruby-lorcon/rubyisms are by Rapid7 LLC (C) 2006-2007 http://metasploit.com/ - msfdev[at]metasploit.com */ diff --git a/external/source/shellcode/windows/stager_bind_ipv6_tcp_nx.asm b/external/source/shellcode/windows/stager_bind_ipv6_tcp_nx.asm index 180d4044ff..e73b09bd6e 100644 --- a/external/source/shellcode/windows/stager_bind_ipv6_tcp_nx.asm +++ b/external/source/shellcode/windows/stager_bind_ipv6_tcp_nx.asm @@ -1,6 +1,6 @@ ; Title: Windows Bind Stager (NX, IPv6) ; Platforms: Windows NT 4.0, Windows 2000, Windows XP, Windows 2003 -; Author: Metasploit LLC +; Author: Rapid7 LLC [BITS 32] diff --git a/external/source/shellcode/windows/stager_reverse_ipv6_tcp_nx.asm b/external/source/shellcode/windows/stager_reverse_ipv6_tcp_nx.asm index a0cb6f8a29..241a3a6c6d 100644 --- a/external/source/shellcode/windows/stager_reverse_ipv6_tcp_nx.asm +++ b/external/source/shellcode/windows/stager_reverse_ipv6_tcp_nx.asm @@ -1,6 +1,6 @@ ; Title: Windows Reverse Connect Stager (NX, IPv6) ; Platforms: Windows NT 4.0, Windows 2000, Windows XP, Windows 2003, Windows Vista -; Author: Metasploit LLC +; Author: Rapid7 LLC [BITS 32]