diff --git a/HACKING b/HACKING
index 72eeebcd5..33cae21aa 100644
--- a/HACKING
+++ b/HACKING
@@ -15,7 +15,7 @@ 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) unlimited, non-exclusive
+offering the Nmap Project (Nmap Software LLC) unlimited, non-exclusive
right to reuse, modify, and relicense the code. This is important
because the inability to relicense code has caused devastating
problems for other Free Software projects (such as KDE and NASM).
diff --git a/LICENSE b/LICENSE
index 2968dcc56..ffb37f25f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Nmap Public Source License Version 0.93
+Nmap Public Source License Version 0.94
For more information on this license, see https://nmap.org/npsl/
0. Preamble
@@ -81,7 +81,7 @@ and can not modify its governing terms in any way.
* "License" means this document, including Exhibits.
-* "Licensor" means Insecure.Com LLC and its successors and assigns.
+* "Licensor" means Nmap Software LLC and its successors and assigns.
* "Main License Body" means all of the terms of this document,
excluding Exhibits.
diff --git a/docs/3rd-party.xml b/docs/3rd-party.xml
index 4c884e979..189ee6fb1 100644
--- a/docs/3rd-party.xml
+++ b/docs/3rd-party.xml
@@ -261,7 +261,7 @@
Npcap
https://npcap.org/
- Insecure.Com LLC ("The Nmap Project")
+ Nmap Software LLC ("The Nmap Project")
&license_npcap;
diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml
index a35d34dfc..5cae07900 100644
--- a/docs/legal-notices.xml
+++ b/docs/legal-notices.xml
@@ -6,7 +6,7 @@
GNU General Public License
-The Nmap Security Scanner is (C) 1996–2020 Insecure.Com
+The Nmap Security Scanner is (C) 1996–2021 Nmap Software
LLC ("The Nmap Project"). Nmap is also a registered trademark of the
Nmap Project. It is published under the Nmap Public Source License. This
@@ -48,7 +48,8 @@ redistribute Nmap under those terms instead.
Creative Commons License for this Nmap Guide
- This Nmap Reference Guide is (C) 2005–2020 Insecure.Com LLC. It is
+ This Nmap Reference Guide is (C)
+ 2005–2021 Nmap Software LLC. It is
hereby placed under version 3.0 of the Creative Commons
Attribution License. This allows you redistribute and modify
diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index 002625090..6a4ee20af 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -6,7 +6,7 @@
Originally written by:
William McVey
- Now maintained by Fyodor as part of Nmap.
+ Now maintained by Fyodor as part of Nmap.
To validate using this file, simply add a DOCTYPE line similar to:
@@ -21,7 +21,7 @@
specify "one each of this list of elements, in any order". If there
is a construct similar to SGML's '&' operator, please let me know.
- Portions Copyright (c) 2001-2008 Insecure.Com LLC
+ Portions Copyright (c) 2001-2021 Nmap Software LLC
Portions Copyright (c) 2001 by Cisco systems, Inc.
Permission to use, copy, modify, and distribute modified and
diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc
index c0b41acc6..6407cf30a 100644
--- a/mswin32/nmap.rc
+++ b/mswin32/nmap.rc
@@ -32,7 +32,7 @@ BEGIN
VALUE "FileDescription", NMAP_NAME
VALUE "FileVersion", NMAP_VERSION
VALUE "InternalName", NMAP_NAME
- VALUE "LegalCopyright", "Copyright (c) The Nmap Project (Insecure.Com LLC)\0"
+ VALUE "LegalCopyright", "Copyright (c) The Nmap Project (Nmap Software LLC)\0"
VALUE "LegalTrademarks", "NMAP\0"
VALUE "OriginalFilename", "nmap.exe\0"
VALUE "ProductName", NMAP_NAME
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 10daf9d4f..7baa3b84e 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -78,7 +78,7 @@
VIAddVersionKey /LANG=1033 "ProductName" "${NMAP_NAME}"
VIAddVersionKey /LANG=1033 "CompanyName" "Insecure.org"
VIAddVersionKey /LANG=1033 "InternalName" "NmapInstaller.exe"
- VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright (c) Insecure.Com LLC (fyodor@insecure.org)"
+ VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright (c) Nmap Software LLC (fyodor@nmap.org)"
VIAddVersionKey /LANG=1033 "LegalTrademark" "NMAP"
VIAddVersionKey /LANG=1033 "FileDescription" "${NMAP_NAME} installer"
diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml
index 653ae36a2..49aabeaa4 100644
--- a/ncat/docs/ncat.xml
+++ b/ncat/docs/ncat.xml
@@ -1109,19 +1109,18 @@
Chris Gibson chris@linuxops.net
+
+ Gordon Lyon (Fyodor)fyodor@nmap.org
+ ()
+
Kris Katterjohn katterjohn@gmail.com
Mixter mixter@gmail.com
-
- Fyodor fyodor@nmap.org
- ()
-
-
The original Netcat was written by *Hobbit* hobbit@avian.org.
While Ncat isn't built on any code from the traditional
Netcat (or any
other implementation), Ncat is most definitely based on Netcat in spirit
@@ -1135,7 +1134,7 @@
Ncat Copyright and Licensing
copyright
- Ncat is (C) 2005–2020 Insecure.Com LLC. It is distributed
+ Ncat is (C) 2005–2021 Nmap Software LLC. It is distributed
as free and open source software under the same license terms as our
Nmap software. Precise terms and further details are available
from .
@@ -1144,7 +1143,8 @@
Creative Commons License for this Ncat Guide
- This Ncat Reference Guide is (C) 2005–2018 Insecure.Com LLC. It is
+ This Ncat Reference Guide is (C)
+ 2005–2021 Nmap Software LLC. It is
hereby placed under version 3.0 of the Creative Commons
Attribution License. This allows you redistribute and modify
@@ -1167,7 +1167,7 @@ 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,
+offering the Nmap Project (Nmap Software 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
diff --git a/nmap-os-db b/nmap-os-db
index 69e264d3e..94398add2 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -7,19 +7,16 @@
# please see https://nmap.org/submit/ .
#
# By submitting fingerprints you are transfering any and all copyright
-# interest in the data to Insecure.Com LLC so it can modified,
+# interest in the data to Nmap Software LLC so it can modified,
# incorporated into Nmap, relicensed, etc.
#
-# This collection of fingerprint data is (C) 1996-2020 by Insecure.Com
-# LLC. It is distributed under the Nmap Public Source license as
-# provided in the LICENSE file of the source distribution or at
-# https://nmap.org/data/LICENSE . Note that this license
-# requires you to license your own work under a compatible open source
-# license. If you wish to embed Nmap technology into proprietary
-# software, we sell alternative licenses (contact sales@insecure.com).
-# Dozens of software vendors already license Nmap technology such as
-# host discovery, port scanning, OS detection, and version detection.
-# For more details, see https://nmap.org/book/man-legal.html
+# This collection of data is (C) 1996-2021 by Nmap Software LLC. It
+# is distributed under the Nmap Public Source license as provided in
+# the LICENSE file of the source distribution or at
+# https://nmap.org/npsl/. Note that this free license does not allow
+# incorporation of Nmap or its data files within proprietary
+# software. We sell a separate Nmap OEM for that as described
+# (including pricing) at https://nmap.org/npsl/.
#
# For a complete description of Nmap OS detection and the format of
# fingerprints in this file, see https://nmap.org/book/osdetect.html.
diff --git a/nmap-rpc b/nmap-rpc
index 65269d027..e430c6e0e 100644
--- a/nmap-rpc
+++ b/nmap-rpc
@@ -8,16 +8,13 @@
# * faster. *
# ***************************************************************************/
#
-# This collection of data is (C) 1996-2020 by Insecure.Com LLC.
-# It is distributed under the Nmap Public Source license as
-# provided in the LICENSE file of the source distribution or at
-# https://svn.nmap.org/nmap/LICENSE . Note that this license
-# requires you to license your own work under a compatable open source
-# license. If you wish to embed Nmap technology into proprietary
-# software, we sell alternative licenses (contact sales@insecure.com).
-# Dozens of software vendors already license Nmap technology such as
-# host discovery, port scanning, OS detection, and version detection.
-# For more details, see https://nmap.org/book/man-legal.html
+# This collection of data is (C) 1996-2021 by Nmap Software LLC. It
+# is distributed under the Nmap Public Source license as provided in
+# the LICENSE file of the source distribution or at
+# https://nmap.org/npsl/. Note that this free license does not allow
+# incorporation of Nmap or its data files within proprietary
+# software. We sell a separate Nmap OEM for that as described
+# (including pricing) at https://nmap.org/npsl/.
# Master RPC program number data base (/etc/rpc).
#
diff --git a/nselib/data/passwords.lst b/nselib/data/passwords.lst
index 534567628..2e197506f 100644
--- a/nselib/data/passwords.lst
+++ b/nselib/data/passwords.lst
@@ -1,13 +1,10 @@
-#!comment: This collection of data is (C) 1996-2020 by Insecure.Com LLC.
+#!comment: This collection of data is (C) 1996-2021 by Nmap Software LLC.
#!comment: It is distributed under the Nmap Public Source license as
#!comment: provided in the LICENSE file of the source distribution or at
-#!comment: https://svn.nmap.org/nmap/LICENSE . Note that this license
+#!comment: https://nmap.org/npsl/. Note that this license
#!comment: requires you to license your own work under a compatable open source
#!comment: license. If you wish to embed Nmap technology into proprietary
-#!comment: software, we sell alternative licenses (contact sales@insecure.com).
-#!comment: Dozens of software vendors already license Nmap technology such as
-#!comment: host discovery, port scanning, OS detection, and version detection.
-#!comment: For more details, see https://nmap.org/book/man-legal.html
+#!comment: software, we sell alternative licenses at https://nmap.org/oem/.
123456
12345
diff --git a/nselib/data/snmpcommunities.lst b/nselib/data/snmpcommunities.lst
index 2326f9a70..5b8a4dba0 100644
--- a/nselib/data/snmpcommunities.lst
+++ b/nselib/data/snmpcommunities.lst
@@ -1,13 +1,10 @@
-#!comment: This collection of data is (C) 1996-2020 by Insecure.Com LLC.
+#!comment: This collection of data is (C) 1996-2021 by Nmap Software LLC.
#!comment: It is distributed under the Nmap Public Source license as
#!comment: provided in the LICENSE file of the source distribution or at
-#!comment: https://svn.nmap.org/nmap/LICENSE . Note that this license
+#!comment: https://nmap.org/npsl/. Note that this license
#!comment: requires you to license your own work under a compatable open source
#!comment: license. If you wish to embed Nmap technology into proprietary
-#!comment: software, we sell alternative licenses (contact sales@insecure.com).
-#!comment: Dozens of software vendors already license Nmap technology such as
-#!comment: host discovery, port scanning, OS detection, and version detection.
-#!comment: For more details, see https://nmap.org/book/man-legal.html
+#!comment: software, we sell alternative licenses at https://nmap.org/oem/.
public
private
diff --git a/zenmap/share/zenmap/locale/es.po b/zenmap/share/zenmap/locale/es.po
index 65604796b..659fdef44 100644
--- a/zenmap/share/zenmap/locale/es.po
+++ b/zenmap/share/zenmap/locale/es.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2016 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
msgid ""
diff --git a/zenmap/share/zenmap/locale/hi.po b/zenmap/share/zenmap/locale/hi.po
index 7c40a4a2a..97a41974a 100644
--- a/zenmap/share/zenmap/locale/hi.po
+++ b/zenmap/share/zenmap/locale/hi.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
msgid ""
diff --git a/zenmap/share/zenmap/locale/hr.po b/zenmap/share/zenmap/locale/hr.po
index 269d1799f..a0194af5d 100644
--- a/zenmap/share/zenmap/locale/hr.po
+++ b/zenmap/share/zenmap/locale/hr.po
@@ -1,5 +1,5 @@
# translation of hr.po to Croatian
-# Copyright (C) 2009 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
# Inital translation: Vlatko Kosturjak , 2009.
diff --git a/zenmap/share/zenmap/locale/it.po b/zenmap/share/zenmap/locale/it.po
index 8907e0573..ddb24f85b 100644
--- a/zenmap/share/zenmap/locale/it.po
+++ b/zenmap/share/zenmap/locale/it.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
msgid ""
diff --git a/zenmap/share/zenmap/locale/pl.po b/zenmap/share/zenmap/locale/pl.po
index f742c4159..32f7d8922 100644
--- a/zenmap/share/zenmap/locale/pl.po
+++ b/zenmap/share/zenmap/locale/pl.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
#, fuzzy
diff --git a/zenmap/share/zenmap/locale/pt_BR.po b/zenmap/share/zenmap/locale/pt_BR.po
index d058cc574..2ccaebbb3 100644
--- a/zenmap/share/zenmap/locale/pt_BR.po
+++ b/zenmap/share/zenmap/locale/pt_BR.po
@@ -1,5 +1,5 @@
# Translation of Zenmap to Português Brasil
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
# Adriano Monteiro Marques , 2006.
#
diff --git a/zenmap/share/zenmap/locale/ru.po b/zenmap/share/zenmap/locale/ru.po
index 7bb933ad3..a8d8becd0 100644
--- a/zenmap/share/zenmap/locale/ru.po
+++ b/zenmap/share/zenmap/locale/ru.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
msgid ""
diff --git a/zenmap/share/zenmap/locale/zenmap.pot b/zenmap/share/zenmap/locale/zenmap.pot
index 51035f82a..470e3b262 100644
--- a/zenmap/share/zenmap/locale/zenmap.pot
+++ b/zenmap/share/zenmap/locale/zenmap.pot
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# This file is distributed under the same license as Nmap.
#
#, fuzzy
diff --git a/zenmap/share/zenmap/locale/zh.po b/zenmap/share/zenmap/locale/zh.po
index 100133453..79020b244 100644
--- a/zenmap/share/zenmap/locale/zh.po
+++ b/zenmap/share/zenmap/locale/zh.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Insecure.Com LLC
+# Copyright (C) 2008 - 2021 Nmap Software LLC
# Copyright (C) Jiang Jie , 2014.
# This file is distributed under the same license as Nmap.
msgid ""
diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py
index a4d932954..c42ec0daa 100644
--- a/zenmap/zenmapCore/Name.py
+++ b/zenmap/zenmapCore/Name.py
@@ -67,7 +67,7 @@ APP_DISPLAY_NAME = "Zenmap"
APP_WEB_SITE = "https://nmap.org/zenmap"
APP_DOWNLOAD_SITE = "https://nmap.org/download.html"
APP_DOCUMENTATION_SITE = "https://nmap.org/docs.html"
-APP_COPYRIGHT = "Copyright 2005-2021 Insecure.Com LLC"
+APP_COPYRIGHT = "Copyright 2005-2021 Nmap Software LLC"
NMAP_DISPLAY_NAME = u"Nmap"
NMAP_WEB_SITE = "https://nmap.org"