From 520d1e69c491679820a486779f35c0cf1aec26a4 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Thu, 13 Mar 2014 09:46:20 -0500 Subject: [PATCH] Rapid7 Comma Inc After some more discussion with Rapid7's legal fellow. --- COPYING | 6 +++--- LICENSE | 12 ++++++------ documentation/users_guide.tex | 2 +- external/ruby-kissfft/ext/kissfft/main.c | 2 +- external/ruby-lorcon/Lorcon.c | 2 +- external/source/DLLHijackAuditKit/analyze.js | 2 +- external/source/DLLHijackAuditKit/audit.js | 2 +- .../shellcode/windows/stager_bind_ipv6_tcp_nx.asm | 2 +- .../shellcode/windows/stager_reverse_ipv6_tcp_nx.asm | 2 +- external/source/vncdll/vncdll/LICENSE.txt | 4 ++-- external/source/vncdll/vncdll/context.h | 4 ++-- external/source/vncdll/vncdll/inject.h | 4 ++-- external/source/vncdll/vncdll/loader.h | 4 ++-- external/source/vncdll/vncdll/ps.h | 4 ++-- external/source/vncdll/vncdll/session.h | 4 ++-- lib/rapid7/nexpose.rb | 4 ++-- lib/rex.rb | 4 ++-- lib/rex/LICENSE | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/COPYING b/COPYING index a5e06b20df..6e9829593e 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (C) 2006-2013, Rapid7 Inc. +Copyright (C) 2006-2013, Rapid7, Inc. 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 Rapid7 Inc. nor the names of its contributors + * Neither the name of Rapid7, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -30,7 +30,7 @@ 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 Rapid7 Inc. +The copyright on this package is held by Rapid7, Inc. This license does not apply to several components within the Metasploit Framework source tree. For more details see the LICENSE file. diff --git a/LICENSE b/LICENSE index 8bb14cfe90..9016e52f12 100644 --- a/LICENSE +++ b/LICENSE @@ -2,13 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://www.metasploit.com/ Files: * -Copyright: 2006-2013, Rapid7 Inc. +Copyright: 2006-2013, Rapid7, Inc. License: BSD-3-clause # The Metasploit Framework is provided under the 3-clause BSD license provided # at the end of this file. # -# The copyright on this package is held by Rapid7 Inc. +# The copyright on this package is held by Rapid7, Inc. # # This license does not apply to third-party components detailed below. # @@ -84,7 +84,7 @@ Copyright: 2005-2009, Joel VanderWerf License: Ruby Files: lib/fastlib.rb -Copyright: 2011, Rapid7 Inc. +Copyright: 2011, Rapid7, Inc. License: Ruby Files: lib/metasm.rb lib/metasm/* data/cpuinfo/* @@ -205,7 +205,7 @@ Copyright: Daniel Luz License: Ruby Files: metasploit_data_models -Copyright: 2012 Rapid7 Inc. +Copyright: 2012 Rapid7, Inc. License: MIT Files: mini_portile @@ -221,7 +221,7 @@ Copyright: 2010 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intride License: MIT Files: network_interface -Copyright: 2012, Rapid7 Inc. +Copyright: 2012, Rapid7, Inc. License: MIT Files: nokogiri @@ -310,7 +310,7 @@ License: BSD-3-clause this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . - * Neither the name of Rapid7 Inc nor the names of its contributors + * Neither the name of Rapid7, Inc 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/documentation/users_guide.tex b/documentation/users_guide.tex index 024fcae6fa..cc46448d38 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, Rapid7 Inc. +Copyright (c) 2008, Rapid7, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/external/ruby-kissfft/ext/kissfft/main.c b/external/ruby-kissfft/ext/kissfft/main.c index 695e79992e..13c0a94f1b 100644 --- a/external/ruby-kissfft/ext/kissfft/main.c +++ b/external/ruby-kissfft/ext/kissfft/main.c @@ -1,6 +1,6 @@ /* ruby-kissfft: a simple ruby module embedding the Kiss FFT library - Copyright (C) 2009-2010 Rapid7 Inc - H D Moore + Copyright (C) 2009-2010 Rapid7, Inc - H D Moore Derived from "psdpng.c" from the KissFFT tools directory Copyright (C) 2003-2006 Mark Borgerding diff --git a/external/ruby-lorcon/Lorcon.c b/external/ruby-lorcon/Lorcon.c index 843b5ef97d..196d67919b 100644 --- a/external/ruby-lorcon/Lorcon.c +++ b/external/ruby-lorcon/Lorcon.c @@ -33,7 +33,7 @@ */ /* - All ruby-lorcon/rubyisms are by Rapid7 Inc (C) 2006-2007 + All ruby-lorcon/rubyisms are by Rapid7, Inc (C) 2006-2007 http://metasploit.com/ - msfdev[at]metasploit.com */ diff --git a/external/source/DLLHijackAuditKit/analyze.js b/external/source/DLLHijackAuditKit/analyze.js index ae056c2260..9b8ad64f76 100644 --- a/external/source/DLLHijackAuditKit/analyze.js +++ b/external/source/DLLHijackAuditKit/analyze.js @@ -1,4 +1,4 @@ -/* DLLHijackAuditKit (C) 2010 Rapid7 Inc */ +/* DLLHijackAuditKit (C) 2010 Rapid7, Inc */ var oFso = new ActiveXObject("Scripting.FileSystemObject"); var oShl = new ActiveXObject("WScript.Shell"); diff --git a/external/source/DLLHijackAuditKit/audit.js b/external/source/DLLHijackAuditKit/audit.js index b5ef4ece75..2ad17d3767 100644 --- a/external/source/DLLHijackAuditKit/audit.js +++ b/external/source/DLLHijackAuditKit/audit.js @@ -1,4 +1,4 @@ -/* DLLHijackAuditKit (C) 2010 Rapid7 Inc */ +/* DLLHijackAuditKit (C) 2010 Rapid7, Inc */ function print_status(msg) { try { 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 64b2b88887..afc55b9410 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: Rapid7 Inc +; Author: Rapid7, Inc [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 7beafda209..910e45dcbc 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: Rapid7 Inc +; Author: Rapid7, Inc [BITS 32] diff --git a/external/source/vncdll/vncdll/LICENSE.txt b/external/source/vncdll/vncdll/LICENSE.txt index 1cf0ca64d9..ba5797cfe9 100644 --- a/external/source/vncdll/vncdll/LICENSE.txt +++ b/external/source/vncdll/vncdll/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (C) 2006-2010, Rapid7 Inc +Copyright (C) 2006-2010, Rapid7, Inc 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 Rapid7 Inc nor the names of its contributors + * Neither the name of Rapid7, Inc 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/source/vncdll/vncdll/context.h b/external/source/vncdll/vncdll/context.h index df3499a32f..df5143138e 100644 --- a/external/source/vncdll/vncdll/context.h +++ b/external/source/vncdll/vncdll/context.h @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2010, Rapid7 Inc +// Copyright (C) 2006-2010, Rapid7, Inc // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. // -// * Neither the name of Rapid7 Inc nor the names of its contributors +// * Neither the name of Rapid7, Inc 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/source/vncdll/vncdll/inject.h b/external/source/vncdll/vncdll/inject.h index 1dbf1e922b..d7e7fffda1 100644 --- a/external/source/vncdll/vncdll/inject.h +++ b/external/source/vncdll/vncdll/inject.h @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2010, Rapid7 Inc +// Copyright (C) 2006-2010, Rapid7, Inc // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. // -// * Neither the name of Rapid7 Inc nor the names of its contributors +// * Neither the name of Rapid7, Inc 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/source/vncdll/vncdll/loader.h b/external/source/vncdll/vncdll/loader.h index c20dc2c3f3..3671c1ddcf 100644 --- a/external/source/vncdll/vncdll/loader.h +++ b/external/source/vncdll/vncdll/loader.h @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2010, Rapid7 Inc +// Copyright (C) 2006-2010, Rapid7, Inc // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. // -// * Neither the name of Rapid7 Inc nor the names of its contributors +// * Neither the name of Rapid7, Inc 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/source/vncdll/vncdll/ps.h b/external/source/vncdll/vncdll/ps.h index 9700372bfb..be2c7733d9 100644 --- a/external/source/vncdll/vncdll/ps.h +++ b/external/source/vncdll/vncdll/ps.h @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2010, Rapid7 Inc +// Copyright (C) 2006-2010, Rapid7, Inc // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. // -// * Neither the name of Rapid7 Inc nor the names of its contributors +// * Neither the name of Rapid7, Inc 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/source/vncdll/vncdll/session.h b/external/source/vncdll/vncdll/session.h index f26628ba7d..67f89f3713 100644 --- a/external/source/vncdll/vncdll/session.h +++ b/external/source/vncdll/vncdll/session.h @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2010, Rapid7 Inc +// Copyright (C) 2006-2010, Rapid7, Inc // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ // this list of conditions and the following disclaimer in the documentation // and/or other materials provided with the distribution. // -// * Neither the name of Rapid7 Inc nor the names of its contributors +// * Neither the name of Rapid7, Inc 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/lib/rapid7/nexpose.rb b/lib/rapid7/nexpose.rb index 68dad648de..0b862f8e61 100644 --- a/lib/rapid7/nexpose.rb +++ b/lib/rapid7/nexpose.rb @@ -3,7 +3,7 @@ # =begin -Copyright (C) 2009-2012, Rapid7 Inc. +Copyright (C) 2009-2012, Rapid7, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -16,7 +16,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 Rapid7 Inc. nor the names of its contributors + * Neither the name of Rapid7, Inc. 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/lib/rex.rb b/lib/rex.rb index fc029eeebf..8b9c39bbac 100644 --- a/lib/rex.rb +++ b/lib/rex.rb @@ -2,7 +2,7 @@ The Metasploit Rex library is provided under the 3-clause BSD license. -Copyright (c) 2005-2010, Rapid7 Inc. +Copyright (c) 2005-2010, Rapid7, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -15,7 +15,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 Rapid7 Inc. nor the names of its contributors may be + * Neither the name of Rapid7, Inc. 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/lib/rex/LICENSE b/lib/rex/LICENSE index cc135ce163..bca0cd8cee 100644 --- a/lib/rex/LICENSE +++ b/lib/rex/LICENSE @@ -1,6 +1,6 @@ The Metasploit Rex library is provided under the 3-clause BSD license. -Copyright (c) 2005-2006, Rapid7 Inc. +Copyright (c) 2005-2006, Rapid7, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -13,7 +13,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 Rapid7 Inc. nor the names of its contributors may be + * Neither the name of Rapid7, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.