From f1eaa4bb80fd7be37347a37c155fff3d0037b236 Mon Sep 17 00:00:00 2001 From: fyodor Date: Tue, 13 Dec 2016 23:52:09 +0000 Subject: [PATCH] Update the Nmap license file including a note about the inclusion of Npcap (which has its own license) with Nmap Windows binary packages, updating the copyright year, and use the Nmap Project DBA name in more cases. Unfortunately line wrapping made the changes a little harder to spot than they would otherwise be --- docs/legal-notices.xml | 80 ++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml index f6f01d2e4..eca267ba1 100644 --- a/docs/legal-notices.xml +++ b/docs/legal-notices.xml @@ -6,18 +6,19 @@ GNU General Public License -The Nmap Security Scanner is (C) 1996–2015 Insecure.Com -LLC. Nmap is also a registered trademark of Insecure.Com LLC. This -program is free software; you may redistribute and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; Version 2 (GPL), BUT ONLY WITH ALL OF THE -CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. This guarantees your -right to use, modify, and redistribute this software under certain -conditions. If you wish to embed Nmap technology into proprietary -software, we sell alternative licenses (contact -sales@nmap.com). Dozens of software vendors already -license Nmap technology such as host discovery, port scanning, OS -detection, version detection, and the Nmap Scripting Engine. +The Nmap Security Scanner is (C) 1996–2016 Insecure.Com +LLC ("The Nmap Project"). Nmap is also a registered trademark of the +Nmap Project. This program free software; you may redistribute +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; Version 2 +(GPL), BUT ONLY WITH ALL OF THE CLARIFICATIONS AND +EXCEPTIONS DESCRIBED HEREIN. This guarantees your right to use, +modify, and redistribute this software under certain conditions. If +you wish to embed Nmap technology into proprietary software, we sell +alternative licenses (contact sales@nmap.com). Dozens +of software vendors already license Nmap technology such as host +discovery, port scanning, OS detection, version detection, and the +Nmap Scripting Engine. Note that the GPL places important restrictions on derivative works, yet it does not provide a detailed definition of that term. To avoid @@ -62,13 +63,24 @@ a whole. -As another special exception to the GPL terms, Insecure.Com LLC grants +As another special exception to the GPL terms, the Nmap Project grants permission to link the code of this program with any version of the OpenSSL library which is distributed under a license identical to that listed in the included docs/licenses/OpenSSL.txt -file, and distribute linked combinations including the two.OpenSSLlinking exception +file, and distribute linked combinations including the +two.OpenSSLlinking +exception + +The Nmap Project has permission to redistribute Npcap, a packet +capturing driver and library for the Microsoft Windows platform. +Npcap is a separate work with it's own license rather than this Nmap +license. Since the Npcap license does not permit redistribution +without special permission, our Nmap Windows binary packages which +contain Npcap may not be redistributed without special +permission. + Any redistribution of Covered Software, including any derived works, must obey and carry forward all of the terms of this license, including @@ -110,7 +122,7 @@ instead of these. Creative Commons License for this Nmap Guide - This Nmap Reference Guide is (C) 2005–2012 Insecure.Com LLC. It is + This Nmap Reference Guide is (C) 2005–2016 Insecure.Com LLC. It is hereby placed under version 3.0 of the Creative Commons Attribution License. This allows you redistribute and modify @@ -126,20 +138,19 @@ instead of these. have a right to know exactly what a program is going to do before they run it. This also allows you to audit the software for security holes. -Source code also allows you to port Nmap to new platforms, fix bugs, -and add new features. You are highly encouraged to send your changes -to dev@nmap.org for possible incorporation -into the main distribution. By sending these changes to Fyodor or one -of the Insecure.Org development mailing lists, it is assumed that you -are offering the Nmap Project (Insecure.Com LLC) the unlimited, -non-exclusive right to reuse, modify, and relicense the code. Nmap -will always be available open source,open -source but this is important because the -inability to relicense code has caused devastating problems for other -Free Software projects (such as KDE and NASM). We also occasionally -relicense the code to third parties as discussed above. If you wish -to specify special license conditions of your contributions, just say -so when you send them. +Source code also allows you to port Nmap to new platforms, fix +bugs, and add new features. You are highly encouraged to send your +changes to dev@nmap.org for possible incorporation into +the main distribution. By sending these changes to Fyodor or one of +the Insecure.Org development mailing lists, it is assumed that you are +offering the Nmap Project the unlimited, non-exclusive right to reuse, +modify, and relicense the code. Nmap will always be available open +source,open source but this +is important because the inability to relicense code has caused +devastating problems for other Free Software projects (such as KDE and +NASM). We also occasionally relicense the code to third parties as +discussed above. If you wish to specify special license conditions of +your contributions, just say so when you send them. @@ -234,15 +245,16 @@ This software was supported in part through the Export +OpenSSL support, the Nmap Project believes that Nmap is not subject to +U.S. Export Administration Regulations (EAR) export control. As such, -there is no applicable ECCN (export control classification number) -and exportation does not require any special license, permit, or other +there is no applicable ECCN (export control classification number) and +exportation does not require any special license, permit, or other governmental authorization. When compiled with OpenSSL support or distributed as source -code, Insecure.Com LLC believes that Nmap falls under +code, the Nmap Project believes that Nmap falls under U.S. ECCN 5D002 (Information Security Software). We distribute Nmap