Skip to content

Commit

Permalink
Change Insecure.Com LLC to Nmap Software LLC
Browse files Browse the repository at this point in the history
  • Loading branch information
fyodor committed Nov 23, 2021
1 parent 3aec3f3 commit 158c2e4
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 61 deletions.
2 changes: 1 addition & 1 deletion HACKING
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and add new features. You are highly encouraged to send your changes
to [email protected] 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).
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/3rd-party.xml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<package id="npcap">
<name>Npcap</name>
<url>https://npcap.org/</url>
<copyright>Insecure.Com LLC ("The Nmap Project")</copyright>
<copyright>Nmap Software LLC ("The Nmap Project")</copyright>
<license>&license_npcap;</license>
</package>
<package id="ike-scan-fp">
Expand Down
5 changes: 3 additions & 2 deletions docs/legal-notices.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<indexterm><primary>GNU General Public License</primary></indexterm>


<para>The Nmap Security Scanner is (C) 1996&ndash;2020 Insecure.Com
<para>The Nmap Security Scanner is (C) 1996&ndash;2021 Nmap Software
LLC ("The Nmap Project"). Nmap is also a registered trademark of the
Nmap Project. It is published under the <ulink
url="https://nmap.org/npsl">Nmap Public Source License</ulink>. This
Expand Down Expand Up @@ -48,7 +48,8 @@ redistribute Nmap under those terms instead.</para>

<refsect2 id="man-copyright">
<title>Creative Commons License for this Nmap Guide</title>
<para>This <citetitle>Nmap Reference Guide</citetitle> is (C) 2005&ndash;2020 Insecure.Com LLC. It is
<para>This <citetitle>Nmap Reference Guide</citetitle> is (C)
2005&ndash;2021 Nmap Software LLC. It is
hereby placed under version 3.0 of the <ulink
url="http:https://creativecommons.org/licenses/by/3.0/">Creative Commons
Attribution License</ulink>. This allows you redistribute and modify
Expand Down
4 changes: 2 additions & 2 deletions docs/nmap.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Originally written by:
William McVey <[email protected]> <[email protected]>

Now maintained by Fyodor <fyodor@insecure.org> as part of Nmap.
Now maintained by Fyodor <fyodor@nmap.org> as part of Nmap.

To validate using this file, simply add a DOCTYPE line similar to:
<!DOCTYPE nmaprun SYSTEM "nmap.dtd">
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mswin32/nmap.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mswin32/nsis/Nmap.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
16 changes: 8 additions & 8 deletions ncat/docs/ncat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1110,18 +1110,17 @@
<para>Chris Gibson <email>[email protected]</email></para>
</listitem>
<listitem>
<para>Kris Katterjohn <email>[email protected]</email></para>
<para>Gordon Lyon (Fyodor)<email>[email protected]</email>
(<ulink url="http:https://insecure.org" />)</para>
</listitem>
<listitem>
<para>Mixter <email>mixter@gmail.com</email></para>
<para>Kris Katterjohn <email>katterjohn@gmail.com</email></para>
</listitem>
<listitem>
<para>Fyodor <email>[email protected]</email>
(<ulink url="http:https://insecure.org" />)</para>
<para>Mixter <email>[email protected]</email></para>
</listitem>
</itemizedlist>


<para>The original Netcat was written by *Hobbit* <email>[email protected]</email>.
While Ncat isn't built on any code from the <quote>traditional</quote> Netcat (or any
other implementation), Ncat is most definitely based on Netcat in spirit
Expand All @@ -1135,7 +1134,7 @@
<title>Ncat Copyright and Licensing</title>
<indexterm><primary>copyright</primary></indexterm>

<para>Ncat is (C) 2005&ndash;2020 Insecure.Com LLC. It is distributed
<para>Ncat is (C) 2005&ndash;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
<man>from <ulink url="https://nmap.org/man/man-legal.html"/>.</man>
Expand All @@ -1144,7 +1143,8 @@

<refsect2 id="ncat-man-copyright">
<title>Creative Commons License for this Ncat Guide</title>
<para>This <citetitle>Ncat Reference Guide</citetitle> is (C) 2005&ndash;2018 Insecure.Com LLC. It is
<para>This <citetitle>Ncat Reference Guide</citetitle> is (C)
2005&ndash;2021 Nmap Software LLC. It is
hereby placed under version 3.0 of the <ulink
url="http:https://creativecommons.org/licenses/by/3.0/">Creative Commons
Attribution License</ulink>. This allows you redistribute and modify
Expand All @@ -1167,7 +1167,7 @@ encouraged to send your changes to
<email>[email protected]</email> 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,<indexterm><primary>open
source</primary></indexterm> but this is important because the
Expand Down
19 changes: 8 additions & 11 deletions nmap-os-db
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]).
# 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.
Expand Down
17 changes: 7 additions & 10 deletions nmap-rpc
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]).
# 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).
#
Expand Down
9 changes: 3 additions & 6 deletions nselib/data/passwords.lst
Original file line number Diff line number Diff line change
@@ -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 [email protected]).
#!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
Expand Down
9 changes: 3 additions & 6 deletions nselib/data/snmpcommunities.lst
Original file line number Diff line number Diff line change
@@ -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 [email protected]).
#!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
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/es.po
Original file line number Diff line number Diff line change
@@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/hi.po
Original file line number Diff line number Diff line change
@@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/hr.po
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>, 2009.
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/it.po
Original file line number Diff line number Diff line change
@@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/pl.po
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/pt_BR.po
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>, 2006.
#
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/ru.po
Original file line number Diff line number Diff line change
@@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/zenmap.pot
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion zenmap/share/zenmap/locale/zh.po
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2008 Insecure.Com LLC
# Copyright (C) 2008 - 2021 Nmap Software LLC
# Copyright (C) Jiang Jie <jerrynwin () gmail com>, 2014.
# This file is distributed under the same license as Nmap.
msgid ""
Expand Down
2 changes: 1 addition & 1 deletion zenmap/zenmapCore/Name.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
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"
Expand Down

0 comments on commit 158c2e4

Please sign in to comment.