From ef8213a36c2e89233c806753a57b5cd473605408 Mon Sep 17 00:00:00 2001 From: dmiller Date: Mon, 5 Oct 2020 23:00:30 +0000 Subject: [PATCH] Reintegrate Nmap 7.90 release branch --- CHANGELOG | 150 +++-- COPYING | 475 --------------- FPEngine.cc | 146 ++--- FPEngine.h | 146 ++--- FPModel.cc | 4 +- FingerPrintResults.cc | 146 ++--- FingerPrintResults.h | 146 ++--- LICENSE | 564 ++++++++++++++++++ MACLookup.cc | 146 ++--- MACLookup.h | 146 ++--- NewTargets.cc | 146 ++--- NewTargets.h | 146 ++--- NmapOps.cc | 146 ++--- NmapOps.h | 146 ++--- NmapOutputTable.cc | 146 ++--- NmapOutputTable.h | 146 ++--- Target.cc | 146 ++--- Target.h | 146 ++--- TargetGroup.cc | 146 ++--- TargetGroup.h | 146 ++--- charpool.cc | 146 ++--- charpool.h | 146 ++--- docs/3rd-party-licenses.txt | 2 +- docs/3rd-party.xml | 2 +- docs/legal-notices.xml | 170 ++---- docs/nmap.1 | 274 ++++----- docs/nmap.usage.txt | 2 +- idle_scan.cc | 146 ++--- idle_scan.h | 146 ++--- libnetutil/ARPHeader.cc | 146 ++--- libnetutil/ARPHeader.h | 146 ++--- libnetutil/ApplicationLayerElement.h | 146 ++--- libnetutil/DataLinkLayerElement.h | 146 ++--- libnetutil/DestOptsHeader.cc | 146 ++--- libnetutil/DestOptsHeader.h | 146 ++--- libnetutil/EthernetHeader.cc | 146 ++--- libnetutil/EthernetHeader.h | 146 ++--- libnetutil/FragmentHeader.cc | 146 ++--- libnetutil/FragmentHeader.h | 146 ++--- libnetutil/HopByHopHeader.cc | 146 ++--- libnetutil/HopByHopHeader.h | 146 ++--- libnetutil/ICMPHeader.h | 146 ++--- libnetutil/ICMPv4Header.cc | 146 ++--- libnetutil/ICMPv4Header.h | 146 ++--- libnetutil/ICMPv6Header.cc | 146 ++--- libnetutil/ICMPv6Header.h | 146 ++--- libnetutil/ICMPv6Option.cc | 146 ++--- libnetutil/ICMPv6Option.h | 146 ++--- libnetutil/ICMPv6RRBody.cc | 146 ++--- libnetutil/ICMPv6RRBody.h | 146 ++--- libnetutil/IPv4Header.cc | 146 ++--- libnetutil/IPv4Header.h | 146 ++--- libnetutil/IPv6ExtensionHeader.h | 146 ++--- libnetutil/IPv6Header.cc | 146 ++--- libnetutil/IPv6Header.h | 146 ++--- libnetutil/NetworkLayerElement.cc | 146 ++--- libnetutil/NetworkLayerElement.h | 146 ++--- libnetutil/PacketElement.cc | 146 ++--- libnetutil/PacketElement.h | 146 ++--- libnetutil/PacketParser.cc | 146 ++--- libnetutil/PacketParser.h | 146 ++--- libnetutil/RawData.cc | 146 ++--- libnetutil/RawData.h | 146 ++--- libnetutil/RoutingHeader.cc | 146 ++--- libnetutil/RoutingHeader.h | 146 ++--- libnetutil/TCPHeader.cc | 146 ++--- libnetutil/TCPHeader.h | 146 ++--- libnetutil/TransportLayerElement.cc | 146 ++--- libnetutil/TransportLayerElement.h | 146 ++--- libnetutil/UDPHeader.cc | 146 ++--- libnetutil/UDPHeader.h | 146 ++--- libnetutil/netutil.cc | 146 ++--- libnetutil/netutil.h | 146 ++--- libnetutil/npacket.h | 146 ++--- macosx/BUNDLING.md | 73 ++- macosx/Makefile | 22 +- macosx/check_test.sh | 8 +- macosx/createdmg.sh | 2 +- macosx/nmap.pmdoc/index.xml | 2 +- macosx/openssl.modules | 12 +- main.cc | 146 ++--- mswin32/Makefile | 156 +++-- mswin32/nmap.sln | 84 +-- mswin32/nmap.vcxproj | 73 +-- mswin32/nsis/Nmap.nsi.in | 99 +-- mswin32/winfix.cc | 146 ++--- nbase/getaddrinfo.c | 146 ++--- nbase/getnameinfo.c | 146 ++--- nbase/nbase.h | 146 ++--- nbase/nbase_addrset.c | 146 ++--- nbase/nbase_config.h.in | 146 ++--- nbase/nbase_crc32ct.h | 146 ++--- nbase/nbase_ipv6.h | 146 ++--- nbase/nbase_memalloc.c | 146 ++--- nbase/nbase_misc.c | 146 ++--- nbase/nbase_rnd.c | 146 ++--- nbase/nbase_str.c | 146 ++--- nbase/nbase_time.c | 146 ++--- nbase/nbase_winconfig.h | 146 ++--- nbase/nbase_winunix.c | 146 ++--- nbase/nbase_winunix.h | 146 ++--- nbase/strcasecmp.c | 146 ++--- ncat/{COPYING => LICENSE} | 2 +- ncat/base64.c | 146 ++--- ncat/base64.h | 146 ++--- ncat/config_win.h | 146 ++--- ncat/configure | 4 - ncat/docs/ncat.usage.txt | 2 +- ncat/docs/ncat.xml | 12 +- ncat/http.c | 146 ++--- ncat/http.h | 146 ++--- ncat/http_digest.c | 146 ++--- ncat/ncat.h | 148 ++--- ncat/ncat_config.h | 146 ++--- ncat/ncat_connect.c | 146 ++--- ncat/ncat_connect.h | 146 ++--- ncat/ncat_core.c | 146 ++--- ncat/ncat_core.h | 146 ++--- ncat/ncat_exec.h | 146 ++--- ncat/ncat_exec_win.c | 146 ++--- ncat/ncat_listen.c | 146 ++--- ncat/ncat_listen.h | 146 ++--- ncat/ncat_lua.c | 146 ++--- ncat/ncat_lua.h | 146 ++--- ncat/ncat_main.c | 146 ++--- ncat/ncat_posix.c | 146 ++--- ncat/ncat_proxy.c | 146 ++--- ncat/ncat_proxy.h | 146 ++--- ncat/ncat_ssl.c | 146 ++--- ncat/ncat_ssl.h | 146 ++--- ncat/ncat_win.c | 146 ++--- ncat/sockaddr_u.h | 146 ++--- ncat/sys_wrap.c | 146 ++--- ncat/sys_wrap.h | 146 ++--- ncat/util.c | 146 ++--- ncat/util.h | 146 ++--- ndiff/{COPYING => LICENSE} | 4 +- ndiff/ndiff.py | 4 +- ndiff/scripts/ndiff | 4 +- nmap-header-template.cc | 146 ++--- nmap-os-db | 6 +- nmap-payloads | 6 +- nmap-rpc | 95 +-- nmap-service-probes | 6 +- nmap-services | 8 +- nmap.cc | 146 ++--- nmap.h | 152 ++--- nmap.spec.in | 2 +- nmap_amigaos.h | 146 ++--- nmap_config.h.in | 146 ++--- nmap_dns.cc | 146 ++--- nmap_dns.h | 146 ++--- nmap_error.cc | 146 ++--- nmap_error.h | 146 ++--- nmap_ftp.cc | 146 ++--- nmap_ftp.h | 146 ++--- nmap_tty.cc | 146 ++--- nmap_tty.h | 146 ++--- nmap_winconfig.h | 146 ++--- nping/ArgParser.cc | 146 ++--- nping/ArgParser.h | 146 ++--- nping/COPYING | 476 --------------- nping/Crypto.cc | 146 ++--- nping/Crypto.h | 146 ++--- nping/EchoClient.cc | 146 ++--- nping/EchoClient.h | 146 ++--- nping/EchoHeader.cc | 146 ++--- nping/EchoHeader.h | 146 ++--- nping/EchoServer.cc | 146 ++--- nping/EchoServer.h | 146 ++--- nping/LICENSE | 3 + nping/Makefile.in | 2 +- nping/NEPContext.cc | 146 ++--- nping/NEPContext.h | 146 ++--- nping/NpingOps.cc | 146 ++--- nping/NpingOps.h | 146 ++--- nping/NpingTarget.cc | 146 ++--- nping/NpingTarget.h | 146 ++--- nping/NpingTargets.cc | 146 ++--- nping/NpingTargets.h | 146 ++--- nping/ProbeMode.cc | 146 ++--- nping/ProbeMode.h | 146 ++--- nping/common.cc | 146 ++--- nping/common.h | 146 ++--- nping/common_modified.cc | 146 ++--- nping/common_modified.h | 146 ++--- nping/nping.cc | 146 ++--- nping/nping.h | 148 ++--- nping/nping_config.h.in | 146 ++--- nping/nping_winconfig.h | 146 ++--- nping/output.cc | 146 ++--- nping/output.h | 146 ++--- nping/stats.cc | 146 ++--- nping/stats.h | 146 ++--- nping/utils.cc | 146 ++--- nping/utils.h | 146 ++--- nping/utils_net.cc | 146 ++--- nping/utils_net.h | 146 ++--- nping/winfix.cc | 146 ++--- nse_ssl_cert.cc | 146 ++--- nse_ssl_cert.h | 146 ++--- nselib/data/passwords.lst | 94 +-- nselib/data/snmpcommunities.lst | 94 +-- nsock/examples/nsock_telnet.c | 2 +- nsock/examples/nsock_test_timers.c | 2 +- nsock/include/nsock.h | 2 +- nsock/include/nsock_config.h.in | 2 +- nsock/include/nsock_winconfig.h | 2 +- nsock/src/engine_epoll.c | 2 +- nsock/src/engine_iocp.c | 2 +- nsock/src/engine_kqueue.c | 2 +- nsock/src/engine_poll.c | 2 +- nsock/src/engine_select.c | 2 +- nsock/src/error.c | 2 +- nsock/src/error.h | 2 +- nsock/src/filespace.c | 2 +- nsock/src/filespace.h | 2 +- nsock/src/gh_heap.c | 2 +- nsock/src/gh_heap.h | 2 +- nsock/src/gh_list.h | 2 +- nsock/src/netutils.c | 2 +- nsock/src/netutils.h | 2 +- nsock/src/nsock_connect.c | 2 +- nsock/src/nsock_core.c | 2 +- nsock/src/nsock_engines.c | 2 +- nsock/src/nsock_event.c | 2 +- nsock/src/nsock_internal.h | 2 +- nsock/src/nsock_iod.c | 2 +- nsock/src/nsock_log.c | 2 +- nsock/src/nsock_log.h | 2 +- nsock/src/nsock_pcap.c | 2 +- nsock/src/nsock_pcap.h | 2 +- nsock/src/nsock_pool.c | 2 +- nsock/src/nsock_proxy.c | 2 +- nsock/src/nsock_proxy.h | 2 +- nsock/src/nsock_read.c | 2 +- nsock/src/nsock_ssl.c | 2 +- nsock/src/nsock_ssl.h | 2 +- nsock/src/nsock_timers.c | 2 +- nsock/src/nsock_write.c | 2 +- nsock/src/proxy_http.c | 2 +- nsock/src/proxy_socks4.c | 2 +- osscan.cc | 146 ++--- osscan.h | 146 ++--- osscan2.cc | 146 ++--- osscan2.h | 146 ++--- output.cc | 146 ++--- output.h | 146 ++--- payload.cc | 146 ++--- payload.h | 146 ++--- portlist.cc | 146 ++--- portlist.h | 146 ++--- portreasons.cc | 146 ++--- portreasons.h | 146 ++--- probespec.h | 146 ++--- protocols.cc | 146 ++--- protocols.h | 146 ++--- scan_engine.cc | 146 ++--- scan_engine.h | 146 ++--- scan_engine_connect.cc | 146 ++--- scan_engine_connect.h | 146 ++--- scan_engine_raw.cc | 146 ++--- scan_engine_raw.h | 146 ++--- scan_lists.cc | 146 ++--- scan_lists.h | 146 ++--- service_scan.cc | 146 ++--- service_scan.h | 146 ++--- services.cc | 146 ++--- services.h | 146 ++--- string_pool.cc | 146 ++--- string_pool.h | 146 ++--- targets.cc | 146 ++--- targets.h | 146 ++--- tcpip.cc | 146 ++--- tcpip.h | 146 ++--- tests/nmap_dns_test.cc | 146 ++--- timing.cc | 146 ++--- timing.h | 146 ++--- traceroute.cc | 146 ++--- traceroute.h | 146 ++--- utils.cc | 146 ++--- utils.h | 146 ++--- xml.cc | 146 ++--- xml.h | 146 ++--- zenmap/{COPYING => LICENSE} | 2 +- zenmap/install_scripts/macosx/zenmap.bundle | 9 +- .../install_scripts/utils/version_update.py | 146 ++--- zenmap/radialnet/__init__.py | 146 ++--- zenmap/radialnet/bestwidgets/__init__.py | 146 ++--- zenmap/radialnet/bestwidgets/boxes.py | 146 ++--- zenmap/radialnet/bestwidgets/buttons.py | 146 ++--- zenmap/radialnet/bestwidgets/comboboxes.py | 146 ++--- zenmap/radialnet/bestwidgets/expanders.py | 146 ++--- zenmap/radialnet/bestwidgets/frames.py | 146 ++--- zenmap/radialnet/bestwidgets/labels.py | 146 ++--- zenmap/radialnet/bestwidgets/textview.py | 146 ++--- zenmap/radialnet/bestwidgets/windows.py | 146 ++--- zenmap/radialnet/core/ArgvHandle.py | 146 ++--- zenmap/radialnet/core/Coordinate.py | 146 ++--- zenmap/radialnet/core/Graph.py | 146 ++--- zenmap/radialnet/core/Info.py | 146 ++--- zenmap/radialnet/core/Interpolation.py | 146 ++--- zenmap/radialnet/core/XMLHandler.py | 146 ++--- zenmap/radialnet/core/__init__.py | 146 ++--- zenmap/radialnet/gui/Application.py | 146 ++--- zenmap/radialnet/gui/ControlWidget.py | 146 ++--- zenmap/radialnet/gui/Dialogs.py | 146 ++--- zenmap/radialnet/gui/HostsViewer.py | 146 ++--- zenmap/radialnet/gui/Image.py | 146 ++--- zenmap/radialnet/gui/LegendWindow.py | 146 ++--- zenmap/radialnet/gui/NodeNotebook.py | 146 ++--- zenmap/radialnet/gui/NodeWindow.py | 146 ++--- zenmap/radialnet/gui/RadialNet.py | 146 ++--- zenmap/radialnet/gui/SaveDialog.py | 146 ++--- zenmap/radialnet/gui/Toolbar.py | 146 ++--- zenmap/radialnet/gui/__init__.py | 146 ++--- zenmap/radialnet/radialnet.pyw | 146 ++--- zenmap/radialnet/util/__init__.py | 146 ++--- zenmap/radialnet/util/drawing.py | 146 ++--- zenmap/radialnet/util/geometry.py | 146 ++--- zenmap/radialnet/util/integration.py | 146 ++--- zenmap/radialnet/util/misc.py | 146 ++--- zenmap/setup.py | 146 ++--- zenmap/share/zenmap/config/zenmap_version | 2 +- zenmap/zenmap | 146 ++--- zenmap/zenmapCore/BasePaths.py | 146 ++--- zenmap/zenmapCore/DelayedObject.py | 146 ++--- zenmap/zenmapCore/Diff.py | 146 ++--- zenmap/zenmapCore/I18N.py | 146 ++--- zenmap/zenmapCore/NSEDocParser.py | 146 ++--- zenmap/zenmapCore/Name.py | 146 ++--- zenmap/zenmapCore/NetworkInventory.py | 146 ++--- zenmap/zenmapCore/NmapCommand.py | 146 ++--- zenmap/zenmapCore/NmapParser.py | 146 ++--- zenmap/zenmapCore/Paths.py | 146 ++--- zenmap/zenmapCore/RecentScans.py | 146 ++--- zenmap/zenmapCore/ScriptArgsParser.py | 146 ++--- zenmap/zenmapCore/ScriptMetadata.py | 146 ++--- zenmap/zenmapCore/SearchResult.py | 146 ++--- zenmap/zenmapCore/StringPool.py | 146 ++--- zenmap/zenmapCore/TargetList.py | 146 ++--- zenmap/zenmapCore/UmitConf.py | 146 ++--- zenmap/zenmapCore/UmitConfigParser.py | 146 ++--- zenmap/zenmapCore/UmitDB.py | 146 ++--- zenmap/zenmapCore/UmitLogging.py | 146 ++--- zenmap/zenmapCore/UmitOptionParser.py | 146 ++--- zenmap/zenmapCore/Version.py | 2 +- zenmap/zenmapCore/__init__.py | 146 ++--- zenmap/zenmapGUI/About.py | 146 ++--- zenmap/zenmapGUI/App.py | 146 ++--- zenmap/zenmapGUI/BugReport.py | 146 ++--- zenmap/zenmapGUI/CrashReport.py | 146 ++--- zenmap/zenmapGUI/DiffCompare.py | 146 ++--- zenmap/zenmapGUI/FileChoosers.py | 146 ++--- zenmap/zenmapGUI/Icons.py | 146 ++--- zenmap/zenmapGUI/MainWindow.py | 146 ++--- zenmap/zenmapGUI/NmapOutputProperties.py | 146 ++--- zenmap/zenmapGUI/NmapOutputViewer.py | 146 ++--- zenmap/zenmapGUI/OptionBuilder.py | 146 ++--- zenmap/zenmapGUI/Print.py | 146 ++--- zenmap/zenmapGUI/ProfileCombo.py | 146 ++--- zenmap/zenmapGUI/ProfileEditor.py | 146 ++--- zenmap/zenmapGUI/ProfileHelp.py | 146 ++--- zenmap/zenmapGUI/ScanHostDetailsPage.py | 146 ++--- zenmap/zenmapGUI/ScanHostsView.py | 146 ++--- zenmap/zenmapGUI/ScanInterface.py | 146 ++--- zenmap/zenmapGUI/ScanNmapOutputPage.py | 146 ++--- zenmap/zenmapGUI/ScanOpenPortsPage.py | 146 ++--- zenmap/zenmapGUI/ScanRunDetailsPage.py | 146 ++--- zenmap/zenmapGUI/ScanScanListPage.py | 146 ++--- zenmap/zenmapGUI/ScanToolbar.py | 146 ++--- zenmap/zenmapGUI/ScansListStore.py | 146 ++--- zenmap/zenmapGUI/ScriptInterface.py | 146 ++--- zenmap/zenmapGUI/SearchGUI.py | 146 ++--- zenmap/zenmapGUI/SearchWindow.py | 146 ++--- zenmap/zenmapGUI/TargetCombo.py | 146 ++--- zenmap/zenmapGUI/TopologyPage.py | 146 ++--- zenmap/zenmapGUI/__init__.py | 146 ++--- zenmap/zenmapGUI/higwidgets/__init__.py | 146 ++--- zenmap/zenmapGUI/higwidgets/gtkutils.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higboxes.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higbuttons.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higdialogs.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higentries.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higexpanders.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higframe.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higlabels.py | 146 ++--- .../zenmapGUI/higwidgets/higlogindialogs.py | 146 ++--- zenmap/zenmapGUI/higwidgets/hignotebooks.py | 146 ++--- .../zenmapGUI/higwidgets/higprogressbars.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higscrollers.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higspinner.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higtables.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higtextviewers.py | 146 ++--- zenmap/zenmapGUI/higwidgets/higwindows.py | 146 ++--- 395 files changed, 13529 insertions(+), 35562 deletions(-) delete mode 100644 COPYING create mode 100644 LICENSE rename ncat/{COPYING => LICENSE} (62%) rename ndiff/{COPYING => LICENSE} (66%) delete mode 100644 nping/COPYING create mode 100644 nping/LICENSE rename zenmap/{COPYING => LICENSE} (62%) diff --git a/CHANGELOG b/CHANGELOG index 98ffb90a1..d5afda1bb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,10 +8,88 @@ o [NSE] Script mysql-audit now defaults to the bundled mysql-cis.audit for Nmap 7.90 [2020-10-03] -o [GH#2126] Fix the "iocp" Nsock engine for Windows to be able to correctly - handle PCAP read events. This engine is now the default for Windows, which - should greatly improve performance over the previous default, the "poll" - engine. [Daniel Miller] +o [Windows] Upgraded Npcap, our Windows packet capturing (and sending) + library to the milestone 1.00 release! It's the culmination of 7 years of + development with 170 public pre-releases. This includes dozens of + performance improvements, bug fixes, and feature enhancements described + at https://npcap.org/changelog. + +o Integrated over 800 service/version detection fingerprints submitted since + August 2017. The signature count went up 1.8% to 11,878, including 17 new + softmatches. We now detect 1237 protocols from airmedia-audio, banner-ivu, + and control-m to insteon-plm, pi-hole-stats, and ums-webviewer. A + significant number of submissions remain to be integrated in the next + release. + +o Integrated over 330 of the most-frequently-submitted IPv4 OS fingerprints + since August 2017. Added 26 fingerprints, bringing the new total to 5,678. + Additions include iOS 12 & 13, macOS Catalina & Mojave, Linux 5.4, FreeBSD + 13, and more. + +o Integrated all 67 of your IPv6 OS fingerprint submissions from August 2017 to + September 2020. Added new groups for FreeBSD 12, Linux 5.4, and Windows 10, + and consolidated several weak groups to improve classification accuracy. + +o [NSE] Added 3 NSE scripts, from 2 authors, bringing the total up to 601! + They are all listed at https://nmap.org/nsedoc/, and the summaries are + below: + + + dicom-brute attempts to brute force the called Application Entity Title + of DICOM servers. [Paulino Calderon] + + + dicom-ping discovers DICOM servers and determines if any Application + Entity Title is allowed to connect. [Paulino Calderon] + + + uptime-agent-info collects system information from an Idera Uptime + Infrastructure Monitor agent. [Daniel Miller] + +o [GH#1834] Addressed over 250 code quality issues identified by LGTM.com, + improving our code quality score from "C" to "A+" + +o Released Npcap OEM Edition. For more than 20 years, the Nmap Project has + been funded by selling licenses for companies to distribute Nmap with + their products, along with commercial support. Hundreds of commercial + products now use Nmap for network discovery tasks like port scanning, + host discovery, OS detection, service/version detection, and of course + the Nmap Scripting Engine (NSE). Until now they have just used standard + Nmap, but this new OEM Edition is customized for use within other Windows + software. Nmap OEM contains the OEM version of our Npcap driver, which + allows for silent installation. It also removes the Zenmap GUI, which + cuts the installer size by more than half. And it reports itself as Nmap + OEM so customers know it's a properly licensed Nmap. See + https://nmap.org/oem for more details. We will be reaching out to all + existing licensees with Nmap OEM access credentials, but any licensees + who wants it quicker should see https://nmap.org/oem. + +o Upgraded the Nmap license form a sort of hacked-up version of GPLv2 to a + cleaner and better organized version (still based on GPLv2) now called the + Nmap Public Source License to avoid confusion. See https://nmap.org/npsl/ + for more details and annotated license text. This NPSL project was started + in 2006 (community discussion here: + https://seclists.org/nmap-dev/2006/q4/126) and then it lost momentum for 7 + years until it was restarted in 2013 + (https://seclists.org/nmap-dev/2013/q1/399) and then we got distracted by + development again. We still have some ideas for improving the NPSL, but + it's already much better than the current license, so we're applying NPSL + Version 0.92 to the code now and can make improvements later if + needed. This does not change the license of previous Nmap releases. + +o Removed nmap-update. This program was intended to provide a way to update + data files and NSE scripts, but the infrastructure was never fielded. It + depended on Subversion version control and would have required maintaining + separate versions of NSE scripts for compatibility. + +o Removed the silent-install command-line option (/S) from the Windows + installer. It causes several problems and there were no objections when we + proposed removing it in 2016 (https://seclists.org/nmap-dev/2016/q4/168). + It will remain in Nmap OEM since its main use was for customers who + redistribute Nmap with other software. If anyone else has a strong need + for an Nmap silent installer, please contact sales@nmap.com and we'll see + what we can do. + +o [GH#1860] 23 new UDP payloads and dozens more default ports for existing + payloads developed for Rapid7's InsightVM scan engine. These speed up and + ensure detection of open UDP services. [Paul Miseiko, Rapid7] o [GH#2051] Restrict Nmap's search path for scripts and data files. NMAPDATADIR, defined on Unix and Linux as ${prefix}/share/nmap, will not be @@ -19,34 +97,33 @@ o [GH#2051] Restrict Nmap's search path for scripts and data files. Additionally, the --script option will not interpret names as directory names unless they are followed by a '/'. [Daniel Miller] -o Removed nmap-update. This program was intended to provide a way to update - data files and NSE scripts, but the infrastructure was never fielded. It - depended on Subversion version control and would have required maintaining - separate versions of NSE scripts for compatibility. +o [GH#1764] Fix an assertion failure when unsolicited ARP response is received: + nmap: Target.cc:503: void Target::stopTimeOutClock(const timeval*): Assertion `htn.toclock_running == true' failed. -o [GH#2050] Reduced CPU usage of OS scan by 50% by avoiding string copy - operations and removing undocumented fingerprint syntax unused in nmap-os-db - ('&' and '+' in expressions). [Daniel Miller] +o [NSE] New outlib library consolidates functions related to NSE output, + both string formatting conventions and structured output. [Daniel Miller] + +o [NSE] New dicom library implements the DICOM protocol used for + storing and transfering medical images. [Paulino Calderon] o [GH#92] Fix a regression in ARP host discovery left over from the move from massping to ultra_scan in Nmap 4.22SOC8 (2007) that sometimes resulted in missing ARP responses from targets near the end of a scan. Accuracy and speed are both improved. [Daniel Miller] -o [GH#1834] Addressed over 250 code quality issues identified by LGTM.com, - improving our code quality score from "C" to "A+" +o [GH#2126] Fix the "iocp" Nsock engine for Windows to be able to correctly + handle PCAP read events. This engine is now the default for Windows, which + should greatly improve performance over the previous default, the "poll" + engine. [Daniel Miller] -o [GH#1764] Fix an assertion failure when unsolicited ARP response is received: - nmap: Target.cc:503: void Target::stopTimeOutClock(const timeval*): Assertion `htn.toclock_running == true' failed. +o [GH#2050] Reduced CPU usage of OS scan by 50% by avoiding string copy + operations and removing undocumented fingerprint syntax unused in nmap-os-db + ('&' and '+' in expressions). [Daniel Miller] o [GH#1859] Allow multiple UDP payloads to be specified for a port in nmap-payloads. If the first payload does not get a response, the remaining payloads are tried round-robin. [Paul Miseiko, Rapid7] -o [GH#1860] 23 new UDP payloads and dozens more default ports for existing - payloads developed for Rapid7's InsightVM scan engine. These speed up and - ensure detection of open UDP services. [Paul Miseiko, Rapid7] - o [GH#1616] New option --discovery-ignore-rst tells Nmap to ignore TCP RST responses when determining if a target is up. Useful when firewalls are spoofing RST packets. [Tom Sellers, Rapid7] @@ -58,6 +135,12 @@ o [GH#2104] Fixed parsing of TCP options which would hang (infinite loop) if an option had an explicit length of 0. Affects Nmap 7.80 only. [Daniel Miller, Imed Mnif] +o Added a UDP payload for STUN (Session Traversal Utilities for NAT). + [David Fifield] + +o [NSE] Fixed an off-by-one bug in the stun.lua library that prevented + parsing a server response. [David Fifield] + o [NSE][GH#1460] Script ssh2-enum-algos would fail if the server initiated the key exchange before completing the protocol version exchange [Scott Ellis, nnposter] @@ -101,12 +184,6 @@ o [GH#1963] Added service fingerprinting for MySQL 8.x, Microsoft SQL Server 2019, MariaDB, and Crate.io CrateDB. Updated PostreSQL coverage and added specific detection of recent versions running in Docker. [Tom Sellers] -o [NSE] New script uptime-agent-info collects system information from an Idera - Uptime Infrastructure Monitor agent. [Daniel Miller] - -o [NSE] New outlib library will consolidate functions related to NSE output, - both string formatting conventions and structured output. [Daniel Miller] - o New XML output "hosthint" tag emitted during host discovery when a target is found to be up. This gives earlier notification than waiting for the hostgroup to finish all scan phases. [Paul Miseiko] @@ -142,10 +219,10 @@ o Upgrade libssh2 to 1.9.0, fixing compilation with OpenSSL 1.1.0 API. o [GH#1717][GH#1718] Processing of IP address CIDR blocks was not working correctly on ppc64, ppc64le, and s390x architectures. [rfrohl, nnposter] -o [Windows] Add support for the new loopback behavior in Npcap 0.9983. This - enables Nmap to scan localhost on Windows without needing the Npcap Loopback - Adapter to be installed, which was a source of problems for some users. - [Daniel Miller] +o [Windows] Add support for the new loopback behavior in Npcap 0.9983 and + later. This enables Nmap to scan localhost on Windows without needing the + Npcap Loopback Adapter to be installed, which was a source of problems for + some users. [Daniel Miller] o [NSE] MS SQL library has improved version resolution, from service pack level to individual cumulative updates [nnposter] @@ -219,15 +296,6 @@ o [NSE][GH#1476][GH#1707] A MS-SMB spec non-compliance in Samba was causing o [NSE][GH#1480][GH#1713][GH#1714] A bug in SMB library was causing scripts to fail with bad format argument error. [Ivan Ivanov] -o [NSE] New script, dicom-brute.nse, attempts to brute force the called - Application Entity Title of DICOM servers. [Paulino Calderon] - -o [NSE] New script, dicom-ping.nse, discovers DICOM servers and determines - if any Application Entity Title is allowed to connect. [Paulino Calderon] - -o [NSE] New library, dicom.lua, implements the DICOM protocol used for - storing and transfering medical images. [Paulino Calderon] - o [NSE][GH#1665] The HTTP library no longer crashes when code requests digest authentication but the server does not provide the necessary authentication header. [nnposter] @@ -235,12 +303,6 @@ o [NSE][GH#1665] The HTTP library no longer crashes when code requests digest o [NSE] Fixed a bug in http-wordpress-users.nse that could cause extraneous output to be captured as part of a username. [Duarte Silva] -o Added a UDP payload for STUN (Session Traversal Utilities for NAT). - [David Fifield] - -o [NSE] Fixed an off-by-one bug in the stun.lua library that prevented - parsing a server response. [David Fifield] - Nmap 7.80 [2019-08-10] o [Windows] The Npcap Windows packet capturing library (https://npcap.org/) diff --git a/COPYING b/COPYING deleted file mode 100644 index eb3c8404e..000000000 --- a/COPYING +++ /dev/null @@ -1,475 +0,0 @@ - -/*************************************************************************** - * COPYING -- Describes the terms under which Nmap is distributed. * - * * - ***********************IMPORTANT NMAP LICENSE TERMS************************ - * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * - * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * - * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * - * * - * o Integrates source code from Covered Software. * - * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * - * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * - * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * - * * - * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * - * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * - * * - ***************************************************************************/ - -GNU General Public License - ----------------------------------------------------------------------------- - -Table of Contents - - * GNU GENERAL PUBLIC LICENSE - o Preamble - o TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - o How to Apply These Terms to Your New Programs - ----------------------------------------------------------------------------- - -GNU GENERAL PUBLIC LICENSE - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to -share and change it. By contrast, the GNU General Public License is intended -to guarantee your freedom to share and change free software--to make sure -the software is free for all its users. This General Public License applies -to most of the Free Software Foundation's software and to any other program -whose authors commit to using it. (Some other Free Software Foundation -software is covered by the GNU Library General Public License instead.) You -can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you -wish), that you receive source code or can get it if you want it, that you -can change the software or use pieces of it in new free programs; and that -you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to -deny you these rights or to ask you to surrender the rights. These -restrictions translate to certain responsibilities for you if you distribute -copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or -for a fee, you must give the recipients all the rights that you have. You -must make sure that they, too, receive or can get the source code. And you -must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If -the software is modified by someone else and passed on, we want its -recipients to know that what they have is not the original, so that any -problems introduced by others will not reflect on the original authors' -reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program -proprietary. To prevent this, we have made it clear that any patent must be -licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms -of this General Public License. The "Program", below, refers to any such -program or work, and a "work based on the Program" means either the Program -or any derivative work under copyright law: that is to say, a work -containing the Program or a portion of it, either verbatim or with -modifications and/or translated into another language. (Hereinafter, -translation is included without limitation in the term "modification".) Each -licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered -by this License; they are outside its scope. The act of running the Program -is not restricted, and the output from the Program is covered only if its -contents constitute a work based on the Program (independent of having been -made by running the Program). Whether that is true depends on what the -Program does. - -1. You may copy and distribute verbatim copies of the Program's source code -as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this -License and to the absence of any warranty; and give any other recipients of -the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you -may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, -thus forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you -also meet all of these conditions: - - * a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - * b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - * c) If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive use - in the most ordinary way, to print or display an announcement including - an appropriate copyright notice and a notice that there is no warranty - (or else, saying that you provide a warranty) and that users may - redistribute the program under these conditions, and telling the user - how to view a copy of this License. (Exception: if the Program itself - is interactive but does not normally print such an announcement, your - work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be -reasonably considered independent and separate works in themselves, then -this License, and its terms, do not apply to those sections when you -distribute them as separate works. But when you distribute the same sections -as part of a whole which is a work based on the Program, the distribution of -the whole must be on the terms of this License, whose permissions for other -licensees extend to the entire whole, and thus to each and every part -regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise -the right to control the distribution of derivative or collective works -based on the Program. - -In addition, mere aggregation of another work not based on the Program with -the Program (or with a work based on the Program) on a volume of a storage -or distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 -and 2 above provided that you also do one of the following: - - * a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 - above on a medium customarily used for software interchange; or, - - * b) Accompany it with a written offer, valid for at least three years, - to give any third party, for a charge no more than your cost of - physically performing source distribution, a complete machine-readable - copy of the corresponding source code, to be distributed under the - terms of Sections 1 and 2 above on a medium customarily used for - software interchange; or, - - * c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and -installation of the executable. However, as a special exception, the source -code distributed need not include anything that is normally distributed (in -either source or binary form) with the major components (compiler, kernel, -and so on) of the operating system on which the executable runs, unless that -component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to -copy from a designated place, then offering equivalent access to copy the -source code from the same place counts as distribution of the source code, -even though third parties are not compelled to copy the source along with -the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, -modify, sublicense or distribute the Program is void, and will automatically -terminate your rights under this License. However, parties who have received -copies, or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed -it. However, nothing else grants you permission to modify or distribute the -Program or its derivative works. These actions are prohibited by law if you -do not accept this License. Therefore, by modifying or distributing the -Program (or any work based on the Program), you indicate your acceptance of -this License to do so, and all its terms and conditions for copying, -distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these terms -and conditions. You may not impose any further restrictions on the -recipients' exercise of the rights granted herein. You are not responsible -for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot distribute so -as to satisfy simultaneously your obligations under this License and any -other pertinent obligations, then as a consequence you may not distribute -the Program at all. For example, if a patent license would not permit -royalty-free redistribution of the Program by all those who receive copies -directly or indirectly through you, then the only way you could satisfy both -it and this License would be to refrain entirely from distribution of the -Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents -or other property right claims or to contest validity of any such claims; -this section has the sole purpose of protecting the integrity of the free -software distribution system, which is implemented by public license -practices. Many people have made generous contributions to the wide range of -software distributed through that system in reliance on consistent -application of that system; it is up to the author/donor to decide if he or -she is willing to distribute software through any other system and a -licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an -explicit geographical distribution limitation excluding those countries, so -that distribution is permitted only in or among countries not thus excluded. -In such case, this License incorporates the limitation as if written in the -body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of -the General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make -exceptions for this. Our decision will be guided by the two goals of -preserving the free status of all derivatives of our free software and of -promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO -THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM -PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO -LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR -THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively convey the -exclusion of warranty; and each file should have at least the "copyright" -line and a pointer to where the full notice is found. - -one line to give the program's name and an idea of what it does. -Copyright (C) 19yy name of author - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when -it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) 19yy name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details -type `show w'. This is free software, and you are welcome -to redistribute it under certain conditions; type `show c' -for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright -interest in the program `Gnomovision' -(which makes passes at compilers) written -by James Hacker. - -signature of Ty Coon, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. diff --git a/FPEngine.cc b/FPEngine.cc index 2b0e29d5c..4b6d09ed4 100644 --- a/FPEngine.cc +++ b/FPEngine.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/FPEngine.h b/FPEngine.h index 18cb691a8..4b936b814 100644 --- a/FPEngine.h +++ b/FPEngine.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/FPModel.cc b/FPModel.cc index 7ff323c6c..7663e023a 100644 --- a/FPModel.cc +++ b/FPModel.cc @@ -3725,7 +3725,7 @@ std::vector load_fp_matches() { FingerMatch match; match.line = 83; match.numprints = 5; - match.OS_name = (char *) "Windows 10"; + match.OS_name = (char *) "Microsoft Windows 10"; { OS_Classification osclass = {"Microsoft", "Windows", "10", "general purpose"}; osclass.cpe.push_back("cpe:/o:microsoft:windows_10"); @@ -3749,7 +3749,7 @@ std::vector load_fp_matches() { FingerMatch match; match.line = 85; match.numprints = 6; - match.OS_name = (char *) "Windows 10"; + match.OS_name = (char *) "Microsoft Windows 10"; { OS_Classification osclass = {"Microsoft", "Windows", "10", "general purpose"}; osclass.cpe.push_back("cpe:/o:microsoft:windows_10"); diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc index ad2dbd497..cbbf9a239 100644 --- a/FingerPrintResults.cc +++ b/FingerPrintResults.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/FingerPrintResults.h b/FingerPrintResults.h index 23215bf13..6f142b462 100644 --- a/FingerPrintResults.h +++ b/FingerPrintResults.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7035e20df --- /dev/null +++ b/LICENSE @@ -0,0 +1,564 @@ +Nmap Public Source License Version 0.92 +For more information on this license, see https://nmap.org/npsl/ + +0. Preamble + +The intent of this license is to establish freedom to share and change +the software regulated by this license under the open source model. It +also includes a Contributor Agreement and disclaims any warranty on +Covered Software. Proprietary software companies wishing to use or +incorporate Covered Software within their programs must contact +Licensor to purchase a separate license. Open source developers who +wish to incorporate parts of Covered Software into free software with +conflicting licenses may write Licensor to request a waiver of terms. + +If the Nmap Project (directly or through one of it's commercial +licensing customers) has granted you additional rights to Nmap or Nmap +OEM, those additional rights take precedence where they conflict with +the terms of this license agreement. + +This License represents the complete agreement concerning subject +matter hereof. It contains the license terms themselves, but not the +reasoning behind them or detailed explanations. For further +information about this License, see https://nmap.org/npsl/ . That page +makes a good faith attempt to explain this License, but it does not +and can not modify its governing terms in any way. + +1. Definitions + +* "Contribution" means any work of authorship, including the original + version of the Work and any modifications or additions to that Work + or Derivative Works thereof, that is intentionally submitted to + Licensor by the copyright owner or by an individual or Legal Entity + authorized to submit on behalf of the copyright owner. For the + purposes of this definition, "submitted" means any form of + electronic, verbal, or written communication sent to the Licensor or + its representatives, including but not limited to communication on + electronic mailing lists, source code control systems, web sites, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a + Contribution." + +* "Contributor" means Licensor and any individual or Legal Entity on + behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +* "Covered Software" means the work of authorship, whether in Source + or Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + +* "Derivative Work" or "Collective Work" means any work, whether in + Source or Object form, that is based on (or derived from) the Work + and for which the editorial revisions, annotations, elaborations, or + other modifications represent, as a whole, an original work of + authorship. It includes software as described in Section 3 of this + License. + +* "Executable" means Covered Software in any form other than Source Code. + +* "Externally Deploy" means to Deploy the Covered Software in any way + that may be accessed or used by anyone other than You, used to + provide any services to anyone other than You, or used in any way to + deliver any content to anyone other than You, whether the Covered + Software is distributed to those parties, made available as an + application intended for use over a computer network, or used to + provide services or otherwise deliver content to anyone other than + You. + +* "GPL" means the GNU General Public License Version 2, as published + by the Free Software Foundation and provided in Exhibit A. + +* "Legal Entity" means the union of the acting entity and all other + entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + +* "License" means this document, including Exhibits. + +* "Licensor" means Insecure.Com LLC and its successors and assigns. + +* "Main License Body" means all of the terms of this document, + excluding Exhibits. + +* "You" (or "Your") means an individual or Legal Entity exercising + permissions granted by this License. + +2. General Terms + +Covered Software is licensed to you under the terms of the GPL +(Exhibit A), with all the exceptions, clarifications, and additions +noted in this Main License Body. Where the terms in this Main License +Body conflict in any way with the GPL, the Main License Body terms +shall take precedence. These additional terms mean that You may not +distribute Covered Software or Derivative Works under plain GPL terms +without special permission from Licensor. + +You are not required to accept this License. However, nothing else +grants You permission to use, copy, modify or distribute the software +or its derivative works. These actions are prohibited by law if You do +not accept this License. Therefore, by modifying, copying or +distributing the software (or any work based on the software), You +indicate your acceptance of this License to do so, and all its terms +and conditions. In addition, you agree to the terms of this License by +clicking the Accept button or downloading the software. + +3. Derivative Works + +This License (including the GPL portion) places important restrictions +on derived works. Licensor interprets that term quite broadly. To +avoid any misunderstandings, we consider software to constitute a +"derivative work" of Covered Software for the purposes of this license +if it does any of the following: + +* Integrates source code from Covered Software + +* Reads or includes Covered Software data files, such as nmap-os-db or + nmap-service-probes. + +* Is designed specifically to execute Covered Software and parse the + results (as opposed to typical shell or execution-menu apps, which + will execute anything you tell them to). + +* Includes Covered Software in a proprietary executable installer. The + installers produced by InstallShield are an example of + this. Including Nmap with other software in compressed or archival + form does not trigger this provision, provided appropriate open + source decompression or de-archiving software is widely available + for no charge. For the purposes of this license, an installer is + considered to include Covered Software even if it actually retrieves + a copy of Covered Software from another source during runtime (such + as by downloading it from the Internet). + +* Links (statically or dynamically) to a library which does any of the + above + +* Executes a helper program, module, or script to do any of the above. + This list is not exclusive, but is meant to clarify Licensor's + intentions with some common examples. Distribution of any works + which meet these criteria must be under the terms of this license + (including this Main License Body and GPL), with no additional + conditions or restrictions. They must abide by all restrictions that + the GPL places on derivative or collective works, including the + requirements for distributing their source code and allowing + royalty-free redistribution. + +4. Contributor Agreement (Grant of Copyright and Patent Licenses) + +Each Contributor hereby grants to Licensor a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable copyright license +to reproduce, prepare Derivative Works of, publicly display, publicly +perform, sublicense, and distribute the Contribution and such +Derivative Works in Source or Object form. + +Each Contributor hereby grants to You and Licensor a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except +as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work to +which such Contribution(s) was submitted. If You institute patent +litigation against any entity (including a cross-claim or counterclaim +in a lawsuit) alleging that the Work or a Contribution incorporated +within the Work constitutes direct or contributory patent +infringement, then any patent licenses granted to You under this +License for that Work shall terminate as of the date such litigation +is filed. + +Contributors may impose different terms on their Contributions by +stating those terms in writing at the time the Contribution is +made. Contributors may withhold all authority from Licensor to +incorporate submissions by conspicuously marking or otherwise +designating them in writing as "Not a Contribution" at the time they +make the work available. + +5. Disclaimer of Warranty and Limitation of Liability + +Unless required by applicable law or agreed to in writing, Licensor +provides the Covered Software (and each Contributor provides its +Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, either express or implied, including, without limitation, +any warranties or conditions of TITLE, NON-INFRINGEMENT, +MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely +responsible for determining the appropriateness of using or +redistributing the Covered Software and assume any risks associated +with Your exercise of permissions under this License. + +In no event and under no legal theory, whether in tort (including +negligence), contract, or otherwise, unless required by applicable law +(such as deliberate and grossly negligent acts) or agreed to in +writing, shall any Contributor be liable to You for damages, including +any direct, indirect, special, incidental, or consequential damages of +any character arising as a result of this License or out of the use or +inability to use the Covered Software (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses), even +if such Contributor has been advised of the possibility of such +damages. + +6. External Deployment + +If You Externally Deploy Covered Software, such as hosting a website +designed to execute Nmap scans for users, the system and its +documentation must, if technically feasible, prominently display a +notice stating that the system uses the Nmap Security Scanner to +perform its tasks. If technically feasible, the notice must contain a +hyperlink to https://nmap.org/ or provide that URL in the text. + +7. Trademarks + +This License does not grant permission to use the trade names, +trademarks, service marks, or product names of the Licensor, except as +required for reasonable and customary use in describing the origin of +the Covered Software. + +8. Termination for Patent Action + +This License shall terminate automatically and You may no longer +exercise any of the rights granted to You by this License as of the +date You commence an action, including a cross-claim or counterclaim, +against Licensor or any licensee alleging that the Covered Software +infringes a patent. This termination provision shall not apply for an +action alleging patent infringement by combinations of the Covered +Software with other software or hardware. + +9. Jurisdiction, Venue and Governing Law + +This License is governed by the laws of the State of Washington and +the intellectual property laws of the United States of America, +excluding the jurisdiction's conflict-of-law provisions. Any +litigation or other dispute resolution between You and Licensor +relating to this License shall take place in the Northern District of +California, and You and Licensor hereby consent to the personal +jurisdiction of, and venue in, the state and federal courts within +that District with respect to this License. The application of the +United Nations Convention on Contracts for the International Sale of +Goods is expressly excluded. + +10. Npcap and the Official Nmap Windows Builds + +The official Windows Nmap builds includes the Npcap driver and library +(https://npcap.org) for packet capture and transmission on +Windows. That software is under its own separate license terms rather +than this license. Therefore anyone wishing to use or redistribute +both pieces of software must comply with both licenses. Since Npcap +does not allow for redistribution without special permission, the +official Nmap Windows builds which include Npcap may not be +redistributed without special permission. Such permission can be +requested by email to sales@nmap.com. + +11. Permission to link with OpenSSL + +Licensor grants permission to link Covered Software with any version +of the OpenSSL library from OpenSSL.Org, and distribute linked +combinations including the two (assuming such distribution is +otherwise allowed by this agreement). You must obey this License in +all respects for all code used other than OpenSSL. + +12. Waiver; Construction + +Failure by Licensor or any Contributor to enforce any provision of +this License will not be deemed a waiver of future enforcement of that +or any other provision. Any law or regulation which provides that the +language of a contract shall be construed against the drafter will not +apply to this License. + +13. Enforceability + +If any provision of this License is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this License, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable. + +Exhibit A. The GNU General Public License Version 2 +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +Preamble + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, +we want its recipients to know that what they have is not the +original, so that any problems introduced by others will not reflect +on the original authors' reputations. + +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at +all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether that +is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the +Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee. + +2. You may modify your copy or copies of the Program or any portion of +it, thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, +provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices +stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in +whole or in part contains or is derived from the Program or any part +thereof, to be licensed as a whole at no charge to all third parties +under the terms of this License. + +c) If the modified program normally reads commands interactively when +run, you must cause it, when started running for such interactive use +in the most ordinary way, to print or display an announcement +including an appropriate copyright notice and a notice that there is +no warranty (or else, saying that you provide a warranty) and that +users may redistribute the program under these conditions, and telling +the user how to view a copy of this License. (Exception: if the +Program itself is interactive but does not normally print such an +announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable +source code, which must be distributed under the terms of Sections 1 +and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, +to give any third party, for a charge no more than your cost of +physically performing source distribution, a complete machine-readable +copy of the corresponding source code, to be distributed under the +terms of Sections 1 and 2 above on a medium customarily used for +software interchange; or, + +c) Accompany it with the information you received as to the offer to +distribute corresponding source code. (This alternative is allowed +only for noncommercial distribution and only if you received the +program in object code or executable form with such an offer, in +accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and +will automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted +herein. You are not responsible for enforcing compliance by third +parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new +versions of the General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Program does not specify a +version number of this License, you may choose any version ever +published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the +author to ask for permission. For software which is copyrighted by the +Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the +two goals of preserving the free status of all derivatives of our free +software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE +LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF +ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +END OF TERMS AND CONDITIONS + +[For brevity, we've cut out the GPL's final section on "How to Apply +Tehse Terms to Your New Program", but you can find that at +https://www.gnu.org/licenses/gpl-2.0.html#SEC4 ] + diff --git a/MACLookup.cc b/MACLookup.cc index 1cb313bfb..de825607f 100644 --- a/MACLookup.cc +++ b/MACLookup.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/MACLookup.h b/MACLookup.h index 429338637..9d95c2f60 100644 --- a/MACLookup.h +++ b/MACLookup.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/NewTargets.cc b/NewTargets.cc index 4248db512..f9d5a0627 100644 --- a/NewTargets.cc +++ b/NewTargets.cc @@ -3,126 +3,58 @@ * targets to the scan queue. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/NewTargets.h b/NewTargets.h index b2004262e..6cd679924 100644 --- a/NewTargets.h +++ b/NewTargets.h @@ -3,126 +3,58 @@ * targets to the scan queue. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/NmapOps.cc b/NmapOps.cc index 284f87a30..25eeaba58 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/NmapOps.h b/NmapOps.h index 4d0977554..e3b9f2ba8 100644 --- a/NmapOps.h +++ b/NmapOps.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/NmapOutputTable.cc b/NmapOutputTable.cc index 028d1510a..9479f5f9f 100644 --- a/NmapOutputTable.cc +++ b/NmapOutputTable.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/NmapOutputTable.h b/NmapOutputTable.h index a3c693ee4..b5599e416 100644 --- a/NmapOutputTable.h +++ b/NmapOutputTable.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/Target.cc b/Target.cc index 3e0354373..d8210fd4e 100644 --- a/Target.cc +++ b/Target.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/Target.h b/Target.h index a4e3e656b..8ab2b893a 100644 --- a/Target.h +++ b/Target.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/TargetGroup.cc b/TargetGroup.cc index d074f3de1..d4712348e 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/TargetGroup.h b/TargetGroup.h index ccdad9c9b..0fdf31207 100644 --- a/TargetGroup.h +++ b/TargetGroup.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/charpool.cc b/charpool.cc index 8106cf0ee..26f91c6ce 100644 --- a/charpool.cc +++ b/charpool.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/charpool.h b/charpool.h index 3e0555130..f16274c27 100644 --- a/charpool.h +++ b/charpool.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/docs/3rd-party-licenses.txt b/docs/3rd-party-licenses.txt index f3b6860db..1521c2fb4 100644 --- a/docs/3rd-party-licenses.txt +++ b/docs/3rd-party-licenses.txt @@ -3,7 +3,7 @@ $Id$ This file is a list of the licenses of the third-party software used by Nmap and the other tools distributed with it. What follows is a description of each third-party package. At the end of this file is the -license of each. The license of Nmap itself is in the COPYING file. +license of each. The license of Nmap itself is in the LICENSE file. On all platforms, Nmap is normally linked with: o libpcap: Network packet capture library. Distributed with Nmap in the diff --git a/docs/3rd-party.xml b/docs/3rd-party.xml index efed5666d..4c884e979 100644 --- a/docs/3rd-party.xml +++ b/docs/3rd-party.xml @@ -27,7 +27,7 @@ - + diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml index 90f311cf8..a35d34dfc 100644 --- a/docs/legal-notices.xml +++ b/docs/legal-notices.xml @@ -6,123 +6,49 @@ GNU General Public License -The Nmap Security Scanner is (C) 1996–2018 Insecure.Com +The Nmap Security Scanner is (C) 1996–2020 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 -misunderstandings, we interpret that term as broadly as copyright law -allows. For example, we consider an application to constitute a -derivative work for the purpose of this license if it does any of the -following with any software or content covered by this license -(Covered Software): - - -Integrates source code from Covered Software. - -Reads or includes copyrighted data files, such as -Nmap's nmap-os-db or -nmap-service-probes. - -Is designed specifically to execute Covered Software and parse the results (as opposed to typical shell or execution-menu apps, which will execute anything you tell them to). - -Includes Covered Software in a proprietary executable -installer. The installers produced by InstallShield are an example of -this. Including Nmap with other software in compressed or archival -form does not trigger this provision, provided appropriate open source -decompression or de-archiving software is widely available for no -charge. For the purposes of this license, an installer is considered -to include Covered Software even if it actually retrieves a copy of -Covered Software from another source during runtime (such as by -downloading it from the Internet). - -Links (statically or dynamically) to a library which does any of the above. -Executes a helper program, module, or script to do any of the above. - - - -This list is not exclusive, but is meant to clarify our interpretation -of derived works with some common examples. Other people may -interpret the plain GPL differently, so we consider this a special -exception to the GPL that we apply to Covered Software. Works which -meet any of these conditions must conform to all of the terms of this -license, particularly including the GPL Section 3 requirements of -providing source code and allowing free redistribution of the work as -a whole. - - - -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 - +Nmap Project. It is published under the Nmap Public Source License. This +generally allows end users to download and use Nmap for free. It +doesn't not allow Nmap to be used and redistributed within commercial +software or hardware products (including appliances, virtual machines, +and traditional applications). We fund the project by selling a +special Nmap OEM Edition for this purpose, as described at . Hundreds of large and small software +vendors have already purchased OEM licenses to embed Nmap technology +such as host discovery, port scanning, OS detection, version +detection, and the Nmap Scripting Engine within their products. 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 +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 -obeying all GPL rules and restrictions. For example, source code of -the whole work must be provided and free redistribution must be -allowed. All GPL references to "this License", are to be treated as -including the terms and conditions of this license text as well. - -Because this license imposes special exceptions to the GPL, Covered -Work may not be combined (even as part of a larger work) with plain -GPL software. The terms, conditions, and exceptions of this license -must be included as well. This license is incompatible with some -other open source licenses as well. In some cases we can relicense -portions of Nmap or grant special permissions to use it in other open -source software. Please contact fyodor@nmap.org with any such -requests. Similarly, we don't incorporate incompatible open source -software into Covered Software without special permission from the +Even though the NPSL is based on GPLv2, it contains different +provisions and is not directly compatible. It is incompatible with +some other open source licenses as well. In some cases we can +relicense portions of Nmap or grant special permissions to use it in +other open source software. Please contact fyodor@nmap.org with any +such requests. Similarly, we don't incorporate incompatible open +source software into Nmap without special permission from the copyright holders. - -If you have any questions about the licensing restrictions on using -Nmap in other works, we are happy to help. As mentioned above, we -also offer an alternative license to integrate Nmap into proprietary -applications and appliances. These contracts have been sold to dozens -of software vendors, and generally include a perpetual license as well -as providing support and updates. They also fund the continued -development of Nmap. Please email sales@nmap.com for further -information. - +If you have received a written license agreement or contract for +Nmap stating terms other than these, you may choose to use and +redistribute Nmap under those terms instead. -If you have received a written license agreement or -contract for Covered Software stating terms other than these, you may -choose to use and redistribute Covered Software under those terms -instead of these. Creative Commons License for this Nmap Guide - This Nmap Reference Guide is (C) 2005–2018 Insecure.Com LLC. It is + This Nmap Reference Guide is (C) 2005–2020 Insecure.Com LLC. It is hereby placed under version 3.0 of the Creative Commons Attribution License. This allows you redistribute and modify @@ -139,18 +65,17 @@ 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 +bugs, and add new features. You are highly encouraged to submit your +changes as Github Pull Requests (PR) or send them to +dev@nmap.org for possible incorporation into the main +distribution. By submitting such changes, 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. +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). We also sell commercial +licenses to Nmap OEM. If you +wish to specify special license conditions of your contributions, just +say so when you send them. @@ -158,10 +83,7 @@ your contributions, just say so when you send them. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License v2.0 for more details at , or in the COPYING file -included with Nmap. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. It should also be noted that Nmap has occasionally been known to crash poorly written applications, TCP/IP stacks, and even operating @@ -186,34 +108,40 @@ before doing even a light scan of a network. That would open up a major security vulnerability as other users on the system (or attackers) could use it for privilege escalation. + +Nmap is not designed, manufactured, or intended for use in +hazardous environments requiring fail- safe performance where the +failure of the software could lead directly to death, personal injury, +or significant physical or environmental damage. + Third-Party Software and Funding Notices This product includes software developed by -the Apache Software +the Apache Software Foundation. A modified version of the Libpcap portable packet capture +url="https://www.tcpdump.org">Libpcap portable packet capture librarylibpcap is distributed along with Nmap. The Windows version of Nmap utilizes the Libpcap-derived Ncap libraryNpcap instead. Regular expression support is provided by the -PCRE library,Perl Compatible Regular Expressions (PCRE) +PCRE library,Perl Compatible Regular Expressions (PCRE) which is open-source software, written by Philip Hazel.Hazel, Philip Certain raw networking functions use the Libdnetlibdnet networking library, which was written by Dug Song.Song, Dug A modified version is distributed with Nmap. Nmap can optionally link with the -OpenSSL +OpenSSL cryptography toolkitOpenSSL for SSL version detection support. The Nmap Scripting Engine uses an embedded version of -the Lua programming +the Lua programming language.Lua programming -language The Liblinear +language The Liblinear linear classification library is used for our Export +url="https://www.bis.doc.gov/index.php/regulations/export-administration-regulations-ear">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 @@ -260,7 +188,7 @@ U.S. ECCN (Information Security Software). We distribute Nmap under the TSU exception for publicly available encryption software defined -in EAR +in EAR 740.13(e). diff --git a/docs/nmap.1 b/docs/nmap.1 index dc4ece880..9468d36ea 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,12 +2,12 @@ .\" Title: nmap .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/12/2019 +.\" Date: 10/01/2020 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "08/12/2019" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "10/01/2020" "Nmap" "Nmap Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -119,7 +119,7 @@ This options summary is printed when Nmap is run with no arguments, and the late .RS 4 .\} .nf -Nmap 7\&.80 ( https://nmap\&.org ) +Nmap 7\&.90 ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. @@ -340,7 +340,7 @@ One of the very first steps in any network reconnaissance mission is to reduce a .PP Because host discovery needs are so diverse, Nmap offers a wide variety of options for customizing the techniques used\&. Host discovery is sometimes called ping scan, but it goes well beyond the simple ICMP echo request packets associated with the ubiquitous ping -tool\&. Users can skip the ping step entirely with a list scan (\fB\-sL\fR) or by disabling ping (\fB\-Pn\fR), or engage the network with arbitrary combinations of multi\-port TCP SYN/ACK, UDP, SCTP INIT and ICMP probes\&. The goal of these probes is to solicit responses which demonstrate that an IP address is actually active (is being used by a host or network device)\&. On many networks, only a small percentage of IP addresses are active at any given time\&. This is particularly common with private address space such as 10\&.0\&.0\&.0/8\&. That network has 16 million IPs, but I have seen it used by companies with less than a thousand machines\&. Host discovery can find those machines in a sparsely allocated sea of IP addresses\&. +tool\&. Users can skip the discovery step entirely with a list scan (\fB\-sL\fR) or by disabling host discovery (\fB\-Pn\fR), or engage the network with arbitrary combinations of multi\-port TCP SYN/ACK, UDP, SCTP INIT and ICMP probes\&. The goal of these probes is to solicit responses which demonstrate that an IP address is actually active (is being used by a host or network device)\&. On many networks, only a small percentage of IP addresses are active at any given time\&. This is particularly common with private address space such as 10\&.0\&.0\&.0/8\&. That network has 16 million IPs, but I have seen it used by companies with less than a thousand machines\&. Host discovery can find those machines in a sparsely allocated sea of IP addresses\&. .PP If no host discovery options are given, Nmap sends an ICMP echo request, a TCP SYN packet to port 443, a TCP ACK packet to port 80, and an ICMP timestamp request\&. (For IPv6, the ICMP timestamp request is omitted because it is not part of ICMPv6\&.) These defaults are equivalent to the \fB\-PE \-PS443 \-PA80 \-PP\fR @@ -353,7 +353,8 @@ This host discovery is often sufficient when scanning local networks, but a more .PP The \fB\-P*\fR -options (which select ping types) can be combined\&. You can increase your odds of penetrating strict firewalls by sending many probe types using different TCP ports/flags and ICMP codes\&. Also note that ARP/Neighbor Discovery is done by default against targets on a local Ethernet network even if you specify other +options (which select ping types) can be combined\&. You can increase your odds of penetrating strict firewalls by sending many probe types using different TCP ports/flags and ICMP codes\&. Also note that ARP/Neighbor Discovery +is done by default against targets on a local Ethernet network even if you specify other \fB\-P*\fR options, because it is almost always faster and more effective\&. .PP @@ -361,7 +362,7 @@ By default, Nmap does host discovery and then performs a port scan against each \fB\-sn\fR option to learn how to perform only host discovery, or use \fB\-Pn\fR -to skip host discovery and port scan all target hosts\&. The following options control host discovery: +to skip host discovery and port scan all target addresses\&. The following options control host discovery: .PP \fB\-sL\fR (List Scan) .RS 4 @@ -371,9 +372,9 @@ is the name of one company\*(Aqs Chicago firewall\&. Nmap also reports the total number of IP addresses at the end\&. The list scan is a good sanity check to ensure that you have proper IP addresses for your targets\&. If the hosts sport domain names you do not recognize, it is worth investigating further to prevent scanning the wrong company\*(Aqs network\&. .sp -Since the idea is to simply print a list of target hosts, options for higher level functionality such as port scanning, OS detection, or ping scanning cannot be combined with this\&. If you wish to disable ping scanning while still performing such higher level functionality, read up on the +Since the idea is to simply print a list of target hosts, options for higher level functionality such as port scanning, OS detection, or host discovery cannot be combined with this\&. If you wish to disable host discovery while still performing such higher level functionality, read up on the \fB\-Pn\fR -(skip ping) option\&. +(skip host discovery) option\&. .RE .PP \fB\-sn\fR (No port scan) @@ -393,8 +394,7 @@ was specified\&. The \fB\-sn\fR option can be combined with any of the discovery probe types (the \fB\-P*\fR -options, excluding -\fB\-Pn\fR) for greater flexibility\&. If any of those probe type and port number options are used, the default probes are overridden\&. When strict firewalls are in place between the source host running Nmap and the target network, using those advanced techniques is recommended\&. Otherwise hosts could be missed when the firewall drops probes or their responses\&. +options) for greater flexibility\&. If any of those probe type and port number options are used, the default probes are overridden\&. When strict firewalls are in place between the source host running Nmap and the target network, using those advanced techniques is recommended\&. Otherwise hosts could be missed when the firewall drops probes or their responses\&. .sp In previous releases of Nmap, \fB\-sn\fR @@ -404,11 +404,11 @@ was known as .PP \fB\-Pn\fR (No ping) .RS 4 -This option skips the Nmap discovery stage altogether\&. Normally, Nmap uses this stage to determine active machines for heavier scanning\&. By default, Nmap only performs heavy probing such as port scans, version detection, or OS detection against hosts that are found to be up\&. Disabling host discovery with +This option skips the host discovery stage altogether\&. Normally, Nmap uses this stage to determine active machines for heavier scanning and to gauge the speed of the network\&. By default, Nmap only performs heavy probing such as port scans, version detection, or OS detection against hosts that are found to be up\&. Disabling host discovery with \fB\-Pn\fR causes Nmap to attempt the requested scanning functions against \fIevery\fR -target IP address specified\&. So if a class B target address space (/16) is specified on the command line, all 65,536 IP addresses are scanned\&. Proper host discovery is skipped as with the list scan, but instead of stopping and printing the target list, Nmap continues to perform requested functions as if each target IP is active\&. To skip ping scan +target IP address specified\&. So if a /16 sized network is specified on the command line, all 65,536 IP addresses are scanned\&. Proper host discovery is skipped as with the list scan, but instead of stopping and printing the target list, Nmap continues to perform requested functions as if each target IP is active\&. Default timing parameters are used, which may result in slower scans\&. To skip host discovery \fIand\fR port scan, while still allowing NSE to run, use the two options \fB\-Pn \-sn\fR @@ -588,6 +588,13 @@ option\&. The default behavior is normally faster, but this option is useful on networks using proxy ARP, in which a router speculatively replies to all ARP requests, making every target appear to be up according to ARP scan\&. .RE .PP +\fB\-\-discovery\-ignore\-rst\fR +.RS 4 +In some cases, firewalls may spoof TCP reset (RST) replies in response to probes to unoccupied or disallowed addresses\&. Since Nmap ordinarily considers RST replies to be proof that the target is up, this can lead to wasted time scanning targets that aren\*(Aqt there\&. Using the +\fB\-\-discovery\-ignore\-rst\fR +will prevent Nmap from considering these replies during host discovery\&. You may need to select extra host discovery options to ensure you don\*(Aqt miss targets in this case\&. +.RE +.PP \fB\-\-traceroute\fR (Trace path to host) .RS 4 Traceroutes are performed post\-scan using information from the scan results to determine the port and protocol most likely to reach the target\&. It works with all scan types except connect scans (\fB\-sT\fR) and idle scans (\fB\-sI\fR)\&. All traces use Nmap\*(Aqs dynamic timing model and are performed in parallel\&. @@ -1092,7 +1099,7 @@ is automatically used to determine the RPC program and version numbers\&. It tak \fBrpcinfo \-p\fR even if the target\*(Aqs portmapper is behind a firewall (or protected by TCP wrappers)\&. Decoys do not currently work with RPC scan\&. .PP -When Nmap receives responses from a service but cannot match them to its database, it prints out a special fingerprint and a URL for you to submit if to if you know for sure what is running on the port\&. Please take a couple minutes to make the submission so that your find can benefit everyone\&. Thanks to these submissions, Nmap has about 6,500 pattern matches for more than 650 protocols such as SMTP, FTP, HTTP, etc\&. +When Nmap receives responses from a service but cannot match them to its database, it prints out a special fingerprint and a URL for you to submit it to if you know for sure what is running on the port\&. Please take a couple minutes to make the submission so that your find can benefit everyone\&. Thanks to these submissions, Nmap has about 6,500 pattern matches for more than 650 protocols such as SMTP, FTP, HTTP, etc\&. .PP Version detection is enabled and controlled with the following options: .PP @@ -1235,7 +1242,7 @@ Performs a script scan using the default set of scripts\&. It is equivalent to \fB\-\-script=default\fR\&. Some of the scripts in this category are considered intrusive and should not be run against a target network without permission\&. .RE .PP -\fB\-\-script \fR\fB\fIfilename\fR\fR\fB|\fR\fB\fIcategory\fR\fR\fB|\fR\fB\fIdirectory\fR\fR\fB|\fR\fB\fIexpression\fR\fR\fB[,\&.\&.\&.]\fR +\fB\-\-script \fR\fB\fIfilename\fR\fR\fB|\fR\fB\fIcategory\fR\fR\fB|\fR\fB\fIdirectory\fR\fR\fB/|\fR\fB\fIexpression\fR\fR\fB[,\&.\&.\&.]\fR .RS 4 Runs a script scan using the comma\-separated list of filenames, script categories, and directories\&. Each element in the list may also be a Boolean expression describing a more complex set of scripts\&. Each element is interpreted first as an expression, then as a category, and finally as a file or directory name\&. .sp @@ -1258,7 +1265,7 @@ of each of the following places until found: ~/\&.nmap (not searched on Windows) .RE .RS 4 -\fIHOME\fR\eAppData\eRoaming\enmap (only on Windows) +\fIAPPDATA\fR\enmap (only on Windows) .RE .RS 4 the directory containing the nmap @@ -1266,16 +1273,18 @@ executable .RE .RS 4 the directory containing the nmap -executable, followed by \&.\&./share/nmap +executable, followed by \&.\&./share/nmap (not searched on Windows) .RE .RS 4 -\fINMAPDATADIR\fR +\fINMAPDATADIR\fR (not searched on Windows) .RE .RS 4 the current directory\&. .RE .sp -When a directory name is given, Nmap loads every file in the directory whose name ends with +When a directory name ending in +/ +is given, Nmap loads every file in the directory whose name ends with \&.nse\&. All other files are ignored and directories are not searched recursively\&. When a filename is given, it does not have to have the \&.nse extension; it will be added automatically if necessary\&. @@ -1431,7 +1440,7 @@ and Nmap will try to keep group sizes above that level\&. Nmap may have to use s .sp These options do not have an effect during the host discovery phase of a scan\&. This includes plain ping scans (\fB\-sn\fR)\&. Host discovery always works in large groups of hosts to improve speed and accuracy\&. .sp -The primary use of these options is to specify a large minimum group size so that the full scan runs more quickly\&. A common choice is 256 to scan a network in Class C sized chunks\&. For a scan with many ports, exceeding that number is unlikely to help much\&. For scans of just a few port numbers, host group sizes of 2048 or more may be helpful\&. +The primary use of these options is to specify a large minimum group size so that the full scan runs more quickly\&. A common choice is 256 to scan a network in /24 sized chunks\&. For a scan with many ports, exceeding that number is unlikely to help much\&. For scans of just a few port numbers, host group sizes of 2048 or more may be helpful\&. .RE .PP \fB\-\-min\-parallelism \fR\fB\fInumprobes\fR\fR; \fB\-\-max\-parallelism \fR\fB\fInumprobes\fR\fR (Adjust probe parallelization) @@ -1688,7 +1697,7 @@ There is no magic bullet (or Nmap option) for detecting and subverting firewalls .RS 4 The \fB\-f\fR -option causes the requested scan (including ping scans) to use tiny fragmented IP packets\&. The idea is to split up the TCP header over several packets to make it harder for packet filters, intrusion detection systems, and other annoyances to detect what you are doing\&. Be careful with this! Some programs have trouble handling these tiny packets\&. The old\-school sniffer named Sniffit segmentation faulted immediately upon receiving the first fragment\&. Specify this option once, and Nmap splits the packets into eight bytes or less after the IP header\&. So a 20\-byte TCP header would be split into three packets\&. Two with eight bytes of the TCP header, and one with the final four\&. Of course each fragment also has an IP header\&. Specify +option causes the requested scan (including host discovery scans) to use tiny fragmented IP packets\&. The idea is to split up the TCP header over several packets to make it harder for packet filters, intrusion detection systems, and other annoyances to detect what you are doing\&. Be careful with this! Some programs have trouble handling these tiny packets\&. The old\-school sniffer named Sniffit segmentation faulted immediately upon receiving the first fragment\&. Specify this option once, and Nmap splits the packets into eight bytes or less after the IP header\&. So a 20\-byte TCP header would be split into three packets\&. Two with eight bytes of the TCP header, and one with the final four\&. Of course each fragment also has an IP header\&. Specify \fB\-f\fR again to use 16 bytes per fragment (reducing the number of fragments)\&. Or you can specify your own offset size with the @@ -1729,7 +1738,7 @@ addresses\&. .sp Note that the hosts you use as decoys should be up or you might accidentally SYN flood your targets\&. Also it will be pretty easy to determine which host is scanning if only one is actually up on the network\&. You might want to use IP addresses instead of names (so the decoy networks don\*(Aqt see you in their nameserver logs)\&. Right now random IP address generation is only supported with IPv4 .sp -Decoys are used both in the initial ping scan (using ICMP, SYN, ACK, or whatever) and during the actual port scanning phase\&. Decoys are also used during remote OS detection (\fB\-O\fR)\&. Decoys do not work with version detection or TCP connect scan\&. When a scan delay is in effect, the delay is enforced between each batch of spoofed probes, not between each individual probe\&. Because decoys are sent as a batch all at once, they may temporarily violate congestion control limits\&. +Decoys are used both in the initial host discovery scan (using ICMP, SYN, ACK, or whatever) and during the actual port scanning phase\&. Decoys are also used during remote OS detection (\fB\-O\fR)\&. Decoys do not work with version detection or TCP connect scan\&. When a scan delay is in effect, the delay is enforced between each batch of spoofed probes, not between each individual probe\&. Because decoys are sent as a batch all at once, they may temporarily violate congestion control limits\&. .sp It is worth noting that using too many decoys may slow your scan and potentially even make it less accurate\&. Also, some ISPs will filter out your spoofed packets, but many do not restrict spoofed IP packets at all\&. .RE @@ -2144,11 +2153,22 @@ open|filtered and unfiltered may be condensed into counts if there are an overwhelming number of them\&. +.sp +Beginning with Nmap 7\&.40, the +\fB\-\-open\fR +option implies + +\fB\-\-defeat\-rst\-ratelimit\fR, because that option only affects +closed +and +filtered +ports, which are hidden by +\fB\-\-open\fR\&. .RE .PP \fB\-\-iflist\fR (List interfaces and routes) .RS 4 -Prints the interface list and system routes as detected by Nmap\&. This is useful for debugging routing problems or device mischaracterization (such as Nmap treating a PPP connection as ethernet)\&. +Prints the interface list and system routes as detected by Nmap and quits\&. This is useful for debugging routing problems or device mischaracterization (such as Nmap treating a PPP connection as ethernet)\&. .RE .PP \fBMiscellaneous output options\fR @@ -2403,11 +2423,11 @@ option enables verbose mode\&. \fBnmap \-sS \-O scanme\&.nmap\&.org/24\fR .PP -Launches a stealth SYN scan against each machine that is up out of the 256 IPs on the class C sized network where Scanme resides\&. It also tries to determine what operating system is running on each host that is up and running\&. This requires root privileges because of the SYN scan and OS detection\&. +Launches a stealth SYN scan against each machine that is up out of the 256 IPs on the /24 sized network where Scanme resides\&. It also tries to determine what operating system is running on each host that is up and running\&. This requires root privileges because of the SYN scan and OS detection\&. .PP \fBnmap \-sV \-p 22,53,110,143,4564 198\&.116\&.0\-255\&.1\-127\fR .PP -Launches host enumeration and a TCP scan at the first half of each of the 255 possible eight\-bit subnets in the 198\&.116 class B address space\&. This tests whether the systems run SSH, DNS, POP3, or IMAP on their standard ports, or anything on port 4564\&. For any of these ports found open, version detection is used to determine what application is running\&. +Launches host enumeration and a TCP scan at the first half of each of the 255 possible eight\-bit subnets in the 198\&.116\&.0\&.0/16 address space\&. This tests whether the systems run SSH, DNS, POP3, or IMAP on their standard ports, or anything on port 4564\&. For any of these ports found open, version detection is used to determine what application is running\&. .PP \fBnmap \-v \-iR 100000 \-Pn \-p 80\fR @@ -2452,118 +2472,32 @@ file distributed with Nmap and also available from .SH "LEGAL NOTICES" .SS "Nmap Copyright and Licensing" .PP -The Nmap Security Scanner is (C) 1996\(en2018 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 (\(lqGPL\(rq), 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 -)\&. Dozens of software vendors already license Nmap technology such as host discovery, port scanning, OS detection, version detection, and the Nmap Scripting Engine\&. -.PP -Note that the GPL places important restrictions on -\(lqderivative works\(rq, yet it does not provide a detailed definition of that term\&. To avoid misunderstandings, we interpret that term as broadly as copyright law allows\&. For example, we consider an application to constitute a derivative work for the purpose of this license if it does any of the following with any software or content covered by this license (\(lqCovered Software\(rq): -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -Integrates source code from Covered Software\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -Reads or includes copyrighted data files, such as Nmap\*(Aqs -nmap\-os\-db -or -nmap\-service\-probes\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -Is designed specifically to execute Covered Software and parse the results (as opposed to typical shell or execution\-menu apps, which will execute anything you tell them to)\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -Includes Covered Software in a proprietary executable installer\&. The installers produced by InstallShield are an example of this\&. Including Nmap with other software in compressed or archival form does not trigger this provision, provided appropriate open source decompression or de\-archiving software is widely available for no charge\&. For the purposes of this license, an installer is considered to include Covered Software even if it actually retrieves a copy of Covered Software from another source during runtime (such as by downloading it from the Internet)\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -Links (statically or dynamically) to a library which does any of the above\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -Executes a helper program, module, or script to do any of the above\&. -.RE -.PP -This list is not exclusive, but is meant to clarify our interpretation of derived works with some common examples\&. Other people may interpret the plain GPL differently, so we consider this a special exception to the GPL that we apply to Covered Software\&. Works which meet any of these conditions must conform to all of the terms of this license, particularly including the GPL Section 3 requirements of providing source code and allowing free redistribution of the work as a whole\&. -.PP -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\&. +The Nmap Security Scanner is (C) 1996\(en2020 Insecure\&.Com LLC ("The Nmap Project")\&. Nmap is also a registered trademark of the Nmap Project\&. It is published under the +\m[blue]\fBNmap Public Source License\fR\m[]\&\s-2\u[18]\d\s+2\&. This generally allows end users to download and use Nmap for free\&. It doesn\*(Aqt not allow Nmap to be used and redistributed within commercial software or hardware products (including appliances, virtual machines, and traditional applications)\&. We fund the project by selling a special Nmap OEM Edition for this purpose, as described at +\m[blue]\fB\%https://nmap.org/oem\fR\m[]\&. Hundreds of large and small software vendors have already purchased OEM licenses to embed Nmap technology such as host discovery, port scanning, OS detection, version detection, and the Nmap Scripting Engine within their products\&. .PP 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\*(Aqs 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\&. .PP -Any redistribution of Covered Software, including any derived works, must obey and carry forward all of the terms of this license, including obeying all GPL rules and restrictions\&. For example, source code of the whole work must be provided and free redistribution must be allowed\&. All GPL references to "this License", are to be treated as including the terms and conditions of this license text as well\&. +Even though the NPSL is based on GPLv2, it contains different provisions and is not directly compatible\&. It is incompatible with some other open source licenses as well\&. In some cases we can relicense portions of Nmap or grant special permissions to use it in other open source software\&. Please contact fyodor@nmap\&.org with any such requests\&. Similarly, we don\*(Aqt incorporate incompatible open source software into Nmap without special permission from the copyright holders\&. .PP -Because this license imposes special exceptions to the GPL, Covered Work may not be combined (even as part of a larger work) with plain GPL software\&. The terms, conditions, and exceptions of this license must be included as well\&. This license is incompatible with some other open source licenses as well\&. In some cases we can relicense portions of Nmap or grant special permissions to use it in other open source software\&. Please contact fyodor@nmap\&.org with any such requests\&. Similarly, we don\*(Aqt incorporate incompatible open source software into Covered Software without special permission from the copyright holders\&. -.PP -If you have any questions about the licensing restrictions on using Nmap in other works, we are happy to help\&. As mentioned above, we also offer an alternative license to integrate Nmap into proprietary applications and appliances\&. These contracts have been sold to dozens of software vendors, and generally include a perpetual license as well as providing support and updates\&. They also fund the continued development of Nmap\&. Please email - -for further information\&. -.PP -If you have received a written license agreement or contract for Covered Software stating terms other than these, you may choose to use and redistribute Covered Software under those terms instead of these\&. +If you have received a written license agreement or contract for Nmap stating terms other than these, you may choose to use and redistribute Nmap under those terms instead\&. .SS "Creative Commons License for this Nmap Guide" .PP This Nmap Reference Guide -is (C) 2005\(en2018 Insecure\&.Com LLC\&. It is hereby placed under version 3\&.0 of the -\m[blue]\fBCreative Commons Attribution License\fR\m[]\&\s-2\u[18]\d\s+2\&. This allows you redistribute and modify the work as you desire, as long as you credit the original source\&. Alternatively, you may choose to treat this document as falling under the same license as Nmap itself (discussed previously)\&. +is (C) 2005\(en2020 Insecure\&.Com LLC\&. It is hereby placed under version 3\&.0 of the +\m[blue]\fBCreative Commons Attribution License\fR\m[]\&\s-2\u[19]\d\s+2\&. This allows you redistribute and modify the work as you desire, as long as you credit the original source\&. Alternatively, you may choose to treat this document as falling under the same license as Nmap itself (discussed previously)\&. .SS "Source Code Availability and Community Contributions" .PP Source is provided to this software because we believe users 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\&. .PP -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 +Source code also allows you to port Nmap to new platforms, fix bugs, and add new features\&. You are highly encouraged to submit your changes as Github Pull Requests (PR) or send them to -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, -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\&. +for possible incorporation into the main distribution\&. By submitting such changes, it is assumed that you are offering the Nmap Project the 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)\&. We also sell commercial licenses to +\m[blue]\fBNmap OEM\fR\m[]\&\s-2\u[20]\d\s+2\&. If you wish to specify special license conditions of your contributions, just say so when you send them\&. .SS "No Warranty" .PP -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU General Public License v2\&.0 for more details at -\m[blue]\fB\%http://www.gnu.org/licenses/gpl-2.0.html\fR\m[], or in the -COPYING -file included with Nmap\&. +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. .PP It should also be noted that Nmap has occasionally been known to crash poorly written applications, TCP/IP stacks, and even operating systems\&. While this is extremely rare, it is important to keep in mind\&. @@ -2575,27 +2509,29 @@ Because of the slight risk of crashes and because a few black hats like to use N .PP Nmap should never be installed with special privileges (e\&.g\&. suid root)\&. That would open up a major security vulnerability as other users on the system (or attackers) could use it for privilege escalation\&. +.PP +Nmap is not designed, manufactured, or intended for use in hazardous environments requiring fail\- safe performance where the failure of the software could lead directly to death, personal injury, or significant physical or environmental damage\&. .SS "Third\-Party Software and Funding Notices" .PP This product includes software developed by the -\m[blue]\fBApache Software Foundation\fR\m[]\&\s-2\u[19]\d\s+2\&. A modified version of the -\m[blue]\fBLibpcap portable packet capture library\fR\m[]\&\s-2\u[20]\d\s+2 +\m[blue]\fBApache Software Foundation\fR\m[]\&\s-2\u[21]\d\s+2\&. A modified version of the +\m[blue]\fBLibpcap portable packet capture library\fR\m[]\&\s-2\u[22]\d\s+2 is distributed along with Nmap\&. The Windows version of Nmap utilizes the Libpcap\-derived -\m[blue]\fBNcap library\fR\m[]\&\s-2\u[21]\d\s+2 +\m[blue]\fBNcap library\fR\m[]\&\s-2\u[23]\d\s+2 instead\&. Regular expression support is provided by the -\m[blue]\fBPCRE library\fR\m[]\&\s-2\u[22]\d\s+2, +\m[blue]\fBPCRE library\fR\m[]\&\s-2\u[24]\d\s+2, which is open\-source software, written by Philip Hazel\&. Certain raw networking functions use the -\m[blue]\fBLibdnet\fR\m[]\&\s-2\u[23]\d\s+2 +\m[blue]\fBLibdnet\fR\m[]\&\s-2\u[25]\d\s+2 networking library, which was written by Dug Song\&. A modified version is distributed with Nmap\&. Nmap can optionally link with the -\m[blue]\fBOpenSSL cryptography toolkit\fR\m[]\&\s-2\u[24]\d\s+2 +\m[blue]\fBOpenSSL cryptography toolkit\fR\m[]\&\s-2\u[26]\d\s+2 for SSL version detection support\&. The Nmap Scripting Engine uses an embedded version of the -\m[blue]\fBLua programming language\fR\m[]\&\s-2\u[25]\d\s+2\&. +\m[blue]\fBLua programming language\fR\m[]\&\s-2\u[27]\d\s+2\&. The -\m[blue]\fBLiblinear linear classification library\fR\m[]\&\s-2\u[26]\d\s+2 +\m[blue]\fBLiblinear linear classification library\fR\m[]\&\s-2\u[28]\d\s+2 is used for our -\m[blue]\fBIPv6 OS detection machine learning techniques\fR\m[]\&\s-2\u[27]\d\s+2\&. +\m[blue]\fBIPv6 OS detection machine learning techniques\fR\m[]\&\s-2\u[29]\d\s+2\&. All of the third\-party software described in this paragraph is freely redistributable under BSD\-style software licenses\&. .PP @@ -2604,20 +2540,20 @@ LICENSES files\&. .PP This software was supported in part through the -\m[blue]\fBGoogle Summer of Code\fR\m[]\&\s-2\u[28]\d\s+2 +\m[blue]\fBGoogle Summer of Code\fR\m[]\&\s-2\u[30]\d\s+2 and the -\m[blue]\fBDARPA CINDER program\fR\m[]\&\s-2\u[29]\d\s+2 +\m[blue]\fBDARPA CINDER program\fR\m[]\&\s-2\u[31]\d\s+2 (DARPA\-BAA\-10\-84)\&. .SS "United States Export Control" .PP Nmap only uses encryption when compiled with the optional OpenSSL support and linked with OpenSSL\&. When compiled without OpenSSL support, the Nmap Project believes that Nmap is not subject to U\&.S\&. -\m[blue]\fBExport Administration Regulations (EAR)\fR\m[]\&\s-2\u[30]\d\s+2 +\m[blue]\fBExport Administration Regulations (EAR)\fR\m[]\&\s-2\u[32]\d\s+2 export control\&. As such, there is no applicable ECCN (export control classification number) and exportation does not require any special license, permit, or other governmental authorization\&. .PP When compiled with OpenSSL support or distributed as source code, the Nmap Project believes that Nmap falls under U\&.S\&. ECCN -\m[blue]\fB5D002\fR\m[]\&\s-2\u[31]\d\s+2 +\m[blue]\fB5D002\fR\m[]\&\s-2\u[33]\d\s+2 (\(lqInformation Security Software\(rq)\&. We distribute Nmap under the TSU exception for publicly available encryption software defined in -\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[32]\d\s+2\&. +\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[34]\d\s+2\&. .SH "NOTES" .IP " 1." 4 Nmap Network Scanning: The Official Nmap Project Guide to Network Discovery and Security Scanning @@ -2705,77 +2641,87 @@ listed at Wikipedia \%http://en.wikipedia.org/wiki/List_of_IPv6_tunnel_brokers .RE .IP "18." 4 +Nmap Public Source License +.RS 4 +\%https://nmap.org/npsl +.RE +.IP "19." 4 Creative Commons Attribution License .RS 4 \%http://creativecommons.org/licenses/by/3.0/ .RE -.IP "19." 4 -Apache Software Foundation -.RS 4 -\%http://www.apache.org -.RE .IP "20." 4 -Libpcap portable packet capture library +Nmap OEM .RS 4 -\%http://www.tcpdump.org +\%https://nmap.org/oem .RE .IP "21." 4 +Apache Software Foundation +.RS 4 +\%https://www.apache.org +.RE +.IP "22." 4 +Libpcap portable packet capture library +.RS 4 +\%https://www.tcpdump.org +.RE +.IP "23." 4 Ncap library .RS 4 \%https://npcap.org .RE -.IP "22." 4 +.IP "24." 4 PCRE library .RS 4 -\%http://www.pcre.org +\%https://pcre.org .RE -.IP "23." 4 +.IP "25." 4 Libdnet .RS 4 \%http://libdnet.sourceforge.net .RE -.IP "24." 4 +.IP "26." 4 OpenSSL cryptography toolkit .RS 4 -\%http://www.openssl.org -.RE -.IP "25." 4 -Lua programming language -.RS 4 -\%http://www.lua.org -.RE -.IP "26." 4 -Liblinear linear classification library -.RS 4 -\%http://www.csie.ntu.edu.tw/~cjlin/liblinear/ +\%https://openssl.org .RE .IP "27." 4 +Lua programming language +.RS 4 +\%https://lua.org +.RE +.IP "28." 4 +Liblinear linear classification library +.RS 4 +\%https://www.csie.ntu.edu.tw/~cjlin/liblinear/ +.RE +.IP "29." 4 IPv6 OS detection machine learning techniques .RS 4 \%https://nmap.org/book/osdetect-guess.html#osdetect-guess-ipv6 .RE -.IP "28." 4 +.IP "30." 4 Google Summer of Code .RS 4 \%https://nmap.org/soc/ .RE -.IP "29." 4 +.IP "31." 4 DARPA CINDER program .RS 4 \%https://www.fbo.gov/index?s=opportunity&mode=form&id=585e02a51f77af5cb3c9e06b9cc82c48&tab=core&_cview=1 .RE -.IP "30." 4 +.IP "32." 4 Export Administration Regulations (EAR) .RS 4 -\%http://www.access.gpo.gov/bis/ear/ear_data.html +\%https://www.bis.doc.gov/index.php/regulations/export-administration-regulations-ear .RE -.IP "31." 4 +.IP "33." 4 5D002 .RS 4 \%https://www.bis.doc.gov/index.php/documents/regulations-docs/federal-register-notices/federal-register-2014/951-ccl5-pt2/file .RE -.IP "32." 4 +.IP "34." 4 EAR 740.13(e) .RS 4 -\%http://www.access.gpo.gov/bis/ear/pdf/740.pdf +\%https://www.bis.doc.gov/index.php/documents/regulations-docs/2341-740-2/file .RE diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index b066fef74..d1c65f157 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 7.80SVN ( https://nmap.org ) +Nmap 7.90 ( https://nmap.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. diff --git a/idle_scan.cc b/idle_scan.cc index 1a01ee036..2431e5477 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -9,126 +9,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/idle_scan.h b/idle_scan.h index fe6f51c65..49ac5fde0 100644 --- a/idle_scan.h +++ b/idle_scan.h @@ -9,126 +9,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/libnetutil/ARPHeader.cc b/libnetutil/ARPHeader.cc index 998407afe..f56b29920 100644 --- a/libnetutil/ARPHeader.cc +++ b/libnetutil/ARPHeader.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ARPHeader.h b/libnetutil/ARPHeader.h index 588314798..2597c9e5d 100644 --- a/libnetutil/ARPHeader.h +++ b/libnetutil/ARPHeader.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ApplicationLayerElement.h b/libnetutil/ApplicationLayerElement.h index f9b0d33cd..9259dccc5 100644 --- a/libnetutil/ApplicationLayerElement.h +++ b/libnetutil/ApplicationLayerElement.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/DataLinkLayerElement.h b/libnetutil/DataLinkLayerElement.h index ae4d9c362..6170acb80 100644 --- a/libnetutil/DataLinkLayerElement.h +++ b/libnetutil/DataLinkLayerElement.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/DestOptsHeader.cc b/libnetutil/DestOptsHeader.cc index 3a48d69e4..d7c30814d 100644 --- a/libnetutil/DestOptsHeader.cc +++ b/libnetutil/DestOptsHeader.cc @@ -4,126 +4,58 @@ * Destination Options extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/DestOptsHeader.h b/libnetutil/DestOptsHeader.h index a3c4803e8..8c78034ff 100644 --- a/libnetutil/DestOptsHeader.h +++ b/libnetutil/DestOptsHeader.h @@ -4,126 +4,58 @@ * Destination Options extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/EthernetHeader.cc b/libnetutil/EthernetHeader.cc index e608a9ad3..71ec4597a 100644 --- a/libnetutil/EthernetHeader.cc +++ b/libnetutil/EthernetHeader.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/EthernetHeader.h b/libnetutil/EthernetHeader.h index 9ea322085..163eeb958 100644 --- a/libnetutil/EthernetHeader.h +++ b/libnetutil/EthernetHeader.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/FragmentHeader.cc b/libnetutil/FragmentHeader.cc index c0a264621..49a64a519 100644 --- a/libnetutil/FragmentHeader.cc +++ b/libnetutil/FragmentHeader.cc @@ -4,126 +4,58 @@ * Hop-by-Hop extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/FragmentHeader.h b/libnetutil/FragmentHeader.h index dfdbf3e9b..121183b11 100644 --- a/libnetutil/FragmentHeader.h +++ b/libnetutil/FragmentHeader.h @@ -4,126 +4,58 @@ * Hop-by-Hop extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/HopByHopHeader.cc b/libnetutil/HopByHopHeader.cc index c64d669dd..ada7d3424 100644 --- a/libnetutil/HopByHopHeader.cc +++ b/libnetutil/HopByHopHeader.cc @@ -4,126 +4,58 @@ * Hop-by-Hop extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/HopByHopHeader.h b/libnetutil/HopByHopHeader.h index 14857bbfe..2502a847e 100644 --- a/libnetutil/HopByHopHeader.h +++ b/libnetutil/HopByHopHeader.h @@ -4,126 +4,58 @@ * Hop-by-Hop extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPHeader.h b/libnetutil/ICMPHeader.h index 7d2c802a8..4f0180e71 100644 --- a/libnetutil/ICMPHeader.h +++ b/libnetutil/ICMPHeader.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv4Header.cc b/libnetutil/ICMPv4Header.cc index fff10f7d1..66bb2dadb 100644 --- a/libnetutil/ICMPv4Header.cc +++ b/libnetutil/ICMPv4Header.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv4Header.h b/libnetutil/ICMPv4Header.h index e0e7187b0..09abc81c2 100644 --- a/libnetutil/ICMPv4Header.h +++ b/libnetutil/ICMPv4Header.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv6Header.cc b/libnetutil/ICMPv6Header.cc index b09af6544..dc9e3a2ad 100644 --- a/libnetutil/ICMPv6Header.cc +++ b/libnetutil/ICMPv6Header.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv6Header.h b/libnetutil/ICMPv6Header.h index 1b454ba5b..15bc20c25 100644 --- a/libnetutil/ICMPv6Header.h +++ b/libnetutil/ICMPv6Header.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv6Option.cc b/libnetutil/ICMPv6Option.cc index 5df352ef7..55603c2c4 100644 --- a/libnetutil/ICMPv6Option.cc +++ b/libnetutil/ICMPv6Option.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv6Option.h b/libnetutil/ICMPv6Option.h index ed6211cbb..3c2086ca6 100644 --- a/libnetutil/ICMPv6Option.h +++ b/libnetutil/ICMPv6Option.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv6RRBody.cc b/libnetutil/ICMPv6RRBody.cc index 949195b00..0e4e8b83b 100644 --- a/libnetutil/ICMPv6RRBody.cc +++ b/libnetutil/ICMPv6RRBody.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/ICMPv6RRBody.h b/libnetutil/ICMPv6RRBody.h index a520159be..1202bfead 100644 --- a/libnetutil/ICMPv6RRBody.h +++ b/libnetutil/ICMPv6RRBody.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/IPv4Header.cc b/libnetutil/IPv4Header.cc index e4521d481..a6bcaf8b6 100644 --- a/libnetutil/IPv4Header.cc +++ b/libnetutil/IPv4Header.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/IPv4Header.h b/libnetutil/IPv4Header.h index ec10c4df4..9b0c84afe 100644 --- a/libnetutil/IPv4Header.h +++ b/libnetutil/IPv4Header.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/IPv6ExtensionHeader.h b/libnetutil/IPv6ExtensionHeader.h index 7c70441d3..b77113a6e 100644 --- a/libnetutil/IPv6ExtensionHeader.h +++ b/libnetutil/IPv6ExtensionHeader.h @@ -5,126 +5,58 @@ * Hop-by-Hop or Routing) inherit from this class. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/IPv6Header.cc b/libnetutil/IPv6Header.cc index 5146a4e4e..bb888a8ce 100644 --- a/libnetutil/IPv6Header.cc +++ b/libnetutil/IPv6Header.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/IPv6Header.h b/libnetutil/IPv6Header.h index 092516c99..ce6192760 100644 --- a/libnetutil/IPv6Header.h +++ b/libnetutil/IPv6Header.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/NetworkLayerElement.cc b/libnetutil/NetworkLayerElement.cc index d215c6bf6..cd0001608 100644 --- a/libnetutil/NetworkLayerElement.cc +++ b/libnetutil/NetworkLayerElement.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/NetworkLayerElement.h b/libnetutil/NetworkLayerElement.h index d7719926c..246a545c1 100644 --- a/libnetutil/NetworkLayerElement.h +++ b/libnetutil/NetworkLayerElement.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/PacketElement.cc b/libnetutil/PacketElement.cc index 78672d4b7..a57e89729 100644 --- a/libnetutil/PacketElement.cc +++ b/libnetutil/PacketElement.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/PacketElement.h b/libnetutil/PacketElement.h index 881b0203f..2fa04a10f 100644 --- a/libnetutil/PacketElement.h +++ b/libnetutil/PacketElement.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/PacketParser.cc b/libnetutil/PacketParser.cc index 82dce4b0a..cb0853e2e 100644 --- a/libnetutil/PacketParser.cc +++ b/libnetutil/PacketParser.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/PacketParser.h b/libnetutil/PacketParser.h index c5fe1a679..6ce2802e2 100644 --- a/libnetutil/PacketParser.h +++ b/libnetutil/PacketParser.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/RawData.cc b/libnetutil/RawData.cc index b70683792..ee57df270 100644 --- a/libnetutil/RawData.cc +++ b/libnetutil/RawData.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/RawData.h b/libnetutil/RawData.h index 3f6432c7f..f8776eff3 100644 --- a/libnetutil/RawData.h +++ b/libnetutil/RawData.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/RoutingHeader.cc b/libnetutil/RoutingHeader.cc index 504bbcfaa..9a9c63662 100644 --- a/libnetutil/RoutingHeader.cc +++ b/libnetutil/RoutingHeader.cc @@ -4,126 +4,58 @@ * extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/RoutingHeader.h b/libnetutil/RoutingHeader.h index 72aed202c..cd532c4d4 100644 --- a/libnetutil/RoutingHeader.h +++ b/libnetutil/RoutingHeader.h @@ -4,126 +4,58 @@ * extension header. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/TCPHeader.cc b/libnetutil/TCPHeader.cc index 057541eae..5247de078 100644 --- a/libnetutil/TCPHeader.cc +++ b/libnetutil/TCPHeader.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/TCPHeader.h b/libnetutil/TCPHeader.h index e87beed5e..3003108ea 100644 --- a/libnetutil/TCPHeader.h +++ b/libnetutil/TCPHeader.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/TransportLayerElement.cc b/libnetutil/TransportLayerElement.cc index 3a9a2165c..a26ceff16 100644 --- a/libnetutil/TransportLayerElement.cc +++ b/libnetutil/TransportLayerElement.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/TransportLayerElement.h b/libnetutil/TransportLayerElement.h index a101d019b..b4e6b2bfd 100644 --- a/libnetutil/TransportLayerElement.h +++ b/libnetutil/TransportLayerElement.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/UDPHeader.cc b/libnetutil/UDPHeader.cc index 8252ccd75..746d5c371 100644 --- a/libnetutil/UDPHeader.cc +++ b/libnetutil/UDPHeader.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/UDPHeader.h b/libnetutil/UDPHeader.h index 3e3a031b4..4a6c61f78 100644 --- a/libnetutil/UDPHeader.h +++ b/libnetutil/UDPHeader.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ /* This code was originally part of the Nping tool. */ diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc index eb40d0869..84905dd84 100644 --- a/libnetutil/netutil.cc +++ b/libnetutil/netutil.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/libnetutil/netutil.h b/libnetutil/netutil.h index 617cf9de6..eefe2b309 100644 --- a/libnetutil/netutil.h +++ b/libnetutil/netutil.h @@ -8,126 +8,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/libnetutil/npacket.h b/libnetutil/npacket.h index 4bd6b72b4..91554514a 100644 --- a/libnetutil/npacket.h +++ b/libnetutil/npacket.h @@ -8,126 +8,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/macosx/BUNDLING.md b/macosx/BUNDLING.md index dda2d015d..904144ee6 100644 --- a/macosx/BUNDLING.md +++ b/macosx/BUNDLING.md @@ -2,7 +2,6 @@ --- * [Jhbuild](#jhbuild) - * Observation * Possible error * [gtk-mac-bundler](#bundler) * [How to use](#howto) @@ -15,11 +14,11 @@ In order to set up Jhbuild properly before building Nmap suite, follow the tutor If you had any error, just type the following command to delete jhbuild, - $ rm -rf ~/bin/jhbuild ~/.local/bin/jhbuild ~/.local/share/jhbuild ~/.cache/jhbuild ~/.config/jhbuildrc ~/.jhbuildrc ~/.jhbuildrc-custom ~/jhbuild + $ rm -rf ~/.local ~/.new_local ~/.cache ~/.config ~/Source/jhbuild ~/Source/pyenv ~/Library/Caches/pip* ~/gtk And we'll start over together: -1. First, simply download the following script in your _$HOME_ directory and launch it ([https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh](https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh)): +1. First, simply download the following script in your _$HOME_ directory ([https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh](https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh)). Edit it to make sure that `MACOSX_DEPLOYMENT_TARGET` exists and is set to the lowest supported version of OS X, e.g. "10.11". Then run it: ~~~~ $ sh gtk-osx-build-setup.sh @@ -31,55 +30,63 @@ And we'll start over together: $ export PATH=$HOME/.local/bin:$PATH ~~~~ -2. In `~/.jhbuildrc-custom`, make sure that this line is setup properly: +2. In `~/.jhbuildrc-custom`, make sure that this line is setup properly and matches `MACOSX_DEPLOYMENT_TARGET` from step 1: ~~~~ - setup_sdk(target=_target, sdk_version="native", architectures=["i386"]) + setup_sdk(target="10.11") ~~~~ - for an i386 architecture. - 3. Now do, ~~~~ - $ jhbuild bootstrap + $ jhbuild bootstrap-gtk-osx ~~~~ - To install missing dependencies (with **--force** option to force rebuilding).
Go to **Observation** if errors appear... + To install missing dependencies (with **--force** option to force rebuilding).
4. And, ~~~~ $ jhbuild build meta-gtk-osx-bootstrap $ jhbuild build meta-gtk-osx-core + +5. Now we need Python2 and the GTK2 bindings for it, but gtk-osx has built +Python3, and the bindings will prefer that even though the dev headers aren't +present. Specifically, we need pycairo prior to 1.19 (when they dropped Python2 +support) and gtk-integration-python. There's got to be a better way, but what I +did was first install python2: + + $ jhbuild build python + +Then install pycairo. This is necessary because if it's missing for Python 2, +the other bindings won't build for Python 2 either. Make sure version is less +than 1.19 in ~/.cache/jhbuild/gtk-osx-python.modules. This may "succeed" but it +will have built the Python3 bindings. Clear out the build tree and make sure +the source will prefer python2: + + $ jhbuild build pycairo + $ rm -rf ~/.cache/jhbuild/build/pycairo-* + $ sed -i 's/python3/python2/' ~/gtk/source/pycairo-*/meson_options.txt + $ jhbuild build pycairo + +Now build the rest of the python bindings. Some of these will fail (and maybe +they failed as prereqs for pycairo earlier), so hang on and I'll tell you how +to fix those: + $ jhbuild build meta-gtk-osx-python - ~~~~ - - Go to **Observation** if errors appear... - -
-### Observation - -If anything goes wrong now, it'll probably be a bad link on your python binary, so check that you're using the **GTK one** instead of the original mac one: -~~~~ -$ jhbuild shell -bash$ which python -~~~~ +Ok, when you get a failure, that's your chance to reconfigure with python2. +Jhbuild will give you some options; choose "4. start a shell" and then check +for the proper configuration command (may be visible in scrollback, otherwise +check config.log) and copy it. Clear out the build directory (probably the +current directory, ~/.cache/jhbuild/build/package-name-version/*) then from +there run the configuration command with PYTHON variable overridden, e.g.: -If you can see _gtk_ in the path, everything is fine with Python, else do: + $ PYTHON=$(which python2) ~/gtk/source/package-name-version/configure --some-options -~~~~ -$ jhbuild build --force python -~~~~ - -And make an alias, to use this version of Python with Jhbuild: - -~~~~ -$ alias jhbuild="PATH=gtk-prefix/bin:$PATH jhbuild" -~~~~ - -Now continue at **step 3** with the --force option at the end of each command, to reinstall everything from scratch with this new python binary. +Now exit that shell and go to the build step. This might mean "ignore error and +continue with build" or it might mean "rerun step build" depending on when the +error happened. ### Possible error diff --git a/macosx/Makefile b/macosx/Makefile index 45a88bdb3..23caf6ada 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -35,11 +35,11 @@ PREFIX = /usr/local # Extra distribution file names README_FILE = README.md -COPYING_FILE = COPYING +LICENSE_FILE = LICENSE 3RD_P_LIC_FILE = 3rd-party-licenses.txt LICENSES_FILE = licenses -EXTRA_DIST = README.md ../COPYING ../docs/3rd-party-licenses.txt ../docs/licenses +EXTRA_DIST = README.md ../LICENSE ../docs/3rd-party-licenses.txt ../docs/licenses CONFIGURE_ARGS = --prefix="$(PREFIX)" --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" PYTHON="$(PYTHON)" @@ -83,8 +83,8 @@ export APPS_POS_X=110 export APPS_POS_Y=310 export README_POS_X=802 export README_POS_Y=180 -export COPYING_POS_X=802 -export COPYING_POS_Y=310 +export LICENSE_POS_X=802 +export LICENSE_POS_Y=310 export THIRD_P_POS_X=802 export THIRD_P_POS_Y=440 export LICENSES_POS_X=670 @@ -93,17 +93,17 @@ export LICENSES_POS_Y=60 $(IMAGE_NAME): tool-checks $(IMAGE_STAGING_DIR)/$(PKG_NAME) rm -f $@ # Create the dmg disk image and convert it to read only disk - ./createdmg.sh $(IMAGE_STAGING_DIR) $(README_FILE) $(COPYING_FILE) $(3RD_P_LIC_FILE) $(LICENSES_FILE) + ./createdmg.sh $(IMAGE_STAGING_DIR) $(README_FILE) $(LICENSE_FILE) $(3RD_P_LIC_FILE) $(LICENSES_FILE) # Check the created disk image for the sizes, backgrounds and icons presence and positions - ./check_test.sh $(README_FILE) $(COPYING_FILE) $(3RD_P_LIC_FILE) $(LICENSES_FILE) + ./check_test.sh $(README_FILE) $(LICENSE_FILE) $(3RD_P_LIC_FILE) $(LICENSES_FILE) tool-checks: have-$(CC) have-jhbuild have-gtk-mac-bundler have-%: which $* -#$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping COPYING.formatted -$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping COPYING.formatted +#$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping LICENSE.formatted +$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping LICENSE.formatted rm -rf $(IMAGE_STAGING_DIR) mkdir -p $(IMAGE_STAGING_DIR) cp -rf $(EXTRA_DIST) $(IMAGE_STAGING_DIR)/ @@ -186,9 +186,9 @@ stage-ndiff: export-$(NDIFF_BUILD_DIR) cp $(NDIFF_BUILD_DIR)/ndiff/ndiff.py $(NDIFF_STAGING_DIR)/usr/local/bin/ndiff cp $(NDIFF_BUILD_DIR)/ndiff/docs/ndiff.1 $(NDIFF_STAGING_DIR)/usr/local/share/man/man1/ -COPYING.formatted: +LICENSE.formatted: # Use the license formatter from the Windows installer. - ../mswin32/license-format/licformat.sh ../COPYING > $@ + ../mswin32/license-format/licformat.sh ../LICENSE > $@ clean: rm -rf $(IMAGE_STAGING_DIR) @@ -202,7 +202,7 @@ clean: rm -rf $(NDIFF_STAGING_DIR) rm -rf $(NPING_BUILD_DIR) rm -rf $(NPING_STAGING_DIR) - rm -f COPYING.formatted + rm -f LICENSE.formatted rm -f $(IMAGE_NAME) rm -rf distribution.xml finalDist.xml nmap.pkg ncat.pkg ndiff.pkg nping.pkg zenmap.pkg diff --git a/macosx/check_test.sh b/macosx/check_test.sh index bfc69f5c0..8ac2a1cbc 100755 --- a/macosx/check_test.sh +++ b/macosx/check_test.sh @@ -39,7 +39,7 @@ export README=`echo ' end tell ' | osascript | grep -o 'position:[0-9]*, [0-9]*' | awk -F':' '{ print $2 }'` -export COPYING=`echo ' +export LICENSE=`echo ' tell application "Finder" set f to POSIX file "'${disk}'/'$2'" as alias get properties of f @@ -74,10 +74,10 @@ else RES="False" fi; -if [ "$COPYING" = "$COPYING_POS_X, $COPYING_POS_Y" ]; then - echo "COPYING: OK" +if [ "$LICENSE" = "$LICENSE_POS_X, $LICENSE_POS_Y" ]; then + echo "LICENSE: OK" else - echo "COPYING: Wrong" + echo "LICENSE: Wrong" RES="False" fi; diff --git a/macosx/createdmg.sh b/macosx/createdmg.sh index c5353efdd..ee7f4e28b 100755 --- a/macosx/createdmg.sh +++ b/macosx/createdmg.sh @@ -60,7 +60,7 @@ echo ' set position of item "'${applicationName}'" of container window to {'${MPKG_POS_X}', '${MPKG_POS_Y}'} set position of item "Applications" of container window to {'${APPS_POS_X}', '${APPS_POS_Y}'} set position of item "'$2'" of container window to {'${README_POS_X}', '${README_POS_Y}'} - set position of item "'$3'" of container window to {'${COPYING_POS_X}', '${COPYING_POS_Y}'} + set position of item "'$3'" of container window to {'${LICENSE_POS_X}', '${LICENSE_POS_Y}'} set position of item "'$4'" of container window to {'${THIRD_P_POS_X}', '${THIRD_P_POS_Y}'} set position of item "'$5'" of container window to {'${LICENSES_POS_X}', '${LICENSES_POS_Y}'} diff --git a/macosx/nmap.pmdoc/index.xml b/macosx/nmap.pmdoc/index.xml index 77d87c109..4287e94f0 100644 --- a/macosx/nmap.pmdoc/index.xml +++ b/macosx/nmap.pmdoc/index.xml @@ -40,7 +40,7 @@ README - COPYING.formatted + LICENSE.formatted diff --git a/macosx/openssl.modules b/macosx/openssl.modules index 41c956052..1d67273a3 100644 --- a/macosx/openssl.modules +++ b/macosx/openssl.modules @@ -5,7 +5,7 @@ - + @@ -30,7 +30,7 @@ makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"' makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"' > - + @@ -42,7 +42,7 @@ makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"' makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"' > - + @@ -54,7 +54,7 @@ makeargs='build-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"' makeinstallargs='install-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"' > - + @@ -66,7 +66,7 @@ makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"' makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"' > - + @@ -78,7 +78,7 @@ makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"' makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"' > - + diff --git a/main.cc b/main.cc index 9cff50e76..e4852b9aa 100644 --- a/main.cc +++ b/main.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/mswin32/Makefile b/mswin32/Makefile index a340dd9a0..4a687a1b7 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -1,14 +1,17 @@ -MAKENSIS="/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" +MAKENSIS=/cygdrive/c/Program Files (x86)/NSIS-strlen/makensis.exe +MAKENSIS_WIN=$(shell echo '$(MAKENSIS)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g') # VCExpress.exe is devenv.com with the commercial Visual Studio suite instead of VC++ Express VCEXPRESS := $(shell reg query "HKEY_CLASSES_ROOT\\Applications\\devenv.exe\\shell\\edit\\command" | egrep -i '[A-Z]:\\' | cut -d\" -f2 | sed 's%\\%/%g' | tr -d '\r\n') SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v8.1" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%') -export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') -export NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') -export NPCAP_VERSION := $(shell ls npcap-*.exe | sed -e 's/npcap-\([-r0-9.]*\)\.exe/\1/' -e 'q') +NMAPDIR=.. +NMAPDIR_WIN=$(shell echo '$(NMAPDIR)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g') +export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' $(NMAPDIR)/nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') +export NMAP_NUM_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_NUM_VERSION' $(NMAPDIR)/nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q') +export NPCAP_VERSION := $(shell ls npcap-*.exe | sed -e 's/npcap-\([0-9.]*\)[-oem]*\.exe/\1/' -e 'q') COMMA_VERSION=$(shell echo $(NMAP_NUM_VERSION) | tr '.' ',') LOGLOC=c:nmapbuild.log -NSE_FILES = ../scripts/script.db ../scripts/*.nse -NMAP_MSWIN32_AUX = ../../nmap-mswin32-aux +NSE_FILES = $(NMAPDIR)/scripts/script.db $(NMAPDIR)/scripts/*.nse +NMAP_MSWIN32_AUX = $(NMAPDIR)/../nmap-mswin32-aux SIGNTOOL_ARGS = sign /a /n "Insecure.Com LLC" /tr http://timestamp.digicert.com /td sha256 /fd sha256 # escape quotes for NSIS # escape for right side of sed regex replace @@ -16,100 +19,133 @@ SIGNTOOL_SUBST = $(shell echo '"$(SIGNTOOL)" $(SIGNTOOL_ARGS)' | sed -e 's/"/$$\ PRODUCT_NAME=Nmap PLATFORM=Win32 -BASE_CONFIG ?= Release -VCCONFIG=$(BASE_CONFIG) +VCCONFIG=Release NSIS_DEFINES= -ifdef NMAP_OEM -PRODUCT_NAME=Nmap OEM -OEM_SUFFIX=-oem -VCCONFIG=$(BASE_CONFIG)OEM -NSIS_DEFINES="/DNMAP_OEM=1" -endif bundle-nmap: bundle-zip bundle-nsis -build-nmap: nmap.sln nmap.rc - "$(VCEXPRESS)" nmap.sln /build "$(VCCONFIG)|$(PLATFORM)" /out $(LOGLOC) +build-nmap${OEM_SUFFIX}: nmap.sln nmap${OEM_SUFFIX}.rc + "$(VCEXPRESS)" nmap.sln /build "$(VCCONFIG)${OEM_SUFFIX}|$(PLATFORM)" /out $(LOGLOC) -stage-nmap: build-nmap LICENSE - rm -rf nmap-$(NMAP_VERSION) - mkdir nmap-$(NMAP_VERSION) - cp ../CHANGELOG ../COPYING ../nmap-mac-prefixes ../nmap-os-db ../nmap-payloads ../nmap-protocols ../nmap-rpc ../nmap-service-probes ../nmap-services $(VCCONFIG)/nmap.exe ../docs/nmap.xsl ../nse_main.lua nmap_performance.reg ../README-WIN32 ../docs/3rd-party-licenses.txt nmap-$(NMAP_VERSION)/ +stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefixes $(NMAPDIR)/nmap-os-db $(NMAPDIR)/nmap-payloads $(NMAPDIR)/nmap-protocols $(NMAPDIR)/nmap-rpc $(NMAPDIR)/nmap-service-probes $(NMAPDIR)/nmap-services $(NMAPDIR)/docs/nmap.xsl $(NMAPDIR)/nse_main.lua $(NMAPDIR)/mswin32/nmap_performance.reg $(NMAPDIR)/README-WIN32 $(NMAPDIR)/docs/3rd-party-licenses.txt icon1.ico LICENSE.formatted + mkdir -p nmap-$(NMAP_VERSION) + cp $^ nmap-$(NMAP_VERSION)/ # Use "cmd /c copy" rather than "cp" to preserve Windows ACLs. Using # "cp" means that the copied DLLs don't have the same ACL and cause an # error on startup: 0xc0000022. cmd /c copy $(subst /,\\,$(NMAP_MSWIN32_AUX))\\OpenSSL\\bin\\*.dll nmap-$(NMAP_VERSION) - cmd /c copy ..\\libssh2\\win32\\$(BASE_CONFIG)_dll\\libssh2.dll nmap-$(NMAP_VERSION) - cmd /c copy ..\\libz\\contrib\\vstudio\\vc12\\x86\\ZlibDll$(BASE_CONFIG)WithoutAsm\\zlibwapi.dll nmap-$(NMAP_VERSION) - mkdir nmap-$(NMAP_VERSION)/scripts + cmd /c copy $(NMAPDIR_WIN)\\libssh2\\win32\\$(VCCONFIG)_dll\\libssh2.dll nmap-$(NMAP_VERSION) + cmd /c copy $(NMAPDIR_WIN)\\libz\\contrib\\vstudio\\vc12\\x86\\ZlibDll$(VCCONFIG)WithoutAsm\\zlibwapi.dll nmap-$(NMAP_VERSION) + mkdir -p nmap-$(NMAP_VERSION)/scripts cp -f $(NSE_FILES) nmap-$(NMAP_VERSION)/scripts/ - for f in `cd .. && find nselib -name .svn -prune -o -type d -print`; do \ + for f in `cd $(NMAPDIR) && find nselib -name .svn -prune -o -type d -print`; do \ mkdir -p nmap-$(NMAP_VERSION)/$$f; \ done - for f in `cd .. && find nselib -name .svn -prune -o -type f -print`; do \ - cp -f ../$$f nmap-$(NMAP_VERSION)/$$f; \ + for f in `cd $(NMAPDIR) && find nselib -name .svn -prune -o -type f -print`; do \ + cp -f $(NMAPDIR)/$$f nmap-$(NMAP_VERSION)/$$f; \ done - cp -r ../docs/licenses nmap-$(NMAP_VERSION)/ + cp -r $(NMAPDIR)/docs/licenses nmap-$(NMAP_VERSION)/ rm -rf nmap-$(NMAP_VERSION)/licenses/.svn - # TODO: change "-oem" to "$(OEM_SUFFIX)" when Npcap OEM is no longer needed for standard Nmap. - cp npcap-$(NPCAP_VERSION)-oem.exe nmap-$(NMAP_VERSION) cp $(NMAP_MSWIN32_AUX)/vcredist_x86.exe nmap-$(NMAP_VERSION) cp $(NMAP_MSWIN32_AUX)/vcredist2008_x86.exe nmap-$(NMAP_VERSION) - cp ../ncat/$(BASE_CONFIG)/ncat.exe nmap-$(NMAP_VERSION) - cp ../ncat/$(BASE_CONFIG)/ca-bundle.crt nmap-$(NMAP_VERSION) - cp ../nping/$(BASE_CONFIG)/nping.exe nmap-$(NMAP_VERSION) + cp $(NMAPDIR)/ncat/$(VCCONFIG)/ncat.exe nmap-$(NMAP_VERSION) + cp $(NMAPDIR)/ncat/$(VCCONFIG)/ca-bundle.crt nmap-$(NMAP_VERSION) + cp $(NMAPDIR)/nping/$(VCCONFIG)/nping.exe nmap-$(NMAP_VERSION) # Install the ndiff batch file wrapper in the zip distribution. - cp ../ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py + cp $(NMAPDIR)/ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat - cd ../zenmap && install_scripts/windows/copy_and_compile.bat - cp -R ../zenmap/dist/* nmap-$(NMAP_VERSION)/ - cp ../zenmap/README nmap-$(NMAP_VERSION)/ZENMAP_README - cp ../zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION) - cp ../ndiff/README nmap-$(NMAP_VERSION)/NDIFF_README + cd $(NMAPDIR)/zenmap && install_scripts/windows/copy_and_compile.bat + cp -R $(NMAPDIR)/zenmap/dist/* nmap-$(NMAP_VERSION)/ + cp $(NMAPDIR)/zenmap/README nmap-$(NMAP_VERSION)/ZENMAP_README + cp $(NMAPDIR)/zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION) + cp $(NMAPDIR)/ndiff/README nmap-$(NMAP_VERSION)/NDIFF_README + cp nsis/AddToPath.nsh nsis/shortcuts.ini nsis/final.ini nmap-$(NMAP_VERSION) -sign-files: nmap-$(NMAP_VERSION)/nmap.exe nmap-$(NMAP_VERSION)/ncat.exe nmap-$(NMAP_VERSION)/nping.exe nmap-$(NMAP_VERSION)/ndiff.exe nmap-$(NMAP_VERSION)/zenmap.exe nmap-$(NMAP_VERSION)/libssh2.dll nmap-$(NMAP_VERSION)/libcrypto-1_1.dll nmap-$(NMAP_VERSION)/libssl-1_1.dll nmap-$(NMAP_VERSION)/zlibwapi.dll +stage: stage-nmap stage-nmap-oem stage-common + +stage-nmap: + $(MAKE) OEM_SUFFIX= stage-nmap-main + +stage-nmap-oem: + $(MAKE) OEM_SUFFIX=-oem stage-nmap-main + +stage-nmap-main: nmap-$(NMAP_VERSION)/Nmap.nsi build-nmap${OEM_SUFFIX} + mkdir -p nmap-$(NMAP_VERSION)${OEM_SUFFIX} + cp $(VCCONFIG)${OEM_SUFFIX}/nmap.exe nmap-$(NMAP_VERSION)${OEM_SUFFIX}/ + +sign-files: nmap-$(NMAP_VERSION)-oem/nmap.exe nmap-$(NMAP_VERSION)/nmap.exe nmap-$(NMAP_VERSION)/ncat.exe nmap-$(NMAP_VERSION)/nping.exe nmap-$(NMAP_VERSION)/ndiff.exe nmap-$(NMAP_VERSION)/zenmap.exe nmap-$(NMAP_VERSION)/libssh2.dll nmap-$(NMAP_VERSION)/libcrypto-1_1.dll nmap-$(NMAP_VERSION)/libssl-1_1.dll nmap-$(NMAP_VERSION)/zlibwapi.dll # TODO: evaluate whether we should also sign the Python stuff for Zenmap, Ndiff "$(SIGNTOOL)" $(SIGNTOOL_ARGS) $^ + touch sign-files -bundle-nsis: nsis/Nmap.nsi sign-files - cp nsis/AddToPath.nsh nsis/Nmap.nsi nsis/shortcuts.ini nsis/final.ini nmap-$(NMAP_VERSION) - $(MAKENSIS) "/XOutFile nmap-$(NMAP_VERSION)$(OEM_SUFFIX)-setup.exe" $(NSIS_DEFINES) nmap-$(NMAP_VERSION)/Nmap.nsi - mv nmap-$(NMAP_VERSION)/nmap-$(NMAP_VERSION)$(OEM_SUFFIX)-setup.exe . - "$(SIGNTOOL)" $(SIGNTOOL_ARGS) nmap-$(NMAP_VERSION)$(OEM_SUFFIX)-setup.exe +bundle-nsis: sign-files + "$(MAKENSIS)" "/XOutFile nmap-$(NMAP_VERSION)-setup.exe" "/DNSISEXE=$(MAKENSIS_WIN)" nmap-$(NMAP_VERSION)/Nmap.nsi + mv nmap-$(NMAP_VERSION)/nmap-$(NMAP_VERSION)-setup.exe . + "$(MAKENSIS)" "/XOutFile nmap-$(NMAP_VERSION)-oem-setup.exe" "/DNSISEXE=$(MAKENSIS_WIN)" "/DNMAP_OEM=1" nmap-$(NMAP_VERSION)/Nmap.nsi + mv nmap-$(NMAP_VERSION)/nmap-$(NMAP_VERSION)-oem-setup.exe . + "$(SIGNTOOL)" $(SIGNTOOL_ARGS) nmap-$(NMAP_VERSION)-setup.exe nmap-$(NMAP_VERSION)-oem-setup.exe -bundle-zip: sign-files - rm -f nmap-$(NMAP_VERSION)$(OEM_SUFFIX)-win32.zip - zip -x nmap-$(NMAP_VERSION)/ZENMAP_README nmap-$(NMAP_VERSION)/zenmap/\* \ - nmap-$(NMAP_VERSION)/zenmap.exe nmap-$(NMAP_VERSION)/share/\* \ - nmap-$(NMAP_VERSION)/python27.dll nmap-$(NMAP_VERSION)/py2exe/\* \ - nmap-$(NMAP_VERSION)/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION)/w9xpopen.exe \ - nmap-$(NMAP_VERSION)/vcredist2008_x86.exe \ - nmap-$(NMAP_VERSION)/ndiff.exe nmap-$(NMAP_VERSION)/\*.ini \ - nmap-$(NMAP_VERSION)/Uninstall.exe nmap-$(NMAP_VERSION)/\*.nsi \ - nmap-$(NMAP_VERSION)/\*.nsh \ - -r nmap-$(NMAP_VERSION)$(OEM_SUFFIX)-win32.zip nmap-$(NMAP_VERSION) +bundle-zip: bundle-zip-public bundle-zip-oem -nmap.rc: nmap.rc.in ../nmap.h +bundle-zip-public: + $(MAKE) OEM_SUFFIX= bundle-zip-main + +bundle-zip-oem: + $(MAKE) OEM_SUFFIX=-oem bundle-zip-main + +bundle-zip-main: sign-files + rm -f nmap-$(NMAP_VERSION)${OEM_SUFFIX}-win32.zip + test -n "${OEM_SUFFIX}" \ + && cp -n -R nmap-$(NMAP_VERSION)/* nmap-$(NMAP_VERSION)${OEM_SUFFIX}/ \ + || true + cp npcap-$(NPCAP_VERSION)${OEM_SUFFIX}.exe nmap-$(NMAP_VERSION)${OEM_SUFFIX} + zip -x nmap-$(NMAP_VERSION)${OEM_SUFFIX}/ZENMAP_README \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/zenmap/\* \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/zenmap.exe \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/share/\* \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/python27.dll \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/py2exe/\* \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/COPYING_HIGWIDGETS \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/w9xpopen.exe \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/vcredist2008_x86.exe \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/ndiff.exe \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/\*.ini \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/Uninstall.exe \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/\*.nsi \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/\*.nsh \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/LICENSE.formatted \ + nmap-$(NMAP_VERSION)${OEM_SUFFIX}/icon1.ico \ + -r nmap-$(NMAP_VERSION)${OEM_SUFFIX}-win32.zip nmap-$(NMAP_VERSION)${OEM_SUFFIX} + rm nmap-$(NMAP_VERSION)${OEM_SUFFIX}/npcap-$(NPCAP_VERSION)${OEM_SUFFIX}.exe + +nmap.rc: nmap.rc.in $(NMAPDIR)/nmap.h sed -e '1i// Automatically generated from $<.' \ -e 's/@@FILEVERSION@@/"$(NMAP_VERSION)\\0"/' \ -e 's/@@COMMAVERSION@@/$(COMMA_VERSION)/' \ -e 's/@@PRODUCT_NAME@@/$(PRODUCT_NAME)/' \ "$<" > "$@" -nsis/Nmap.nsi: nsis/Nmap.nsi.in ../nmap.h +nmap-oem.rc: nmap.rc.in $(NMAPDIR)/nmap.h + sed -e '1i// Automatically generated from $<.' \ + -e 's/@@FILEVERSION@@/"$(NMAP_VERSION)\\0"/' \ + -e 's/@@COMMAVERSION@@/$(COMMA_VERSION)/' \ + -e 's/@@PRODUCT_NAME@@/$(PRODUCT_NAME) OEM/' \ + "$<" > "$@" + +nmap-$(NMAP_VERSION)/Nmap.nsi: nsis/Nmap.nsi.in $(NMAPDIR)/nmap.h test -n "$(NPCAP_VERSION)" # Make sure NPcap is present + mkdir -p nmap-$(NMAP_VERSION) sed -e '1i; Automatically generated from $<.' \ -e 's/@@VIPRODUCTVERSION@@/"$(NMAP_NUM_VERSION)"/' \ -e 's/@@VERSION@@/"$(NMAP_VERSION)"/' \ -e 's/@@NPCAP_VERSION@@/$(NPCAP_VERSION)/' \ -e 's/@@SIGNTOOL@@/$(SIGNTOOL_SUBST)/' \ - -e 's/@@OEM_SUFFIX@@/$(OEM_SUFFIX)/' \ -e 's/@@PRODUCT_NAME@@/$(PRODUCT_NAME)/' \ "$<" > "$@" -LICENSE: ../COPYING +LICENSE.formatted: $(NMAPDIR)/LICENSE ./license-format/licformat.sh "$<" > "$@" clean: "$(VCEXPRESS)" nmap.sln /clean - rm -rf Debug Release ReleaseOEM nmapbuild.log nmap.rc nsis/Nmap.nsi LICENSE + rm -rf nmap-$(NMAP_VERSION) nmap-$(NMAP_VERSION)-oem Debug Release Release-oem nmapbuild.log nmap.rc nmap-oem.rc LICENSE.formatted diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln index 0c948f925..4b3e5164e 100644 --- a/mswin32/nmap.sln +++ b/mswin32/nmap.sln @@ -41,8 +41,8 @@ Global Ncat Static|x64 = Ncat Static|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - ReleaseOEM|Win32 = ReleaseOEM|Win32 - ReleaseOEM|x64 = ReleaseOEM|x64 + Release-oem|Win32 = Release-oem|Win32 + Release-oem|x64 = Release-oem|x64 ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32 ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64 EndGlobalSection @@ -55,9 +55,9 @@ Global {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32 {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32 {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseOEM|Win32.ActiveCfg = ReleaseOEM|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseOEM|Win32.Build.0 = ReleaseOEM|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseOEM|x64.ActiveCfg = ReleaseOEM|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release-oem|Win32.ActiveCfg = Release-oem|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release-oem|Win32.Build.0 = Release-oem|Win32 + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release-oem|x64.ActiveCfg = Release-oem|Win32 {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -70,9 +70,9 @@ Global {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32 {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32 {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseOEM|x64.ActiveCfg = ReleaseNoPcap|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release-oem|Win32.ActiveCfg = Release|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release-oem|Win32.Build.0 = Release|Win32 + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release-oem|x64.ActiveCfg = ReleaseNoPcap|Win32 {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseNoPcap|Win32 {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseNoPcap|Win32 {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|Win32 @@ -84,9 +84,9 @@ Global {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32 {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32 {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|x64.ActiveCfg = Release|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release-oem|Win32.ActiveCfg = Release|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release-oem|Win32.Build.0 = Release|Win32 + {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release-oem|x64.ActiveCfg = Release|Win32 {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -99,9 +99,9 @@ Global {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32 {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32 {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release-oem|Win32.ActiveCfg = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release-oem|Win32.Build.0 = Release|Win32 + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release-oem|x64.ActiveCfg = Release|Win32 {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -113,9 +113,9 @@ Global {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32 {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32 {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release-oem|Win32.ActiveCfg = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release-oem|Win32.Build.0 = Release|Win32 + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release-oem|x64.ActiveCfg = Release|Win32 {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -127,9 +127,9 @@ Global {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.ActiveCfg = Release|Win32 {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.Build.0 = Release|Win32 {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|Win32 - {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release-oem|Win32.ActiveCfg = Release|Win32 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release-oem|Win32.Build.0 = Release|Win32 + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release-oem|x64.ActiveCfg = Release|Win32 {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -142,9 +142,9 @@ Global {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.ActiveCfg = Release|Win32 {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.Build.0 = Release|Win32 {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release-oem|Win32.ActiveCfg = Release|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release-oem|Win32.Build.0 = Release|Win32 + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release-oem|x64.ActiveCfg = Release|Win32 {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -156,9 +156,9 @@ Global {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.ActiveCfg = Release|Win32 {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.Build.0 = Release|Win32 {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|Win32 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release-oem|Win32.ActiveCfg = Release|Win32 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release-oem|Win32.Build.0 = Release|Win32 + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release-oem|x64.ActiveCfg = Release|Win32 {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -170,9 +170,9 @@ Global {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.ActiveCfg = Release|Win32 {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.Build.0 = Release|Win32 {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|Win32 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release-oem|Win32.ActiveCfg = Release|Win32 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release-oem|Win32.Build.0 = Release|Win32 + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release-oem|x64.ActiveCfg = Release|Win32 {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -185,9 +185,9 @@ Global {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.ActiveCfg = Release|Win32 {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.Build.0 = Release|Win32 {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release-oem|Win32.ActiveCfg = Release|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release-oem|Win32.Build.0 = Release|Win32 + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release-oem|x64.ActiveCfg = Release|Win32 {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -203,10 +203,10 @@ Global {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64 - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseOEM|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseOEM|Win32.Build.0 = ReleaseWithoutAsm|Win32 - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseOEM|x64.ActiveCfg = ReleaseWithoutAsm|x64 - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseOEM|x64.Build.0 = ReleaseWithoutAsm|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release-oem|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release-oem|Win32.Build.0 = ReleaseWithoutAsm|Win32 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release-oem|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release-oem|x64.Build.0 = ReleaseWithoutAsm|x64 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 @@ -220,9 +220,9 @@ Global {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.ActiveCfg = Release|Win32 {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.Build.0 = Release|Win32 {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|x64.ActiveCfg = Release|Win32 - {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseOEM|Win32.Build.0 = Release|Win32 - {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseOEM|x64.ActiveCfg = Release|Win32 + {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release-oem|Win32.ActiveCfg = Release|Win32 + {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release-oem|Win32.Build.0 = Release|Win32 + {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release-oem|x64.ActiveCfg = Release|Win32 {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 @@ -236,9 +236,9 @@ Global {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseOEM|Win32.ActiveCfg = Release|Win32 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseOEM|x64.ActiveCfg = ReleaseWithoutAsm|x64 - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseOEM|x64.Build.0 = ReleaseWithoutAsm|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release-oem|Win32.ActiveCfg = Release|Win32 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release-oem|x64.ActiveCfg = ReleaseWithoutAsm|x64 + {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release-oem|x64.Build.0 = ReleaseWithoutAsm|x64 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj index 22cac7b88..e7687349d 100644 --- a/mswin32/nmap.vcxproj +++ b/mswin32/nmap.vcxproj @@ -5,8 +5,8 @@ Debug Win32 - - ReleaseOEM + + Release-oem Win32 @@ -25,7 +25,7 @@ MultiByte v120 - + Application false MultiByte @@ -44,7 +44,7 @@ - + @@ -59,7 +59,7 @@ @@ -93,7 +93,7 @@ liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib .\Debug\nmap.exe true - ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllRelease;%(AdditionalLibraryDirectories) + ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) true @@ -134,7 +134,7 @@ liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib .\$(Configuration)/nmap.exe true - ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllRelease;%(AdditionalLibraryDirectories) + ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) .\$(Configuration)/nmap.pdb @@ -145,7 +145,7 @@ /LTCG %(AdditionalOptions) - + .\$(Configuration)/nmap.tlb @@ -171,7 +171,7 @@ liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibwapi.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libcrypto.lib;libssl.lib;shell32.lib;libnetutil.lib .\$(Configuration)/nmap.exe true - ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllRelease;%(AdditionalLibraryDirectories) + ..\libssh2\win32\Release_dll;..\..\nmap-mswin32-aux\Npcap\Lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc12\x86\ZlibDllReleaseWithoutAsm;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) .\$(Configuration)/nmap.pdb @@ -236,11 +236,12 @@ Sync Sync - Sync + Sync - + + @@ -301,13 +302,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... @@ -315,13 +316,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... @@ -329,13 +330,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... @@ -343,13 +344,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... @@ -357,13 +358,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... @@ -371,13 +372,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... @@ -385,13 +386,13 @@ $(TargetDir)%(Filename);%(Outputs) Copying %(Filename) to output directory... - Copying %(Filename) to output directory... + Copying %(Filename) to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul $(TargetDir)%(Filename);%(Outputs) - $(TargetDir)%(Filename);%(Outputs) + $(TargetDir)%(Filename);%(Outputs) Copying %(Filename).xsl to output directory... @@ -399,13 +400,13 @@ $(TargetDir)%(Filename).xsl;%(Outputs) Copying %(Filename).xsl to output directory... - Copying %(Filename).xsl to output directory... + Copying %(Filename).xsl to output directory... copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul - copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul + copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul $(TargetDir)%(Filename).xsl;%(Outputs) - $(TargetDir)%(Filename).xsl;%(Outputs) + $(TargetDir)%(Filename).xsl;%(Outputs) @@ -441,4 +442,4 @@ - \ No newline at end of file + diff --git a/mswin32/nsis/Nmap.nsi.in b/mswin32/nsis/Nmap.nsi.in index 5a84ca6ad..a89df682c 100644 --- a/mswin32/nsis/Nmap.nsi.in +++ b/mswin32/nsis/Nmap.nsi.in @@ -7,9 +7,9 @@ ;; /REGISTERPATH=NO don't add the installation directory to PATH ;; /NPCAP=NO don't install Npcap ;; /REGISTRYMODS=NO don't install performance-related registry mods -;; /ZENMAP=NO don't install Zenmap +;; /ZENMAP=NO don't install Zenmap (non-OEM only) ;; /NCAT=NO don't install Ncat -;; /NDIFF=NO don't install Ndiff +;; /NDIFF=NO don't install Ndiff (non-OEM only) ;; /NPING=NO don't install Nping ;; /D=C:\dir\... install to C:\dir\... (overrides InstallDir) ;; @@ -25,7 +25,7 @@ !endif !ifdef NMAP_OEM -!include "..\..\..\nmap-build\nmap-oem.nsh" +!include "..\..\nmap-build\nmap-oem.nsh" !endif ;-------------------------------- @@ -38,8 +38,11 @@ ;-------------------------------- ;General +!ifdef NMAP_OEM +!define NMAP_NAME "@@PRODUCT_NAME@@ OEM" +!else !define NMAP_NAME "@@PRODUCT_NAME@@" -!define FILE_SUFFIX "@@OEM_SUFFIX@@" +!endif ;Name and file Name "${NMAP_NAME}" @@ -61,7 +64,7 @@ ; it is invoked, will just write the uninstaller to some location, and then exit. ; Be sure to substitute the name of this script here. - !system "$\"${NSISDIR}\makensis$\" /DINNER Nmap.nsi" = 0 + !system "$\"${NSISEXE}$\" /DINNER Nmap.nsi" = 0 ; So now run that installer we just created as %TEMP%\tempinstaller.exe. Since it ; calls quit the return value isn't zero. @@ -108,13 +111,13 @@ ;-------------------------------- ;Pages - !insertmacro MUI_PAGE_LICENSE "..\LICENSE" + !insertmacro MUI_PAGE_LICENSE "LICENSE.formatted" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES +!ifndef NMAP_OEM Page custom shortcutsPage makeShortcuts +!endif Page custom finalPage doFinal ;-------------------------------- @@ -128,15 +131,19 @@ ;-------------------------------- ;Variables +!ifndef NMAP_OEM Var zenmapset +Var vcredist2008set +!endif Var addremoveset Var vcredist2013set -Var vcredist2008set ;-------------------------------- ;Reserves +!ifndef NMAP_OEM ReserveFile "shortcuts.ini" +!endif ReserveFile "final.ini" !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS @@ -146,6 +153,7 @@ ReserveFile "final.ini" ;The .onInit function is below the Sections because it needs to refer to ;the Section IDs which are not defined yet. +!ifndef NMAP_OEM Function shortcutsPage StrCmp $zenmapset "" skip @@ -175,6 +183,7 @@ Function makeShortcuts skip: FunctionEnd +!endif Function finalPage ; diplay a page saying everything's finished @@ -226,7 +235,7 @@ Section "Nmap Core Files" SecCore SetOverwrite on File ${STAGE_DIR}\CHANGELOG - File ${STAGE_DIR}\COPYING + File ${STAGE_DIR}\LICENSE File ${STAGE_DIR}\nmap-mac-prefixes File ${STAGE_DIR}\nmap-os-db File ${STAGE_DIR}\nmap-payloads @@ -234,7 +243,11 @@ Section "Nmap Core Files" SecCore File ${STAGE_DIR}\nmap-rpc File ${STAGE_DIR}\nmap-service-probes File ${STAGE_DIR}\nmap-services +!ifdef NMAP_OEM + File ${STAGE_DIR}-oem\nmap.exe +!else File ${STAGE_DIR}\nmap.exe +!endif File ${STAGE_DIR}\nse_main.lua File ${STAGE_DIR}\nmap.xsl File ${STAGE_DIR}\nmap_performance.reg @@ -247,7 +260,7 @@ Section "Nmap Core Files" SecCore File libssl-1_1.dll File /r /x mswin32 /x .svn /x ncat ${STAGE_DIR}\scripts File /r /x mswin32 /x .svn ${STAGE_DIR}\nselib - File ..\icon1.ico + File icon1.ico ;Store installation folder WriteRegStr HKCU "Software\${NMAP_NAME}" "" $INSTDIR @@ -262,23 +275,18 @@ Section "Register Nmap Path" SecRegisterPath Call AddToPath SectionEnd -Section "Npcap @@NPCAP_VERSION@@" SecNpcap !ifdef NMAP_OEM +Section "Npcap @@NPCAP_VERSION@@ OEM" SecNpcap !insertmacro NPCAP_OEM_INSTALL "npcap-@@NPCAP_VERSION@@-oem.exe" +SectionEnd !else +Section "Npcap @@NPCAP_VERSION@@" SecNpcap SetOutPath "$PLUGINSDIR" SetOverwrite on - File "..\npcap-@@NPCAP_VERSION@@-oem.exe" - IfSilent npcap_silent npcap_loud - npcap_silent: - ExecWait '"$PLUGINSDIR\npcap-@@NPCAP_VERSION@@-oem.exe" /S /winpcap_mode=no' - Goto delete_npcap - npcap_loud: - ExecWait '"$PLUGINSDIR\npcap-@@NPCAP_VERSION@@-oem.exe" /winpcap_mode=no' - delete_npcap: - Delete "$PLUGINSDIR\npcap-@@NPCAP_VERSION@@-oem.exe" -!endif + File "..\npcap-@@NPCAP_VERSION@@.exe" + ExecWait '"$PLUGINSDIR\npcap-@@NPCAP_VERSION@@.exe" /loopback_support=no' SectionEnd +!endif Section "Network Performance Improvements" SecPerfRegistryMods SetOutPath "$PLUGINSDIR" @@ -290,6 +298,7 @@ Section "Network Performance Improvements" SecPerfRegistryMods CopyFiles /SILENT "$PLUGINSDIR\nmap_performance.reg" "$INSTDIR" SectionEnd +!ifndef NMAP_OEM Section "Zenmap (GUI Frontend)" SecZenmap SetOutPath "$INSTDIR" SetOverwrite on @@ -304,15 +313,6 @@ Section "Zenmap (GUI Frontend)" SecZenmap Call create_uninstaller SectionEnd -Section "Ncat (Modern Netcat reincarnation)" SecNcat - SetOutPath "$INSTDIR" - SetOverwrite on - File ${STAGE_DIR}\ncat.exe - File ${STAGE_DIR}\ca-bundle.crt - Call vcredist2013installer - Call create_uninstaller -SectionEnd - Section "Ndiff (Scan comparison tool)" SecNdiff SetOutPath "$INSTDIR" SetOverwrite on @@ -323,6 +323,16 @@ Section "Ndiff (Scan comparison tool)" SecNdiff Call vcredist2008installer Call create_uninstaller SectionEnd +!endif + +Section "Ncat (Modern Netcat reincarnation)" SecNcat + SetOutPath "$INSTDIR" + SetOverwrite on + File ${STAGE_DIR}\ncat.exe + File ${STAGE_DIR}\ca-bundle.crt + Call vcredist2013installer + Call create_uninstaller +SectionEnd Section "Nping (Packet generator)" SecNping SetOutPath "$INSTDIR" @@ -369,6 +379,7 @@ Function vcredist2013installer vcredist_done: FunctionEnd +!ifndef NMAP_OEM Function vcredist2008installer StrCmp $vcredist2008set "" 0 vcredist2008_done StrCpy $vcredist2008set "true" @@ -402,6 +413,7 @@ Function vcredist2008installer DetailPrint "Microsoft Visual C++ 2008 Redistributable was successfully installed" vcredist2008_done: FunctionEnd +!endif Function create_uninstaller StrCmp $addremoveset "" 0 skipaddremove @@ -451,11 +463,16 @@ Function .onInit !endif !ifndef NMAP_OEM - ; Future releases may limit silent install to OEM-licensed installer - ;SetSilent normal + ${If} ${Silent} + SetSilent normal + MessageBox MB_OK|MB_ICONEXCLAMATION "Silent installation is only supported in Nmap OEM - https://nmap.org/oem/" + Quit + ${EndIf} + + ; shortcuts apply only to Zenmap, not included in NMAP_OEM + !insertmacro MUI_INSTALLOPTIONS_EXTRACT "shortcuts.ini" !endif - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "shortcuts.ini" !insertmacro MUI_INSTALLOPTIONS_EXTRACT "final.ini" ;Disable section checkboxes based on options. For example /ZENMAP=NO to avoid @@ -465,9 +482,11 @@ Function .onInit !insertmacro OptionDisableSection $0 "/REGISTERPATH=" ${SecRegisterPath} !insertmacro OptionDisableSection $0 "/NPCAP=" ${SecNpcap} !insertmacro OptionDisableSection $0 "/REGISTRYMODS=" ${SecPerfRegistryMods} +!ifndef NMAP_OEM !insertmacro OptionDisableSection $0 "/ZENMAP=" ${SecZenmap} - !insertmacro OptionDisableSection $0 "/NCAT=" ${SecNcat} !insertmacro OptionDisableSection $0 "/NDIFF=" ${SecNdiff} +!endif + !insertmacro OptionDisableSection $0 "/NCAT=" ${SecNcat} !insertmacro OptionDisableSection $0 "/NPING=" ${SecNping} FunctionEnd @@ -479,9 +498,11 @@ FunctionEnd LangString DESC_SecRegisterPath ${LANG_ENGLISH} "Registers Nmap path to System path so you can execute it from any directory" LangString DESC_SecNpcap ${LANG_ENGLISH} "Installs Npcap @@NPCAP_VERSION@@ (required for most Nmap scans unless it is already installed)" LangString DESC_SecPerfRegistryMods ${LANG_ENGLISH} "Modifies Windows registry values to improve TCP connect scan performance. Recommended." +!ifndef NMAP_OEM LangString DESC_SecZenmap ${LANG_ENGLISH} "Installs Zenmap, the official Nmap graphical user interface, and Visual C++ 2008 runtime components. Recommended." - LangString DESC_SecNcat ${LANG_ENGLISH} "Installs Ncat, Nmap's Netcat replacement." LangString DESC_SecNdiff ${LANG_ENGLISH} "Installs Ndiff, a tool for comparing Nmap XML files." +!endif + LangString DESC_SecNcat ${LANG_ENGLISH} "Installs Ncat, Nmap's Netcat replacement." LangString DESC_SecNping ${LANG_ENGLISH} "Installs Nping, a packet generation tool." ;Assign language strings to sections @@ -490,9 +511,11 @@ FunctionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecNpcap} $(DESC_SecNpcap) !insertmacro MUI_DESCRIPTION_TEXT ${SecRegisterPath} $(DESC_SecRegisterPath) !insertmacro MUI_DESCRIPTION_TEXT ${SecPerfRegistryMods} $(DESC_SecPerfRegistryMods) +!ifndef NMAP_OEM !insertmacro MUI_DESCRIPTION_TEXT ${SecZenmap} $(DESC_SecZenmap) - !insertmacro MUI_DESCRIPTION_TEXT ${SecNcat} $(DESC_SecNcat) !insertmacro MUI_DESCRIPTION_TEXT ${SecNdiff} $(DESC_SecNdiff) +!endif + !insertmacro MUI_DESCRIPTION_TEXT ${SecNcat} $(DESC_SecNcat) !insertmacro MUI_DESCRIPTION_TEXT ${SecNping} $(DESC_SecNping) !insertmacro MUI_FUNCTION_DESCRIPTION_END ;-------------------------------- @@ -537,7 +560,7 @@ Section "Uninstall" nmap_installed: Delete "$INSTDIR\3rd-party-licenses.txt" Delete "$INSTDIR\CHANGELOG" - Delete "$INSTDIR\COPYING" + Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\nmap-mac-prefixes" Delete "$INSTDIR\nmap-os-db" Delete "$INSTDIR\nmap-payloads" diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index a43f5add0..dea786206 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/getaddrinfo.c b/nbase/getaddrinfo.c index d9f7cb25f..4a06dbd0e 100644 --- a/nbase/getaddrinfo.c +++ b/nbase/getaddrinfo.c @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/getnameinfo.c b/nbase/getnameinfo.c index 7914a20f9..6cd980e4c 100644 --- a/nbase/getnameinfo.c +++ b/nbase/getnameinfo.c @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase.h b/nbase/nbase.h index 2078448e6..41090f2f0 100644 --- a/nbase/nbase.h +++ b/nbase/nbase.h @@ -9,126 +9,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_addrset.c b/nbase/nbase_addrset.c index 617386e17..27acb9552 100644 --- a/nbase/nbase_addrset.c +++ b/nbase/nbase_addrset.c @@ -2,126 +2,58 @@ * nbase_addrset.c -- Address set (addrset) management. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_config.h.in b/nbase/nbase_config.h.in index bcca04f63..127dde00b 100644 --- a/nbase/nbase_config.h.in +++ b/nbase/nbase_config.h.in @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_crc32ct.h b/nbase/nbase_crc32ct.h index ec366ed98..cfaaed5fd 100644 --- a/nbase/nbase_crc32ct.h +++ b/nbase/nbase_crc32ct.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_ipv6.h b/nbase/nbase_ipv6.h index cff64d910..58cf93578 100644 --- a/nbase/nbase_ipv6.h +++ b/nbase/nbase_ipv6.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_memalloc.c b/nbase/nbase_memalloc.c index b40870e96..58b22fddd 100644 --- a/nbase/nbase_memalloc.c +++ b/nbase/nbase_memalloc.c @@ -8,126 +8,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_misc.c b/nbase/nbase_misc.c index f23ae3472..c11fc796a 100644 --- a/nbase/nbase_misc.c +++ b/nbase/nbase_misc.c @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_rnd.c b/nbase/nbase_rnd.c index df02c996e..ebfbac41c 100644 --- a/nbase/nbase_rnd.c +++ b/nbase/nbase_rnd.c @@ -11,126 +11,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_str.c b/nbase/nbase_str.c index e4baa9486..cd5c8048a 100644 --- a/nbase/nbase_str.c +++ b/nbase/nbase_str.c @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_time.c b/nbase/nbase_time.c index 57637202e..9cbeae887 100644 --- a/nbase/nbase_time.c +++ b/nbase/nbase_time.c @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_winconfig.h b/nbase/nbase_winconfig.h index cdd909f1a..878fb4415 100644 --- a/nbase/nbase_winconfig.h +++ b/nbase/nbase_winconfig.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_winunix.c b/nbase/nbase_winunix.c index 7350d2697..dad723071 100644 --- a/nbase/nbase_winunix.c +++ b/nbase/nbase_winunix.c @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/nbase_winunix.h b/nbase/nbase_winunix.h index 909fe605b..c2496c1f3 100644 --- a/nbase/nbase_winunix.h +++ b/nbase/nbase_winunix.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nbase/strcasecmp.c b/nbase/strcasecmp.c index f0809e747..2ceb8416f 100644 --- a/nbase/strcasecmp.c +++ b/nbase/strcasecmp.c @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/COPYING b/ncat/LICENSE similarity index 62% rename from ncat/COPYING rename to ncat/LICENSE index 58fc9fed8..debee8f0b 100644 --- a/ncat/COPYING +++ b/ncat/LICENSE @@ -1,3 +1,3 @@ Ncat is distributed under the same license terms as Nmap. See the -COPYING file in the Nmap tarball, the man page legal section, or +LICENSE file in the Nmap tarball, the man page legal section, or https://nmap.org/man/man-legal.html . diff --git a/ncat/base64.c b/ncat/base64.c index a68a0c13a..409e47fae 100644 --- a/ncat/base64.c +++ b/ncat/base64.c @@ -2,126 +2,58 @@ * base64.c -- Base64 encoding. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/base64.h b/ncat/base64.h index 16297d50c..065f9fc07 100644 --- a/ncat/base64.h +++ b/ncat/base64.h @@ -2,126 +2,58 @@ * base64.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/config_win.h b/ncat/config_win.h index 67a50400d..4a16b0e5e 100644 --- a/ncat/config_win.h +++ b/ncat/config_win.h @@ -2,126 +2,58 @@ * config_win.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/configure b/ncat/configure index 0cac17964..5d800b95e 100755 --- a/ncat/configure +++ b/ncat/configure @@ -2246,10 +2246,6 @@ ac_config_headers="$ac_config_headers config.h" - - - - ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt index f45de3eef..3515f7634 100644 --- a/ncat/docs/ncat.usage.txt +++ b/ncat/docs/ncat.usage.txt @@ -1,4 +1,4 @@ -Ncat 7.80SVN ( https://nmap.org/ncat ) +Ncat 7.90 ( https://nmap.org/ncat ) Usage: ncat [options] [hostname] [port] Options taking a time assume seconds. Append 'ms' for milliseconds, diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml index e6fd64bb2..653ae36a2 100644 --- a/ncat/docs/ncat.xml +++ b/ncat/docs/ncat.xml @@ -1134,10 +1134,8 @@ Ncat Copyright and Licensing copyright - GNU General Public License - - Ncat is (C) 2005–2018 Insecure.Com LLC. It is distributed + Ncat is (C) 2005–2020 Insecure.Com 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 . @@ -1152,7 +1150,7 @@ Attribution License. This allows you redistribute and modify the work as you desire, as long as you credit the original source. Alternatively, you may choose to treat this document as falling under - the same license as Ncap itself (discussed previously). + the same license as Ncat itself (discussed previously). @@ -1185,9 +1183,9 @@ contributions, just say so when you send them. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License v2.0 for more details at , or in the COPYING file +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap Public Source +License for more details at , +or in the LICENSE file included with Nmap. diff --git a/ncat/http.c b/ncat/http.c index 33c5a6acc..29105e34e 100644 --- a/ncat/http.c +++ b/ncat/http.c @@ -2,126 +2,58 @@ * http.c -- HTTP network interaction, parsing, and construction. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/http.h b/ncat/http.h index 91f33cb10..230f08549 100644 --- a/ncat/http.h +++ b/ncat/http.h @@ -2,126 +2,58 @@ * http.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/http_digest.c b/ncat/http_digest.c index 8d7a19a9f..ca808092a 100644 --- a/ncat/http_digest.c +++ b/ncat/http_digest.c @@ -2,126 +2,58 @@ * ncat_digest.c -- HTTP Digest authentication handling. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat.h b/ncat/ncat.h index 8f1ec7c1f..259213b08 100644 --- a/ncat/ncat.h +++ b/ncat/ncat.h @@ -2,126 +2,58 @@ * ncat.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ @@ -152,7 +84,7 @@ /* Ncat information for output, etc. */ #define NCAT_NAME "Ncat" #define NCAT_URL "https://nmap.org/ncat" -#define NCAT_VERSION "7.80SVN" +#define NCAT_VERSION "7.90" #ifndef __GNUC__ #ifndef __attribute__ diff --git a/ncat/ncat_config.h b/ncat/ncat_config.h index b098dd5e7..f7d9b7137 100644 --- a/ncat/ncat_config.h +++ b/ncat/ncat_config.h @@ -2,126 +2,58 @@ * ncat_config.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c index 7a0848050..606eac412 100644 --- a/ncat/ncat_connect.c +++ b/ncat/ncat_connect.c @@ -2,126 +2,58 @@ * ncat_connect.c -- Ncat connect mode. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_connect.h b/ncat/ncat_connect.h index f0660e5d1..fdea7ec36 100644 --- a/ncat/ncat_connect.h +++ b/ncat/ncat_connect.h @@ -2,126 +2,58 @@ * ncat_connect.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_core.c b/ncat/ncat_core.c index 450f62710..d1a88ac94 100644 --- a/ncat/ncat_core.c +++ b/ncat/ncat_core.c @@ -2,126 +2,58 @@ * ncat_core.c -- Contains option definitions and miscellaneous functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_core.h b/ncat/ncat_core.h index ebf266f23..f03813dc5 100644 --- a/ncat/ncat_core.h +++ b/ncat/ncat_core.h @@ -2,126 +2,58 @@ * ncat_core.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_exec.h b/ncat/ncat_exec.h index c1c080e54..b9ebfb89b 100644 --- a/ncat/ncat_exec.h +++ b/ncat/ncat_exec.h @@ -2,126 +2,58 @@ * ncat_exec.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_exec_win.c b/ncat/ncat_exec_win.c index 83f5dee59..79b2641ef 100644 --- a/ncat/ncat_exec_win.c +++ b/ncat/ncat_exec_win.c @@ -2,126 +2,58 @@ * ncat_exec_win.c -- Windows-specific subprocess execution. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c index 494e66376..84ece94d0 100644 --- a/ncat/ncat_listen.c +++ b/ncat/ncat_listen.c @@ -2,126 +2,58 @@ * ncat_listen.c -- --listen mode. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_listen.h b/ncat/ncat_listen.h index e70e2ef94..f2617630f 100644 --- a/ncat/ncat_listen.h +++ b/ncat/ncat_listen.h @@ -2,126 +2,58 @@ * ncat_listen.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_lua.c b/ncat/ncat_lua.c index 3e329e546..941de844c 100644 --- a/ncat/ncat_lua.c +++ b/ncat/ncat_lua.c @@ -2,126 +2,58 @@ * ncat_lua.c -- ncat lua facilities * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_lua.h b/ncat/ncat_lua.h index 5976df0f2..2a6864533 100644 --- a/ncat/ncat_lua.h +++ b/ncat/ncat_lua.h @@ -2,126 +2,58 @@ * ncat_lua.h -- ncat lua facilities header file * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c index f36db49a9..8942d83cb 100644 --- a/ncat/ncat_main.c +++ b/ncat/ncat_main.c @@ -3,126 +3,58 @@ * to mode-specific functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_posix.c b/ncat/ncat_posix.c index 12207c066..b9fc3bc0b 100644 --- a/ncat/ncat_posix.c +++ b/ncat/ncat_posix.c @@ -2,126 +2,58 @@ * ncat_posix.c -- POSIX-specific functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_proxy.c b/ncat/ncat_proxy.c index fc9cb49ec..5ba10a61a 100644 --- a/ncat/ncat_proxy.c +++ b/ncat/ncat_proxy.c @@ -2,126 +2,58 @@ * ncat_proxy.c -- HTTP proxy server. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_proxy.h b/ncat/ncat_proxy.h index d625cee4e..b6b547671 100644 --- a/ncat/ncat_proxy.h +++ b/ncat/ncat_proxy.h @@ -2,126 +2,58 @@ * ncat_proxy.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c index aaffdad62..dc1db31bb 100644 --- a/ncat/ncat_ssl.c +++ b/ncat/ncat_ssl.c @@ -2,126 +2,58 @@ * ncat_ssl.c -- SSL support functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_ssl.h b/ncat/ncat_ssl.h index ea2457760..b3ce6675a 100644 --- a/ncat/ncat_ssl.h +++ b/ncat/ncat_ssl.h @@ -2,126 +2,58 @@ * ncat_ssl.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/ncat_win.c b/ncat/ncat_win.c index dfdd57241..d4370eb2b 100644 --- a/ncat/ncat_win.c +++ b/ncat/ncat_win.c @@ -2,126 +2,58 @@ * ncat_win.c -- Windows-specific functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/sockaddr_u.h b/ncat/sockaddr_u.h index 68cb0a0d5..f2a443f86 100644 --- a/ncat/sockaddr_u.h +++ b/ncat/sockaddr_u.h @@ -3,126 +3,58 @@ * strict-aliasing rules. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/sys_wrap.c b/ncat/sys_wrap.c index 3a1ca766d..f7f032f3b 100644 --- a/ncat/sys_wrap.c +++ b/ncat/sys_wrap.c @@ -2,126 +2,58 @@ * sys_wrap.c -- Error-checked wrappers around common functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/sys_wrap.h b/ncat/sys_wrap.h index d14e615e6..3fe8133a9 100644 --- a/ncat/sys_wrap.h +++ b/ncat/sys_wrap.h @@ -2,126 +2,58 @@ * sys_wrap.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/util.c b/ncat/util.c index 2f9db964a..5d370ee9d 100644 --- a/ncat/util.c +++ b/ncat/util.c @@ -2,126 +2,58 @@ * util.c -- Various utility functions. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ncat/util.h b/ncat/util.h index ff9fce427..2049d48d2 100644 --- a/ncat/util.h +++ b/ncat/util.h @@ -2,126 +2,58 @@ * util.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/ndiff/COPYING b/ndiff/LICENSE similarity index 66% rename from ndiff/COPYING rename to ndiff/LICENSE index d187a998c..a0fef02f8 100644 --- a/ndiff/COPYING +++ b/ndiff/LICENSE @@ -1,4 +1,4 @@ Copyright 2008 Insecure.Com LLC -Ndiff is distributed under the same license as Nmap. See the file COPYING in -the Nmap source distribution or https://nmap.org/data/COPYING. See +Ndiff is distributed under the same license as Nmap. See the file LICENSE in +the Nmap source distribution or https://nmap.org/data/LICENSE. See https://nmap.org/book/man-legal.html for more details. diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py index e9847c6b7..42a091a79 100755 --- a/ndiff/ndiff.py +++ b/ndiff/ndiff.py @@ -6,8 +6,8 @@ # differences. # # Copyright 2008 Insecure.Com LLC -# Ndiff is distributed under the same license as Nmap. See the file COPYING or -# https://nmap.org/data/COPYING. See https://nmap.org/book/man-legal.html for +# Ndiff is distributed under the same license as Nmap. See the file LICENSE or +# https://nmap.org/data/LICENSE. See https://nmap.org/book/man-legal.html for # more details. # # David Fifield diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff index eb87d2590..e33c46e40 100755 --- a/ndiff/scripts/ndiff +++ b/ndiff/scripts/ndiff @@ -6,8 +6,8 @@ # differences. # # Copyright 2008 Insecure.Com LLC -# Ndiff is distributed under the same license as Nmap. See the file COPYING or -# https://nmap.org/data/COPYING. See https://nmap.org/book/man-legal.html for more +# Ndiff is distributed under the same license as Nmap. See the file LICENSE or +# https://nmap.org/data/LICENSE. See https://nmap.org/book/man-legal.html for more # details. # # David Fifield diff --git a/nmap-header-template.cc b/nmap-header-template.cc index 1cba28f48..3b1c77a5c 100644 --- a/nmap-header-template.cc +++ b/nmap-header-template.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap-os-db b/nmap-os-db index 053c6a909..5e00385e9 100644 --- a/nmap-os-db +++ b/nmap-os-db @@ -11,9 +11,9 @@ # incorporated into Nmap, relicensed, etc. # # This collection of fingerprint data is (C) 1996-2020 by Insecure.Com -# LLC. It is distributed under the Nmap Open Source license as -# provided in the COPYING file of the source distribution or at -# https://nmap.org/data/COPYING . Note that this license +# 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). diff --git a/nmap-payloads b/nmap-payloads index 36b5722cf..d5f80dd26 100644 --- a/nmap-payloads +++ b/nmap-payloads @@ -8,9 +8,9 @@ # Some of them are taken from nmap-service-probes. # # This collection of data is (C) 1996-2010 by Insecure.Com -# LLC. It is distributed under the Nmap Open Source license as -# provided in the COPYING file of the source distribution or at -# https://nmap.org/data/COPYING . Note that this license +# 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). diff --git a/nmap-rpc b/nmap-rpc index 91aa10c52..65269d027 100644 --- a/nmap-rpc +++ b/nmap-rpc @@ -6,91 +6,18 @@ # * the Nmap community for contributing entries. Someday we might * # * reorder this with the most popular services first to make scans * # * faster. * -# * * -# ***********************IMPORTANT NMAP LICENSE TERMS************************ -# * * -# * The Nmap Security Scanner is (C) 1996-2010 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 with the clarifications and exceptions described * -# * below. 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@insecure.com). Dozens of software vendors already * -# * license Nmap technology such as host discovery, port scanning, OS * -# * detection, and version detection. * -# * * -# * Note that the GPL places important restrictions on "derived works", yet * -# * it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we consider an application to constitute a * -# * "derivative work" for the purpose of this license if it does any of the * -# * following: * -# * o Integrates source code from Nmap * -# * o Reads or includes Nmap copyrighted data files, such as * -# * nmap-os-db or nmap-service-probes. * -# * o Executes Nmap and parses the results (as opposed to typical shell or * -# * execution-menu apps, which simply display raw Nmap output and so are * -# * not derivative works.) * -# * o Integrates/includes/aggregates Nmap into a proprietary executable * -# * installer, such as those produced by InstallShield. * -# * o Links to a library or executes a program that does any of the above * -# * * -# * The term "Nmap" should be taken to also include any portions or derived * -# * works of Nmap. This list is not exclusive, but is meant to clarify our * -# * interpretation of derived works with some common examples. Our * -# * interpretation applies only to Nmap--we don't speak for other people's * -# * GPL works. * -# * * -# * If you have any questions about the GPL licensing restrictions on using * -# * Nmap in non-GPL works, we would be happy to help. As mentioned above, * -# * we also offer alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing for priority support and updates as well as helping to * -# * fund the continued development of Nmap technology. Please email * -# * sales@insecure.com for further information. * -# * * -# * As a special exception to the GPL terms, Insecure.Com LLC 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 COPYING.OpenSSL file, and distribute linked * -# * combinations including the two. You must obey the GNU GPL in all * -# * respects for all of the code used other than OpenSSL. If you modify * -# * this file, you may extend this exception to your version of the file, * -# * but you are not obligated to do so. * -# * * -# * If you received these files with a written license agreement or * -# * contract stating terms other than the terms above, then that * -# * alternative license agreement takes precedence over these comments. * -# * * -# * Source is provided to this software because we believe users 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 (none * -# * have been found so far). * -# * * -# * 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 the dev@nmap.org mailing list 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, 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. * -# * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -# * General Public License v2.0 for more details at * -# * http://www.gnu.org/licenses/gpl-2.0.html , or in the COPYING file * -# * included with Nmap. * -# * * # ***************************************************************************/ +# +# 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 # Master RPC program number data base (/etc/rpc). # diff --git a/nmap-service-probes b/nmap-service-probes index c8b7c6808..c03c838ec 100644 --- a/nmap-service-probes +++ b/nmap-service-probes @@ -10,9 +10,9 @@ # https://nmap.org/book/vscan-community.html # # This collection of probe data is (C) 1998-2020 by Insecure.Com -# LLC. It is distributed under the Nmap Open Source license as -# provided in the COPYING file of the source distribution or at -# https://nmap.org/data/COPYING . Note that this license +# 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). diff --git a/nmap-services b/nmap-services index 1ea8b16ca..99f252175 100644 --- a/nmap-services +++ b/nmap-services @@ -7,10 +7,10 @@ # # Derived from IANA data and our own research # -# This collection of service data is (C) 1996-2019 by Insecure.Com -# LLC. It is distributed under the Nmap Open Source license as -# provided in the COPYING file of the source distribution or at -# https://svn.nmap.org/nmap/COPYING . Note that this license +# This collection of service 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). diff --git a/nmap.cc b/nmap.cc index 688fbe361..c0f4a1e55 100644 --- a/nmap.cc +++ b/nmap.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap.h b/nmap.h index 0281b110f..d15a803d4 100644 --- a/nmap.h +++ b/nmap.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ @@ -189,11 +121,11 @@ #ifndef NMAP_VERSION /* Edit this definition only within the quotes, because it is read from this file by the makefiles. */ -#define NMAP_VERSION "7.80SVN" -#define NMAP_NUM_VERSION "7.0.80.100" +#define NMAP_VERSION "7.90" +#define NMAP_NUM_VERSION "7.0.90.0" #endif -#define NMAP_XMLOUTPUTVERSION "1.04" +#define NMAP_XMLOUTPUTVERSION "1.05" /* User configurable #defines: */ #define MAX_PROBE_PORTS 10 /* How many TCP probe ports are allowed ? */ diff --git a/nmap.spec.in b/nmap.spec.in index 7eab814d6..ee642bae9 100644 --- a/nmap.spec.in +++ b/nmap.spec.in @@ -87,7 +87,7 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || : %files %defattr(-,root,root) -%doc COPYING +%doc LICENSE %doc docs/README %doc docs/nmap.usage.txt %doc %{_prefix}/share/man/man1/nmap.1.gz diff --git a/nmap_amigaos.h b/nmap_amigaos.h index 0cf7ed3b5..35f760015 100644 --- a/nmap_amigaos.h +++ b/nmap_amigaos.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_config.h.in b/nmap_config.h.in index 84bdf54f8..6a76aba19 100644 --- a/nmap_config.h.in +++ b/nmap_config.h.in @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_dns.cc b/nmap_dns.cc index aaebe2aa6..ce3e42c80 100644 --- a/nmap_dns.cc +++ b/nmap_dns.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_dns.h b/nmap_dns.h index 8ff5797e4..c2456298d 100644 --- a/nmap_dns.h +++ b/nmap_dns.h @@ -3,126 +3,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_error.cc b/nmap_error.cc index 588b13c33..bc5fd9366 100644 --- a/nmap_error.cc +++ b/nmap_error.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_error.h b/nmap_error.h index 5ac361b11..2b3e8e062 100644 --- a/nmap_error.h +++ b/nmap_error.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_ftp.cc b/nmap_ftp.cc index a9c57608d..2825d48d6 100644 --- a/nmap_ftp.cc +++ b/nmap_ftp.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_ftp.h b/nmap_ftp.h index fbd3dd569..2b116dc9b 100644 --- a/nmap_ftp.h +++ b/nmap_ftp.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_tty.cc b/nmap_tty.cc index 2daf687dd..e37cccabe 100644 --- a/nmap_tty.cc +++ b/nmap_tty.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_tty.h b/nmap_tty.h index 89a6a211a..120c46c19 100644 --- a/nmap_tty.h +++ b/nmap_tty.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 10c5dd485..733fe1736 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/ArgParser.cc b/nping/ArgParser.cc index e2c46eb5d..342730f56 100644 --- a/nping/ArgParser.cc +++ b/nping/ArgParser.cc @@ -8,126 +8,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/ArgParser.h b/nping/ArgParser.h index 7690fb264..270803045 100644 --- a/nping/ArgParser.h +++ b/nping/ArgParser.h @@ -8,126 +8,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/COPYING b/nping/COPYING deleted file mode 100644 index 574f83575..000000000 --- a/nping/COPYING +++ /dev/null @@ -1,476 +0,0 @@ - -/*************************************************************************** - * COPYING -- Describes the terms under which Nmap is distributed. A copy * - * of the GNU GPL is appended to this file. * - * * - ***********************IMPORTANT NMAP LICENSE TERMS************************ - * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * - * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * - * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * - * * - * o Integrates source code from Covered Software. * - * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * - * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * - * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * - * * - * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * - * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * - * * - ***************************************************************************/ - -GNU General Public License - ----------------------------------------------------------------------------- - -Table of Contents - - * GNU GENERAL PUBLIC LICENSE - o Preamble - o TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - o How to Apply These Terms to Your New Programs - ----------------------------------------------------------------------------- - -GNU GENERAL PUBLIC LICENSE - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to -share and change it. By contrast, the GNU General Public License is intended -to guarantee your freedom to share and change free software--to make sure -the software is free for all its users. This General Public License applies -to most of the Free Software Foundation's software and to any other program -whose authors commit to using it. (Some other Free Software Foundation -software is covered by the GNU Library General Public License instead.) You -can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you -wish), that you receive source code or can get it if you want it, that you -can change the software or use pieces of it in new free programs; and that -you know you can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to -deny you these rights or to ask you to surrender the rights. These -restrictions translate to certain responsibilities for you if you distribute -copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or -for a fee, you must give the recipients all the rights that you have. You -must make sure that they, too, receive or can get the source code. And you -must show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If -the software is modified by someone else and passed on, we want its -recipients to know that what they have is not the original, so that any -problems introduced by others will not reflect on the original authors' -reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program -proprietary. To prevent this, we have made it clear that any patent must be -licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms -of this General Public License. The "Program", below, refers to any such -program or work, and a "work based on the Program" means either the Program -or any derivative work under copyright law: that is to say, a work -containing the Program or a portion of it, either verbatim or with -modifications and/or translated into another language. (Hereinafter, -translation is included without limitation in the term "modification".) Each -licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered -by this License; they are outside its scope. The act of running the Program -is not restricted, and the output from the Program is covered only if its -contents constitute a work based on the Program (independent of having been -made by running the Program). Whether that is true depends on what the -Program does. - -1. You may copy and distribute verbatim copies of the Program's source code -as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this -License and to the absence of any warranty; and give any other recipients of -the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you -may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, -thus forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you -also meet all of these conditions: - - * a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - * b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - * c) If the modified program normally reads commands interactively when - run, you must cause it, when started running for such interactive use - in the most ordinary way, to print or display an announcement including - an appropriate copyright notice and a notice that there is no warranty - (or else, saying that you provide a warranty) and that users may - redistribute the program under these conditions, and telling the user - how to view a copy of this License. (Exception: if the Program itself - is interactive but does not normally print such an announcement, your - work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be -reasonably considered independent and separate works in themselves, then -this License, and its terms, do not apply to those sections when you -distribute them as separate works. But when you distribute the same sections -as part of a whole which is a work based on the Program, the distribution of -the whole must be on the terms of this License, whose permissions for other -licensees extend to the entire whole, and thus to each and every part -regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise -the right to control the distribution of derivative or collective works -based on the Program. - -In addition, mere aggregation of another work not based on the Program with -the Program (or with a work based on the Program) on a volume of a storage -or distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 -and 2 above provided that you also do one of the following: - - * a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 - above on a medium customarily used for software interchange; or, - - * b) Accompany it with a written offer, valid for at least three years, - to give any third party, for a charge no more than your cost of - physically performing source distribution, a complete machine-readable - copy of the corresponding source code, to be distributed under the - terms of Sections 1 and 2 above on a medium customarily used for - software interchange; or, - - * c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and -installation of the executable. However, as a special exception, the source -code distributed need not include anything that is normally distributed (in -either source or binary form) with the major components (compiler, kernel, -and so on) of the operating system on which the executable runs, unless that -component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to -copy from a designated place, then offering equivalent access to copy the -source code from the same place counts as distribution of the source code, -even though third parties are not compelled to copy the source along with -the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, -modify, sublicense or distribute the Program is void, and will automatically -terminate your rights under this License. However, parties who have received -copies, or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed -it. However, nothing else grants you permission to modify or distribute the -Program or its derivative works. These actions are prohibited by law if you -do not accept this License. Therefore, by modifying or distributing the -Program (or any work based on the Program), you indicate your acceptance of -this License to do so, and all its terms and conditions for copying, -distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the original -licensor to copy, distribute or modify the Program subject to these terms -and conditions. You may not impose any further restrictions on the -recipients' exercise of the rights granted herein. You are not responsible -for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot distribute so -as to satisfy simultaneously your obligations under this License and any -other pertinent obligations, then as a consequence you may not distribute -the Program at all. For example, if a patent license would not permit -royalty-free redistribution of the Program by all those who receive copies -directly or indirectly through you, then the only way you could satisfy both -it and this License would be to refrain entirely from distribution of the -Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents -or other property right claims or to contest validity of any such claims; -this section has the sole purpose of protecting the integrity of the free -software distribution system, which is implemented by public license -practices. Many people have made generous contributions to the wide range of -software distributed through that system in reliance on consistent -application of that system; it is up to the author/donor to decide if he or -she is willing to distribute software through any other system and a -licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an -explicit geographical distribution limitation excluding those countries, so -that distribution is permitted only in or among countries not thus excluded. -In such case, this License incorporates the limitation as if written in the -body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of -the General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make -exceptions for this. Our decision will be guided by the two goals of -preserving the free status of all derivatives of our free software and of -promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO -THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM -PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO -LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR -THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively convey the -exclusion of warranty; and each file should have at least the "copyright" -line and a pointer to where the full notice is found. - -one line to give the program's name and an idea of what it does. -Copyright (C) 19yy name of author - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when -it starts in an interactive mode: - -Gnomovision version 69, Copyright (C) 19yy name of author -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details -type `show w'. This is free software, and you are welcome -to redistribute it under certain conditions; type `show c' -for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright -interest in the program `Gnomovision' -(which makes passes at compilers) written -by James Hacker. - -signature of Ty Coon, 1 April 1989 -Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. diff --git a/nping/Crypto.cc b/nping/Crypto.cc index 467053085..ea32b1546 100644 --- a/nping/Crypto.cc +++ b/nping/Crypto.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #include "nping.h" diff --git a/nping/Crypto.h b/nping/Crypto.h index 6d9afe28d..f8b04971b 100644 --- a/nping/Crypto.h +++ b/nping/Crypto.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/EchoClient.cc b/nping/EchoClient.cc index 0fc6466c0..fe6918cc3 100644 --- a/nping/EchoClient.cc +++ b/nping/EchoClient.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/EchoClient.h b/nping/EchoClient.h index 602df2e59..0481c303b 100644 --- a/nping/EchoClient.h +++ b/nping/EchoClient.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #ifndef __ECHOCLIENT_H__ diff --git a/nping/EchoHeader.cc b/nping/EchoHeader.cc index a90afa003..7e941d30d 100644 --- a/nping/EchoHeader.cc +++ b/nping/EchoHeader.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/EchoHeader.h b/nping/EchoHeader.h index 746577f77..02e4d1cc8 100644 --- a/nping/EchoHeader.h +++ b/nping/EchoHeader.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc index a824340cd..dea28514b 100644 --- a/nping/EchoServer.cc +++ b/nping/EchoServer.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/EchoServer.h b/nping/EchoServer.h index c9fee6de9..4d8a56af8 100644 --- a/nping/EchoServer.h +++ b/nping/EchoServer.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #ifndef __ECHOSERVER_H__ diff --git a/nping/LICENSE b/nping/LICENSE new file mode 100644 index 000000000..0cf26492b --- /dev/null +++ b/nping/LICENSE @@ -0,0 +1,3 @@ +Nping is distributed under the same license terms as Nmap. See the +LICENSE file in the Nmap tarball, the man page legal section, or +https://nmap.org/man/man-legal.html . diff --git a/nping/Makefile.in b/nping/Makefile.in index ad5db78be..3cf9c5593 100644 --- a/nping/Makefile.in +++ b/nping/Makefile.in @@ -73,7 +73,7 @@ OBJS = ArgParser.o common.o common_modified.o nping.o NpingOps.o utils.o utils_n export DOCS2DIST = leet-nping-ascii-art.txt nping.1 nping-man.html -export MISC2DIST = config.guess config.sub configure configure.ac Makefile.in TODO nping_config.h.in CHANGELOG COPYING +export MISC2DIST = config.guess config.sub configure configure.ac Makefile.in TODO nping_config.h.in CHANGELOG LICENSE # %.o : %.cc -- nope this is a GNU extension diff --git a/nping/NEPContext.cc b/nping/NEPContext.cc index c7d9b9ae4..5e3966e3c 100644 --- a/nping/NEPContext.cc +++ b/nping/NEPContext.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NEPContext.h b/nping/NEPContext.h index 32b8be48d..02b8b08da 100644 --- a/nping/NEPContext.h +++ b/nping/NEPContext.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc index 2d74a21d7..1679789ae 100644 --- a/nping/NpingOps.cc +++ b/nping/NpingOps.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NpingOps.h b/nping/NpingOps.h index 1d69a5ab2..c7259e7c7 100644 --- a/nping/NpingOps.h +++ b/nping/NpingOps.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NpingTarget.cc b/nping/NpingTarget.cc index 2913bf7ca..8d0886b1f 100644 --- a/nping/NpingTarget.cc +++ b/nping/NpingTarget.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NpingTarget.h b/nping/NpingTarget.h index dfaf4d543..f4616cfe5 100644 --- a/nping/NpingTarget.h +++ b/nping/NpingTarget.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NpingTargets.cc b/nping/NpingTargets.cc index 421b8e20b..6294c658c 100644 --- a/nping/NpingTargets.cc +++ b/nping/NpingTargets.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/NpingTargets.h b/nping/NpingTargets.h index 3a9a2145a..3a1056000 100644 --- a/nping/NpingTargets.h +++ b/nping/NpingTargets.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/ProbeMode.cc b/nping/ProbeMode.cc index 38de0cf2b..981f6f4b3 100644 --- a/nping/ProbeMode.cc +++ b/nping/ProbeMode.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/ProbeMode.h b/nping/ProbeMode.h index 313776d86..0d4a82393 100644 --- a/nping/ProbeMode.h +++ b/nping/ProbeMode.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #ifndef __PROBEMODE_H__ diff --git a/nping/common.cc b/nping/common.cc index 40c0aa717..1d6d636f9 100644 --- a/nping/common.cc +++ b/nping/common.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/common.h b/nping/common.h index 8fafb3716..3e18991f3 100644 --- a/nping/common.h +++ b/nping/common.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/common_modified.cc b/nping/common_modified.cc index 54a772e10..bf5853c8c 100644 --- a/nping/common_modified.cc +++ b/nping/common_modified.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #include "nping.h" diff --git a/nping/common_modified.h b/nping/common_modified.h index d81830c8b..29701fc0f 100644 --- a/nping/common_modified.h +++ b/nping/common_modified.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/nping.cc b/nping/nping.cc index 40df912a8..c3ac85026 100644 --- a/nping/nping.cc +++ b/nping/nping.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/nping.h b/nping/nping.h index b34d5857b..ab2b19a05 100644 --- a/nping/nping.h +++ b/nping/nping.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ @@ -334,7 +266,7 @@ /* General tunable defines **************************************************/ #define NPING_NAME "Nping" #define NPING_URL "https://nmap.org/nping" -#define NPING_VERSION "0.7.80SVN" +#define NPING_VERSION "0.7.90" #define DEFAULT_VERBOSITY VB_0 diff --git a/nping/nping_config.h.in b/nping/nping_config.h.in index 1d0383d52..9d4ccb42f 100644 --- a/nping/nping_config.h.in +++ b/nping/nping_config.h.in @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/nping_winconfig.h b/nping/nping_winconfig.h index f57aa0f3b..988c49580 100644 --- a/nping/nping_winconfig.h +++ b/nping/nping_winconfig.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/output.cc b/nping/output.cc index 8fd10a0d9..331a18325 100644 --- a/nping/output.cc +++ b/nping/output.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/output.h b/nping/output.h index 9311853a8..e0ff79f23 100644 --- a/nping/output.h +++ b/nping/output.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/stats.cc b/nping/stats.cc index 782ff0688..ff53f9890 100644 --- a/nping/stats.cc +++ b/nping/stats.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/stats.h b/nping/stats.h index e6c91ffae..a61f8e557 100644 --- a/nping/stats.h +++ b/nping/stats.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #ifndef __STATS_H__ diff --git a/nping/utils.cc b/nping/utils.cc index 7bc1fbde7..c852ae9fb 100644 --- a/nping/utils.cc +++ b/nping/utils.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/utils.h b/nping/utils.h index 5de6b64b8..4565de1cf 100644 --- a/nping/utils.h +++ b/nping/utils.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/utils_net.cc b/nping/utils_net.cc index 119a18279..905e4fd66 100644 --- a/nping/utils_net.cc +++ b/nping/utils_net.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #include "nping.h" diff --git a/nping/utils_net.h b/nping/utils_net.h index 332aeae2b..ceb7de0bc 100644 --- a/nping/utils_net.h +++ b/nping/utils_net.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nping/winfix.cc b/nping/winfix.cc index ea30ceea0..8cd9e4904 100644 --- a/nping/winfix.cc +++ b/nping/winfix.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc index 2c6e41389..3deb8cf25 100644 --- a/nse_ssl_cert.cc +++ b/nse_ssl_cert.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nse_ssl_cert.h b/nse_ssl_cert.h index 73f985bf2..71267c800 100644 --- a/nse_ssl_cert.h +++ b/nse_ssl_cert.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/nselib/data/passwords.lst b/nselib/data/passwords.lst index 59c12cdec..534567628 100644 --- a/nselib/data/passwords.lst +++ b/nselib/data/passwords.lst @@ -1,87 +1,13 @@ -#!comment: ***********************IMPORTANT NMAP LICENSE TERMS************************ -#!comment: * * -#!comment: * The Nmap Security Scanner is (C) 1996-2010 Insecure.Com LLC. Nmap is * -#!comment: * also a registered trademark of Insecure.Com LLC. This program is free * -#!comment: * software; you may redistribute and/or modify it under the terms of the * -#!comment: * GNU General Public License as published by the Free Software * -#!comment: * Foundation; Version 2 with the clarifications and exceptions described * -#!comment: * below. This guarantees your right to use, modify, and redistribute * -#!comment: * this software under certain conditions. If you wish to embed Nmap * -#!comment: * technology into proprietary software, we sell alternative licenses * -#!comment: * (contact sales@insecure.com). Dozens of software vendors already * -#!comment: * license Nmap technology such as host discovery, port scanning, OS * -#!comment: * detection, and version detection. * -#!comment: * * -#!comment: * Note that the GPL places important restrictions on "derived works", yet * -#!comment: * it does not provide a detailed definition of that term. To avoid * -#!comment: * misunderstandings, we consider an application to constitute a * -#!comment: * "derivative work" for the purpose of this license if it does any of the * -#!comment: * following: * -#!comment: * o Integrates source code from Nmap * -#!comment: * o Reads or includes Nmap copyrighted data files, such as * -#!comment: * nmap-os-db or nmap-service-probes. * -#!comment: * o Executes Nmap and parses the results (as opposed to typical shell or * -#!comment: * execution-menu apps, which simply display raw Nmap output and so are * -#!comment: * not derivative works.) * -#!comment: * o Integrates/includes/aggregates Nmap into a proprietary executable * -#!comment: * installer, such as those produced by InstallShield. * -#!comment: * o Links to a library or executes a program that does any of the above * -#!comment: * * -#!comment: * The term "Nmap" should be taken to also include any portions or derived * -#!comment: * works of Nmap. This list is not exclusive, but is meant to clarify our * -#!comment: * interpretation of derived works with some common examples. Our * -#!comment: * interpretation applies only to Nmap--we don't speak for other people's * -#!comment: * GPL works. * -#!comment: * * -#!comment: * If you have any questions about the GPL licensing restrictions on using * -#!comment: * Nmap in non-GPL works, we would be happy to help. As mentioned above, * -#!comment: * we also offer alternative license to integrate Nmap into proprietary * -#!comment: * applications and appliances. These contracts have been sold to dozens * -#!comment: * of software vendors, and generally include a perpetual license as well * -#!comment: * as providing for priority support and updates as well as helping to * -#!comment: * fund the continued development of Nmap technology. Please email * -#!comment: * sales@insecure.com for further information. * -#!comment: * * -#!comment: * As a special exception to the GPL terms, Insecure.Com LLC grants * -#!comment: * permission to link the code of this program with any version of the * -#!comment: * OpenSSL library which is distributed under a license identical to that * -#!comment: * listed in the included docs/licenses/OpenSSL.txt file, and distribute * -#!comment: * linked combinations including the two. You must obey the GNU GPL in all * -#!comment: * respects for all of the code used other than OpenSSL. If you modify * -#!comment: * this file, you may extend this exception to your version of the file, * -#!comment: * but you are not obligated to do so. * -#!comment: * * -#!comment: * If you received these files with a written license agreement or * -#!comment: * contract stating terms other than the terms above, then that * -#!comment: * alternative license agreement takes precedence over these comments. * -#!comment: * * -#!comment: * Source is provided to this software because we believe users have a * -#!comment: * right to know exactly what a program is going to do before they run it. * -#!comment: * This also allows you to audit the software for security holes (none * -#!comment: * have been found so far). * -#!comment: * * -#!comment: * Source code also allows you to port Nmap to new platforms, fix bugs, * -#!comment: * and add new features. You are highly encouraged to send your changes * -#!comment: * to the dev@nmap.org mailing list for possible incorporation into the * -#!comment: * main distribution. By sending these changes to Fyodor or one of the * -#!comment: * Insecure.Org development mailing lists, it is assumed that you are * -#!comment: * offering the Nmap Project (Insecure.Com LLC) the unlimited, * -#!comment: * non-exclusive right to reuse, modify, and relicense the code. Nmap * -#!comment: * will always be available Open Source, but this is important because the * -#!comment: * inability to relicense code has caused devastating problems for other * -#!comment: * Free Software projects (such as KDE and NASM). We also occasionally * -#!comment: * relicense the code to third parties as discussed above. If you wish to * -#!comment: * specify special license conditions of your contributions, just say so * -#!comment: * when you send them. * -#!comment: * * -#!comment: * This program is distributed in the hope that it will be useful, but * -#!comment: * WITHOUT ANY WARRANTY; without even the implied warranty of * -#!comment: * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -#!comment: * General Public License v2.0 for more details at * -#!comment: * http://www.gnu.org/licenses/gpl-2.0.html , or in the COPYING file * -#!comment: * included with Nmap. * -#!comment: * * -#!comment: ***************************************************************************/ +#!comment: This collection of data is (C) 1996-2020 by Insecure.Com 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: 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 123456 12345 diff --git a/nselib/data/snmpcommunities.lst b/nselib/data/snmpcommunities.lst index 8311304ca..2326f9a70 100644 --- a/nselib/data/snmpcommunities.lst +++ b/nselib/data/snmpcommunities.lst @@ -1,87 +1,13 @@ -#!comment: ***********************IMPORTANT NMAP LICENSE TERMS************************ -#!comment: * * -#!comment: * The Nmap Security Scanner is (C) 1996-2010 Insecure.Com LLC. Nmap is * -#!comment: * also a registered trademark of Insecure.Com LLC. This program is free * -#!comment: * software; you may redistribute and/or modify it under the terms of the * -#!comment: * GNU General Public License as published by the Free Software * -#!comment: * Foundation; Version 2 with the clarifications and exceptions described * -#!comment: * below. This guarantees your right to use, modify, and redistribute * -#!comment: * this software under certain conditions. If you wish to embed Nmap * -#!comment: * technology into proprietary software, we sell alternative licenses * -#!comment: * (contact sales@insecure.com). Dozens of software vendors already * -#!comment: * license Nmap technology such as host discovery, port scanning, OS * -#!comment: * detection, and version detection. * -#!comment: * * -#!comment: * Note that the GPL places important restrictions on "derived works", yet * -#!comment: * it does not provide a detailed definition of that term. To avoid * -#!comment: * misunderstandings, we consider an application to constitute a * -#!comment: * "derivative work" for the purpose of this license if it does any of the * -#!comment: * following: * -#!comment: * o Integrates source code from Nmap * -#!comment: * o Reads or includes Nmap copyrighted data files, such as * -#!comment: * nmap-os-db or nmap-service-probes. * -#!comment: * o Executes Nmap and parses the results (as opposed to typical shell or * -#!comment: * execution-menu apps, which simply display raw Nmap output and so are * -#!comment: * not derivative works.) * -#!comment: * o Integrates/includes/aggregates Nmap into a proprietary executable * -#!comment: * installer, such as those produced by InstallShield. * -#!comment: * o Links to a library or executes a program that does any of the above * -#!comment: * * -#!comment: * The term "Nmap" should be taken to also include any portions or derived * -#!comment: * works of Nmap. This list is not exclusive, but is meant to clarify our * -#!comment: * interpretation of derived works with some common examples. Our * -#!comment: * interpretation applies only to Nmap--we don't speak for other people's * -#!comment: * GPL works. * -#!comment: * * -#!comment: * If you have any questions about the GPL licensing restrictions on using * -#!comment: * Nmap in non-GPL works, we would be happy to help. As mentioned above, * -#!comment: * we also offer alternative license to integrate Nmap into proprietary * -#!comment: * applications and appliances. These contracts have been sold to dozens * -#!comment: * of software vendors, and generally include a perpetual license as well * -#!comment: * as providing for priority support and updates as well as helping to * -#!comment: * fund the continued development of Nmap technology. Please email * -#!comment: * sales@insecure.com for further information. * -#!comment: * * -#!comment: * As a special exception to the GPL terms, Insecure.Com LLC grants * -#!comment: * permission to link the code of this program with any version of the * -#!comment: * OpenSSL library which is distributed under a license identical to that * -#!comment: * listed in the included docs/licenses/OpenSSL.txt file, and distribute * -#!comment: * linked combinations including the two. You must obey the GNU GPL in all * -#!comment: * respects for all of the code used other than OpenSSL. If you modify * -#!comment: * this file, you may extend this exception to your version of the file, * -#!comment: * but you are not obligated to do so. * -#!comment: * * -#!comment: * If you received these files with a written license agreement or * -#!comment: * contract stating terms other than the terms above, then that * -#!comment: * alternative license agreement takes precedence over these comments. * -#!comment: * * -#!comment: * Source is provided to this software because we believe users have a * -#!comment: * right to know exactly what a program is going to do before they run it. * -#!comment: * This also allows you to audit the software for security holes (none * -#!comment: * have been found so far). * -#!comment: * * -#!comment: * Source code also allows you to port Nmap to new platforms, fix bugs, * -#!comment: * and add new features. You are highly encouraged to send your changes * -#!comment: * to the dev@nmap.org mailing list for possible incorporation into the * -#!comment: * main distribution. By sending these changes to Fyodor or one of the * -#!comment: * Insecure.Org development mailing lists, it is assumed that you are * -#!comment: * offering the Nmap Project (Insecure.Com LLC) the unlimited, * -#!comment: * non-exclusive right to reuse, modify, and relicense the code. Nmap * -#!comment: * will always be available Open Source, but this is important because the * -#!comment: * inability to relicense code has caused devastating problems for other * -#!comment: * Free Software projects (such as KDE and NASM). We also occasionally * -#!comment: * relicense the code to third parties as discussed above. If you wish to * -#!comment: * specify special license conditions of your contributions, just say so * -#!comment: * when you send them. * -#!comment: * * -#!comment: * This program is distributed in the hope that it will be useful, but * -#!comment: * WITHOUT ANY WARRANTY; without even the implied warranty of * -#!comment: * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -#!comment: * General Public License v2.0 for more details at * -#!comment: * http://www.gnu.org/licenses/gpl-2.0.html , or in the COPYING file * -#!comment: * included with Nmap. * -#!comment: * * -#!comment: ***************************************************************************/ +#!comment: This collection of data is (C) 1996-2020 by Insecure.Com 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: 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 public private diff --git a/nsock/examples/nsock_telnet.c b/nsock/examples/nsock_telnet.c index 28bc718b5..da1dbf867 100644 --- a/nsock/examples/nsock_telnet.c +++ b/nsock/examples/nsock_telnet.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/examples/nsock_test_timers.c b/nsock/examples/nsock_test_timers.c index 04bd2ffc3..4e85b4a7b 100644 --- a/nsock/examples/nsock_test_timers.c +++ b/nsock/examples/nsock_test_timers.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/include/nsock.h b/nsock/include/nsock.h index 17843911c..08fe19b76 100644 --- a/nsock/include/nsock.h +++ b/nsock/include/nsock.h @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/include/nsock_config.h.in b/nsock/include/nsock_config.h.in index dbcc0e708..fba249604 100644 --- a/nsock/include/nsock_config.h.in +++ b/nsock/include/nsock_config.h.in @@ -6,7 +6,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/include/nsock_winconfig.h b/nsock/include/nsock_winconfig.h index 9b613d591..2b6ce5348 100644 --- a/nsock/include/nsock_winconfig.h +++ b/nsock/include/nsock_winconfig.h @@ -7,7 +7,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/engine_epoll.c b/nsock/src/engine_epoll.c index c6cd26ff7..86dc1b657 100644 --- a/nsock/src/engine_epoll.c +++ b/nsock/src/engine_epoll.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/engine_iocp.c b/nsock/src/engine_iocp.c index 419e7a09f..39f27b312 100644 --- a/nsock/src/engine_iocp.c +++ b/nsock/src/engine_iocp.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/engine_kqueue.c b/nsock/src/engine_kqueue.c index ec2a7df1d..9ff2aaa4d 100644 --- a/nsock/src/engine_kqueue.c +++ b/nsock/src/engine_kqueue.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/engine_poll.c b/nsock/src/engine_poll.c index cf9f07d45..af8454a2d 100644 --- a/nsock/src/engine_poll.c +++ b/nsock/src/engine_poll.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/engine_select.c b/nsock/src/engine_select.c index 70bafb1dc..c74a13124 100644 --- a/nsock/src/engine_select.c +++ b/nsock/src/engine_select.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/error.c b/nsock/src/error.c index 476697155..76384fb65 100644 --- a/nsock/src/error.c +++ b/nsock/src/error.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/error.h b/nsock/src/error.h index e8a0da32c..9d4aecb68 100644 --- a/nsock/src/error.h +++ b/nsock/src/error.h @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/filespace.c b/nsock/src/filespace.c index ded5e96ab..a277491f3 100644 --- a/nsock/src/filespace.c +++ b/nsock/src/filespace.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/filespace.h b/nsock/src/filespace.h index 740ffcf3a..0ce21db2a 100644 --- a/nsock/src/filespace.h +++ b/nsock/src/filespace.h @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/gh_heap.c b/nsock/src/gh_heap.c index a9b7743e8..29d73f801 100644 --- a/nsock/src/gh_heap.c +++ b/nsock/src/gh_heap.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/gh_heap.h b/nsock/src/gh_heap.h index cbaaac118..353a60585 100644 --- a/nsock/src/gh_heap.h +++ b/nsock/src/gh_heap.h @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/gh_list.h b/nsock/src/gh_list.h index 80bdb08bc..5d835273a 100644 --- a/nsock/src/gh_list.h +++ b/nsock/src/gh_list.h @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/netutils.c b/nsock/src/netutils.c index 8cb75ae05..d1ca894f6 100644 --- a/nsock/src/netutils.c +++ b/nsock/src/netutils.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/netutils.h b/nsock/src/netutils.h index 363d82318..80321982b 100644 --- a/nsock/src/netutils.h +++ b/nsock/src/netutils.h @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_connect.c b/nsock/src/nsock_connect.c index 49925baec..a4bd857b7 100644 --- a/nsock/src/nsock_connect.c +++ b/nsock/src/nsock_connect.c @@ -3,7 +3,7 @@ * connections from the nsock parallel socket event library * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_core.c b/nsock/src/nsock_core.c index 3e01f9bf5..54d8a1e97 100644 --- a/nsock/src/nsock_core.c +++ b/nsock/src/nsock_core.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_engines.c b/nsock/src/nsock_engines.c index 2e29fb39a..dbe1ef0bd 100644 --- a/nsock/src/nsock_engines.c +++ b/nsock/src/nsock_engines.c @@ -6,7 +6,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_event.c b/nsock/src/nsock_event.c index f982be716..eda258b46 100644 --- a/nsock/src/nsock_event.c +++ b/nsock/src/nsock_event.c @@ -7,7 +7,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_internal.h b/nsock/src/nsock_internal.h index 358231b75..c78e85387 100644 --- a/nsock/src/nsock_internal.h +++ b/nsock/src/nsock_internal.h @@ -5,7 +5,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_iod.c b/nsock/src/nsock_iod.c index ff33bed72..49ee779f4 100644 --- a/nsock/src/nsock_iod.c +++ b/nsock/src/nsock_iod.c @@ -6,7 +6,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_log.c b/nsock/src/nsock_log.c index cf6a03641..50e513ec8 100644 --- a/nsock/src/nsock_log.c +++ b/nsock/src/nsock_log.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_log.h b/nsock/src/nsock_log.h index dd57fc9d8..c1b6cb10c 100644 --- a/nsock/src/nsock_log.h +++ b/nsock/src/nsock_log.h @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_pcap.c b/nsock/src/nsock_pcap.c index 63829ac82..0fb6db16f 100644 --- a/nsock/src/nsock_pcap.c +++ b/nsock/src/nsock_pcap.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_pcap.h b/nsock/src/nsock_pcap.h index 34aa62dfb..2c2057d0e 100644 --- a/nsock/src/nsock_pcap.h +++ b/nsock/src/nsock_pcap.h @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_pool.c b/nsock/src/nsock_pool.c index 92bf981ba..1650a33b8 100644 --- a/nsock/src/nsock_pool.c +++ b/nsock/src/nsock_pool.c @@ -6,7 +6,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c index e301ce5bf..818f4a194 100644 --- a/nsock/src/nsock_proxy.c +++ b/nsock/src/nsock_proxy.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_proxy.h b/nsock/src/nsock_proxy.h index 1bdf37752..e33cf06ff 100644 --- a/nsock/src/nsock_proxy.h +++ b/nsock/src/nsock_proxy.h @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_read.c b/nsock/src/nsock_read.c index 75c180554..744ec1d58 100644 --- a/nsock/src/nsock_read.c +++ b/nsock/src/nsock_read.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c index 899c64aa1..64d419221 100644 --- a/nsock/src/nsock_ssl.c +++ b/nsock/src/nsock_ssl.c @@ -6,7 +6,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_ssl.h b/nsock/src/nsock_ssl.h index 9234f74ff..fca271838 100644 --- a/nsock/src/nsock_ssl.h +++ b/nsock/src/nsock_ssl.h @@ -6,7 +6,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_timers.c b/nsock/src/nsock_timers.c index 42b1f92a5..196a14f8c 100644 --- a/nsock/src/nsock_timers.c +++ b/nsock/src/nsock_timers.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/nsock_write.c b/nsock/src/nsock_write.c index ebba4eca9..7b269d137 100644 --- a/nsock/src/nsock_write.c +++ b/nsock/src/nsock_write.c @@ -4,7 +4,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/proxy_http.c b/nsock/src/proxy_http.c index 918a6c516..f352cf431 100644 --- a/nsock/src/proxy_http.c +++ b/nsock/src/proxy_http.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/nsock/src/proxy_socks4.c b/nsock/src/proxy_socks4.c index e0e8c0365..7bbdeea1b 100644 --- a/nsock/src/proxy_socks4.c +++ b/nsock/src/proxy_socks4.c @@ -3,7 +3,7 @@ * * ***********************IMPORTANT NSOCK LICENSE TERMS*********************** * * - * The nsock parallel socket event library is (C) 1999-2019 Insecure.Com * + * The nsock parallel socket event library is (C) 1999-2020 Insecure.Com * * LLC This library 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. This guarantees * diff --git a/osscan.cc b/osscan.cc index 11d6a5362..5142c828f 100644 --- a/osscan.cc +++ b/osscan.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/osscan.h b/osscan.h index c57e60e86..15b251836 100644 --- a/osscan.h +++ b/osscan.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/osscan2.cc b/osscan2.cc index a485460ff..eca7b7214 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/osscan2.h b/osscan2.h index f8b2c467c..5cbb725da 100644 --- a/osscan2.h +++ b/osscan2.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/output.cc b/output.cc index d2590bda7..7828f4a8d 100644 --- a/output.cc +++ b/output.cc @@ -9,126 +9,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/output.h b/output.h index 4a056ba3e..29f05cce8 100644 --- a/output.h +++ b/output.h @@ -9,126 +9,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/payload.cc b/payload.cc index efc67ec51..9170289f0 100644 --- a/payload.cc +++ b/payload.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/payload.h b/payload.h index ee1fee02b..322c33e92 100644 --- a/payload.h +++ b/payload.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/portlist.cc b/portlist.cc index 31012b055..ef8624574 100644 --- a/portlist.cc +++ b/portlist.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/portlist.h b/portlist.h index 76448b6dd..ff942d72d 100644 --- a/portlist.h +++ b/portlist.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/portreasons.cc b/portreasons.cc index b6bcdcd90..c24bc3282 100644 --- a/portreasons.cc +++ b/portreasons.cc @@ -3,126 +3,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/portreasons.h b/portreasons.h index 90e17b0d8..76cfb0c6e 100644 --- a/portreasons.h +++ b/portreasons.h @@ -3,126 +3,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/probespec.h b/probespec.h index c78ddbdb9..764245d17 100644 --- a/probespec.h +++ b/probespec.h @@ -5,126 +5,58 @@ * and protocols. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #include diff --git a/protocols.cc b/protocols.cc index e940a033b..3469870fc 100644 --- a/protocols.cc +++ b/protocols.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/protocols.h b/protocols.h index 8de70efd4..2be29245f 100644 --- a/protocols.h +++ b/protocols.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_engine.cc b/scan_engine.cc index ac66eadb5..6e2b218c6 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_engine.h b/scan_engine.h index a711bcba3..480337d24 100644 --- a/scan_engine.h +++ b/scan_engine.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_engine_connect.cc b/scan_engine_connect.cc index 662b01f93..076853dd5 100644 --- a/scan_engine_connect.cc +++ b/scan_engine_connect.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_engine_connect.h b/scan_engine_connect.h index 2fe3477e5..ac98d930c 100644 --- a/scan_engine_connect.h +++ b/scan_engine_connect.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_engine_raw.cc b/scan_engine_raw.cc index 88a2fdc8f..427587baa 100644 --- a/scan_engine_raw.cc +++ b/scan_engine_raw.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_engine_raw.h b/scan_engine_raw.h index 32f9a69bf..c0ac632bd 100644 --- a/scan_engine_raw.h +++ b/scan_engine_raw.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_lists.cc b/scan_lists.cc index e9092b3e9..d1e106c8a 100644 --- a/scan_lists.cc +++ b/scan_lists.cc @@ -3,126 +3,58 @@ * and scan types * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/scan_lists.h b/scan_lists.h index 194c146a4..79d9a57b3 100644 --- a/scan_lists.h +++ b/scan_lists.h @@ -3,126 +3,58 @@ * scan types * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/service_scan.cc b/service_scan.cc index ecd360c75..a71d27636 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/service_scan.h b/service_scan.h index d43106411..1455f5a39 100644 --- a/service_scan.h +++ b/service_scan.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/services.cc b/services.cc index af42ee759..5b1c0329c 100644 --- a/services.cc +++ b/services.cc @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/services.h b/services.h index 79dd99913..17f1e1e06 100644 --- a/services.h +++ b/services.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/string_pool.cc b/string_pool.cc index 9d557c9fb..d702aea4a 100644 --- a/string_pool.cc +++ b/string_pool.cc @@ -2,126 +2,58 @@ * string_pool.cc -- String interning for memory optimization * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #include "string_pool.h" diff --git a/string_pool.h b/string_pool.h index ec9c5fdb3..a82bf4d10 100644 --- a/string_pool.h +++ b/string_pool.h @@ -2,126 +2,58 @@ * string_pool.h -- String interning for memory optimization * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ #ifndef STRING_POOL_H diff --git a/targets.cc b/targets.cc index 7e9ebe6cb..444e07bc8 100644 --- a/targets.cc +++ b/targets.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/targets.h b/targets.h index 2976ed2a4..65bfd0b8b 100644 --- a/targets.h +++ b/targets.h @@ -5,126 +5,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/tcpip.cc b/tcpip.cc index 8183a7c6c..2ff1051d3 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/tcpip.h b/tcpip.h index 10f7bccfd..ff53a818f 100644 --- a/tcpip.h +++ b/tcpip.h @@ -6,126 +6,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/tests/nmap_dns_test.cc b/tests/nmap_dns_test.cc index 366b4de76..bdfbfa62b 100644 --- a/tests/nmap_dns_test.cc +++ b/tests/nmap_dns_test.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/timing.cc b/timing.cc index c517e8634..4e93af889 100644 --- a/timing.cc +++ b/timing.cc @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/timing.h b/timing.h index f5a9eb998..ab82e0caf 100644 --- a/timing.h +++ b/timing.h @@ -7,126 +7,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/traceroute.cc b/traceroute.cc index 4d430a2f8..7617a2b9c 100644 --- a/traceroute.cc +++ b/traceroute.cc @@ -3,126 +3,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/traceroute.h b/traceroute.h index 696dc36c3..bf01226c9 100644 --- a/traceroute.h +++ b/traceroute.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/utils.cc b/utils.cc index 8a0febdb2..99ee3b02c 100644 --- a/utils.cc +++ b/utils.cc @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/utils.h b/utils.h index 9b6485149..4567f40f1 100644 --- a/utils.h +++ b/utils.h @@ -4,126 +4,58 @@ * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/xml.cc b/xml.cc index 429bba3cc..8a5cd6f6a 100644 --- a/xml.cc +++ b/xml.cc @@ -2,126 +2,58 @@ * xml.cc -- Simple library to emit XML. * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/xml.h b/xml.h index dd0e9165c..8ef390910 100644 --- a/xml.h +++ b/xml.h @@ -2,126 +2,58 @@ * xml.h * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * - * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * + * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * * Project"). Nmap is also a registered trademark of the Nmap Project. * - * 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. * * * - * Note that the GPL places important restrictions on "derivative works", * - * yet it does not provide a detailed definition of that term. To avoid * - * misunderstandings, we interpret that term as broadly as copyright law * - * allows. For example, we consider an application to constitute a * - * derivative work for the purpose of this license if it does any of the * - * following with any software or content covered by this license * - * ("Covered Software"): * + * This program is distributed under the terms of the Nmap Public Source * + * License (NPSL). The exact license text applying to a particular Nmap * + * release or source code control revision is contained in the LICENSE * + * file distributed with that version of Nmap or source code control * + * revision. More Nmap copyright/legal information is available from * + * https://nmap.org/book/man-legal.html, and further information on the * + * NPSL license itself can be found at https://nmap.org/npsl. This header * + * summarizes some key points from the Nmap license, but is no substitute * + * for the actual license text. * * * - * o Integrates source code from Covered Software. * + * Nmap is generally free for end users to download and use themselves, * + * including commercial use. It is available from https://nmap.org. * * * - * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * - * or nmap-service-probes. * + * The Nmap license generally prohibits companies from using and * + * redistributing Nmap in commercial products, but we sell a special Nmap * + * OEM Edition with a more permissive license and special features for * + * this purpose. See https://nmap.org/oem * * * - * o Is designed specifically to execute Covered Software and parse the * - * results (as opposed to typical shell or execution-menu apps, which will * - * execute anything you tell them to). * + * If you have received a written Nmap license agreement or contract * + * stating terms other than these (such as an Nmap OEM license), you may * + * choose to use and redistribute Nmap under those terms instead. * * * - * o Includes Covered Software in a proprietary executable installer. The * - * installers produced by InstallShield are an example of this. Including * - * Nmap with other software in compressed or archival form does not * - * trigger this provision, provided appropriate open source decompression * - * or de-archiving software is widely available for no charge. For the * - * purposes of this license, an installer is considered to include Covered * - * Software even if it actually retrieves a copy of Covered Software from * - * another source during runtime (such as by downloading it from the * - * Internet). * - * * - * o Links (statically or dynamically) to a library which does any of the * - * above. * - * * - * o Executes a helper program, module, or script to do any of the above. * - * * - * This list is not exclusive, but is meant to clarify our interpretation * - * of derived works with some common examples. Other people may interpret * - * the plain GPL differently, so we consider this a special exception to * - * the GPL that we apply to Covered Software. Works which meet any of * - * these conditions must conform to all of the terms of this license, * - * particularly including the GPL Section 3 requirements of providing * - * source code and allowing free redistribution of the work as a whole. * - * * - * 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. * - * * - * 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 * - * obeying all GPL rules and restrictions. For example, source code of * - * the whole work must be provided and free redistribution must be * - * allowed. All GPL references to "this License", are to be treated as * - * including the terms and conditions of this license text as well. * - * * - * Because this license imposes special exceptions to the GPL, Covered * - * Work may not be combined (even as part of a larger work) with plain GPL * - * software. The terms, conditions, and exceptions of this license must * - * be included as well. This license is incompatible with some other open * - * source licenses as well. In some cases we can relicense portions of * - * Nmap or grant special permissions to use it in other open source * - * software. Please contact fyodor@nmap.org with any such requests. * - * Similarly, we don't incorporate incompatible open source software into * - * Covered Software without special permission from the copyright holders. * - * * - * If you have any questions about the licensing restrictions on using * - * Nmap in other works, we are happy to help. As mentioned above, we also * - * offer an alternative license to integrate Nmap into proprietary * - * applications and appliances. These contracts have been sold to dozens * - * of software vendors, and generally include a perpetual license as well * - * as providing support and updates. They also fund the continued * - * development of Nmap. Please email sales@nmap.com for further * - * information. * - * * - * If you have received a written license agreement or contract for * - * Covered Software stating terms other than these, you may choose to use * - * and redistribute Covered Software under those terms instead of these. * + * The official Nmap Windows builds include the Npcap software * + * (https://npcap.org) for packet capture and transmission. It is under * + * separate license terms which forbid redistribution without special * + * permission. So the official Nmap Windows builds may not be * + * redistributed without special permission (such as an Nmap OEM * + * license). * * * * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * - * main distribution. By sending these changes to Fyodor or one of the * - * Insecure.Org development mailing lists, or checking them into the Nmap * - * source code repository, it is understood (unless you specify * - * otherwise) 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, 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. * + * and add new features. You are highly encouraged to submit your * + * changes as a Github PR or by email to the dev@nmap.org mailing list * + * for possible incorporation into the main distribution. Unless you * + * specify otherwise, it is understood that you are offering us very * + * broad rights to use your submissions as described in the Nmap Public * + * Source License Contributor Agreement. This is important because we * + * fund the project by selling licenses with various terms, and also * + * because the inability to relicense code has caused devastating * + * problems for other Free Software projects (such as KDE and NASM). * * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * - * license file for more details (it's in a COPYING file included with * - * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * + * The free version of Nmap is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * + * indemnification and commercial support are all available through the * + * Npcap OEM program--see https://nmap.org/oem. * * * ***************************************************************************/ diff --git a/zenmap/COPYING b/zenmap/LICENSE similarity index 62% rename from zenmap/COPYING rename to zenmap/LICENSE index bea68e8cc..51b058b7d 100644 --- a/zenmap/COPYING +++ b/zenmap/LICENSE @@ -1,3 +1,3 @@ Zenmap is distributed under the same license terms as Nmap. See the -COPYING file in the Nmap tarball, the man page legal section, or +LICENSE file in the Nmap tarball, the man page legal section, or https://nmap.org/man/man-legal.html . diff --git a/zenmap/install_scripts/macosx/zenmap.bundle b/zenmap/install_scripts/macosx/zenmap.bundle index 5bc368620..3d8fd96cc 100644 --- a/zenmap/install_scripts/macosx/zenmap.bundle +++ b/zenmap/install_scripts/macosx/zenmap.bundle @@ -55,7 +55,7 @@ - ${prefix}/lib/libpyglib-2.0-python.0.dylib + ${prefix}/lib/libpyglib-2.0-python2.0.dylib - diff --git a/zenmap/install_scripts/utils/version_update.py b/zenmap/install_scripts/utils/version_update.py index 83e89d52c..2312ddae2 100644 --- a/zenmap/install_scripts/utils/version_update.py +++ b/zenmap/install_scripts/utils/version_update.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/__init__.py b/zenmap/radialnet/__init__.py index 9256c5b87..e289c8b92 100644 --- a/zenmap/radialnet/__init__.py +++ b/zenmap/radialnet/__init__.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/__init__.py b/zenmap/radialnet/bestwidgets/__init__.py index 4f090d006..0640aaf6c 100644 --- a/zenmap/radialnet/bestwidgets/__init__.py +++ b/zenmap/radialnet/bestwidgets/__init__.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/boxes.py b/zenmap/radialnet/bestwidgets/boxes.py index 326bbf400..817d75905 100644 --- a/zenmap/radialnet/bestwidgets/boxes.py +++ b/zenmap/radialnet/bestwidgets/boxes.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/buttons.py b/zenmap/radialnet/bestwidgets/buttons.py index 398479443..f09d04365 100644 --- a/zenmap/radialnet/bestwidgets/buttons.py +++ b/zenmap/radialnet/bestwidgets/buttons.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/comboboxes.py b/zenmap/radialnet/bestwidgets/comboboxes.py index 90a5cb3b0..ca2c3688d 100644 --- a/zenmap/radialnet/bestwidgets/comboboxes.py +++ b/zenmap/radialnet/bestwidgets/comboboxes.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/expanders.py b/zenmap/radialnet/bestwidgets/expanders.py index 479442f56..da4ca5bd7 100644 --- a/zenmap/radialnet/bestwidgets/expanders.py +++ b/zenmap/radialnet/bestwidgets/expanders.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/frames.py b/zenmap/radialnet/bestwidgets/frames.py index c189264c2..ff05e55c2 100644 --- a/zenmap/radialnet/bestwidgets/frames.py +++ b/zenmap/radialnet/bestwidgets/frames.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/labels.py b/zenmap/radialnet/bestwidgets/labels.py index 49d0583db..ca3c6a6d3 100644 --- a/zenmap/radialnet/bestwidgets/labels.py +++ b/zenmap/radialnet/bestwidgets/labels.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/textview.py b/zenmap/radialnet/bestwidgets/textview.py index 152ec889b..62ff6757a 100644 --- a/zenmap/radialnet/bestwidgets/textview.py +++ b/zenmap/radialnet/bestwidgets/textview.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/bestwidgets/windows.py b/zenmap/radialnet/bestwidgets/windows.py index 655c47433..cfd33cc7b 100644 --- a/zenmap/radialnet/bestwidgets/windows.py +++ b/zenmap/radialnet/bestwidgets/windows.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/ArgvHandle.py b/zenmap/radialnet/core/ArgvHandle.py index 9774ddb16..3cf607a2d 100644 --- a/zenmap/radialnet/core/ArgvHandle.py +++ b/zenmap/radialnet/core/ArgvHandle.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/Coordinate.py b/zenmap/radialnet/core/Coordinate.py index aa23b2cec..5bfb8b607 100644 --- a/zenmap/radialnet/core/Coordinate.py +++ b/zenmap/radialnet/core/Coordinate.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/Graph.py b/zenmap/radialnet/core/Graph.py index dfe0b67ea..15bc7cdd4 100644 --- a/zenmap/radialnet/core/Graph.py +++ b/zenmap/radialnet/core/Graph.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/Info.py b/zenmap/radialnet/core/Info.py index f4e04b250..dad5e892f 100644 --- a/zenmap/radialnet/core/Info.py +++ b/zenmap/radialnet/core/Info.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/Interpolation.py b/zenmap/radialnet/core/Interpolation.py index 4cd7f89e8..71d7dfa40 100644 --- a/zenmap/radialnet/core/Interpolation.py +++ b/zenmap/radialnet/core/Interpolation.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/XMLHandler.py b/zenmap/radialnet/core/XMLHandler.py index 9c506ea1e..b19ebbb3e 100644 --- a/zenmap/radialnet/core/XMLHandler.py +++ b/zenmap/radialnet/core/XMLHandler.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/core/__init__.py b/zenmap/radialnet/core/__init__.py index 6da425c0c..6265e0eb3 100644 --- a/zenmap/radialnet/core/__init__.py +++ b/zenmap/radialnet/core/__init__.py @@ -2,125 +2,57 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/Application.py b/zenmap/radialnet/gui/Application.py index f7f5bd969..aedf44c00 100644 --- a/zenmap/radialnet/gui/Application.py +++ b/zenmap/radialnet/gui/Application.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/ControlWidget.py b/zenmap/radialnet/gui/ControlWidget.py index bbf6177f5..fc4dc449b 100644 --- a/zenmap/radialnet/gui/ControlWidget.py +++ b/zenmap/radialnet/gui/ControlWidget.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/Dialogs.py b/zenmap/radialnet/gui/Dialogs.py index 1729e7df8..0f2482afa 100644 --- a/zenmap/radialnet/gui/Dialogs.py +++ b/zenmap/radialnet/gui/Dialogs.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/HostsViewer.py b/zenmap/radialnet/gui/HostsViewer.py index d15742e54..47e85a24d 100644 --- a/zenmap/radialnet/gui/HostsViewer.py +++ b/zenmap/radialnet/gui/HostsViewer.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/Image.py b/zenmap/radialnet/gui/Image.py index 3d7ea4c51..a4beebc42 100644 --- a/zenmap/radialnet/gui/Image.py +++ b/zenmap/radialnet/gui/Image.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/LegendWindow.py b/zenmap/radialnet/gui/LegendWindow.py index f662f1594..22539de80 100644 --- a/zenmap/radialnet/gui/LegendWindow.py +++ b/zenmap/radialnet/gui/LegendWindow.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/NodeNotebook.py b/zenmap/radialnet/gui/NodeNotebook.py index f0f6852a3..eafaf3cbb 100644 --- a/zenmap/radialnet/gui/NodeNotebook.py +++ b/zenmap/radialnet/gui/NodeNotebook.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/NodeWindow.py b/zenmap/radialnet/gui/NodeWindow.py index fc6409167..19ee18710 100644 --- a/zenmap/radialnet/gui/NodeWindow.py +++ b/zenmap/radialnet/gui/NodeWindow.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/RadialNet.py b/zenmap/radialnet/gui/RadialNet.py index b29092cd5..a7d55721c 100644 --- a/zenmap/radialnet/gui/RadialNet.py +++ b/zenmap/radialnet/gui/RadialNet.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/SaveDialog.py b/zenmap/radialnet/gui/SaveDialog.py index daefb3c7a..4bb8270ec 100644 --- a/zenmap/radialnet/gui/SaveDialog.py +++ b/zenmap/radialnet/gui/SaveDialog.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/Toolbar.py b/zenmap/radialnet/gui/Toolbar.py index b8180341d..df173ed0d 100644 --- a/zenmap/radialnet/gui/Toolbar.py +++ b/zenmap/radialnet/gui/Toolbar.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/gui/__init__.py b/zenmap/radialnet/gui/__init__.py index 6da425c0c..6265e0eb3 100644 --- a/zenmap/radialnet/gui/__init__.py +++ b/zenmap/radialnet/gui/__init__.py @@ -2,125 +2,57 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/radialnet.pyw b/zenmap/radialnet/radialnet.pyw index 98ccf9031..68b1a091b 100755 --- a/zenmap/radialnet/radialnet.pyw +++ b/zenmap/radialnet/radialnet.pyw @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/util/__init__.py b/zenmap/radialnet/util/__init__.py index 6da425c0c..6265e0eb3 100644 --- a/zenmap/radialnet/util/__init__.py +++ b/zenmap/radialnet/util/__init__.py @@ -2,125 +2,57 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/util/drawing.py b/zenmap/radialnet/util/drawing.py index 3ac25c252..4c1e84869 100644 --- a/zenmap/radialnet/util/drawing.py +++ b/zenmap/radialnet/util/drawing.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/util/geometry.py b/zenmap/radialnet/util/geometry.py index 8d8aa2d69..90416e764 100644 --- a/zenmap/radialnet/util/geometry.py +++ b/zenmap/radialnet/util/geometry.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/util/integration.py b/zenmap/radialnet/util/integration.py index 9ceef1e5f..ff23c38d2 100644 --- a/zenmap/radialnet/util/integration.py +++ b/zenmap/radialnet/util/integration.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/radialnet/util/misc.py b/zenmap/radialnet/util/misc.py index 4cc41c4f7..45dd43545 100644 --- a/zenmap/radialnet/util/misc.py +++ b/zenmap/radialnet/util/misc.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/setup.py b/zenmap/setup.py index 7daae5035..6a15e87d8 100755 --- a/zenmap/setup.py +++ b/zenmap/setup.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ import sys diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version index 6642c3f0c..68242008a 100644 --- a/zenmap/share/zenmap/config/zenmap_version +++ b/zenmap/share/zenmap/config/zenmap_version @@ -1 +1 @@ -7.80SVN +7.90 diff --git a/zenmap/zenmap b/zenmap/zenmap index f1abadbc9..43aaef054 100755 --- a/zenmap/zenmap +++ b/zenmap/zenmap @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/BasePaths.py b/zenmap/zenmapCore/BasePaths.py index b3f906548..c6a09a241 100644 --- a/zenmap/zenmapCore/BasePaths.py +++ b/zenmap/zenmapCore/BasePaths.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/DelayedObject.py b/zenmap/zenmapCore/DelayedObject.py index ad7280d2d..a6b794921 100644 --- a/zenmap/zenmapCore/DelayedObject.py +++ b/zenmap/zenmapCore/DelayedObject.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/Diff.py b/zenmap/zenmapCore/Diff.py index 286ac5826..8087fbc01 100644 --- a/zenmap/zenmapCore/Diff.py +++ b/zenmap/zenmapCore/Diff.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/I18N.py b/zenmap/zenmapCore/I18N.py index 2002db90e..71905c649 100644 --- a/zenmap/zenmapCore/I18N.py +++ b/zenmap/zenmapCore/I18N.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/NSEDocParser.py b/zenmap/zenmapCore/NSEDocParser.py index 2e916d450..14f487de4 100644 --- a/zenmap/zenmapCore/NSEDocParser.py +++ b/zenmap/zenmapCore/NSEDocParser.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py index e6da43a95..08c78a3ff 100644 --- a/zenmap/zenmapCore/Name.py +++ b/zenmap/zenmapCore/Name.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/NetworkInventory.py b/zenmap/zenmapCore/NetworkInventory.py index a0bc38a28..8e6d41cf7 100644 --- a/zenmap/zenmapCore/NetworkInventory.py +++ b/zenmap/zenmapCore/NetworkInventory.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/NmapCommand.py b/zenmap/zenmapCore/NmapCommand.py index d97bc9ba7..5b9debc27 100644 --- a/zenmap/zenmapCore/NmapCommand.py +++ b/zenmap/zenmapCore/NmapCommand.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/NmapParser.py b/zenmap/zenmapCore/NmapParser.py index 51b8c883c..e95c29f7b 100644 --- a/zenmap/zenmapCore/NmapParser.py +++ b/zenmap/zenmapCore/NmapParser.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/Paths.py b/zenmap/zenmapCore/Paths.py index f99873cd1..f00287d3e 100644 --- a/zenmap/zenmapCore/Paths.py +++ b/zenmap/zenmapCore/Paths.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/RecentScans.py b/zenmap/zenmapCore/RecentScans.py index eaeeda51a..1c91db072 100644 --- a/zenmap/zenmapCore/RecentScans.py +++ b/zenmap/zenmapCore/RecentScans.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/ScriptArgsParser.py b/zenmap/zenmapCore/ScriptArgsParser.py index 257aad277..21a10b94b 100644 --- a/zenmap/zenmapCore/ScriptArgsParser.py +++ b/zenmap/zenmapCore/ScriptArgsParser.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/ScriptMetadata.py b/zenmap/zenmapCore/ScriptMetadata.py index d39be1b39..053eeb146 100644 --- a/zenmap/zenmapCore/ScriptMetadata.py +++ b/zenmap/zenmapCore/ScriptMetadata.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/SearchResult.py b/zenmap/zenmapCore/SearchResult.py index 0f0df22c7..8dbc479a1 100644 --- a/zenmap/zenmapCore/SearchResult.py +++ b/zenmap/zenmapCore/SearchResult.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/StringPool.py b/zenmap/zenmapCore/StringPool.py index 7942c2dc1..4713239d7 100644 --- a/zenmap/zenmapCore/StringPool.py +++ b/zenmap/zenmapCore/StringPool.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/TargetList.py b/zenmap/zenmapCore/TargetList.py index a1261e41e..27a213286 100644 --- a/zenmap/zenmapCore/TargetList.py +++ b/zenmap/zenmapCore/TargetList.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/UmitConf.py b/zenmap/zenmapCore/UmitConf.py index 9cba452d7..a197163fd 100644 --- a/zenmap/zenmapCore/UmitConf.py +++ b/zenmap/zenmapCore/UmitConf.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/UmitConfigParser.py b/zenmap/zenmapCore/UmitConfigParser.py index a9f5e903e..4567a1108 100644 --- a/zenmap/zenmapCore/UmitConfigParser.py +++ b/zenmap/zenmapCore/UmitConfigParser.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/UmitDB.py b/zenmap/zenmapCore/UmitDB.py index 158737962..fdfcf36ab 100644 --- a/zenmap/zenmapCore/UmitDB.py +++ b/zenmap/zenmapCore/UmitDB.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/UmitLogging.py b/zenmap/zenmapCore/UmitLogging.py index 39eaa318d..26f6eed08 100644 --- a/zenmap/zenmapCore/UmitLogging.py +++ b/zenmap/zenmapCore/UmitLogging.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/UmitOptionParser.py b/zenmap/zenmapCore/UmitOptionParser.py index 78096361c..5ec16b3b0 100644 --- a/zenmap/zenmapCore/UmitOptionParser.py +++ b/zenmap/zenmapCore/UmitOptionParser.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py index bb3ba5268..ffb465d6e 100644 --- a/zenmap/zenmapCore/Version.py +++ b/zenmap/zenmapCore/Version.py @@ -1 +1 @@ -VERSION = "7.80SVN" +VERSION = "7.90" diff --git a/zenmap/zenmapCore/__init__.py b/zenmap/zenmapCore/__init__.py index aec2fd57c..39417d4e5 100644 --- a/zenmap/zenmapCore/__init__.py +++ b/zenmap/zenmapCore/__init__.py @@ -3,125 +3,57 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/About.py b/zenmap/zenmapGUI/About.py index dbda85850..2344b104e 100644 --- a/zenmap/zenmapGUI/About.py +++ b/zenmap/zenmapGUI/About.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/App.py b/zenmap/zenmapGUI/App.py index 0ab3222a0..ec9d1324a 100644 --- a/zenmap/zenmapGUI/App.py +++ b/zenmap/zenmapGUI/App.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/BugReport.py b/zenmap/zenmapGUI/BugReport.py index 301d29e25..7fd42a49b 100644 --- a/zenmap/zenmapGUI/BugReport.py +++ b/zenmap/zenmapGUI/BugReport.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/CrashReport.py b/zenmap/zenmapGUI/CrashReport.py index 080dbc413..b4f5d2ab1 100644 --- a/zenmap/zenmapGUI/CrashReport.py +++ b/zenmap/zenmapGUI/CrashReport.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/DiffCompare.py b/zenmap/zenmapGUI/DiffCompare.py index c8310400c..615135779 100644 --- a/zenmap/zenmapGUI/DiffCompare.py +++ b/zenmap/zenmapGUI/DiffCompare.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/FileChoosers.py b/zenmap/zenmapGUI/FileChoosers.py index ea6f45fa8..72b1eb348 100644 --- a/zenmap/zenmapGUI/FileChoosers.py +++ b/zenmap/zenmapGUI/FileChoosers.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/Icons.py b/zenmap/zenmapGUI/Icons.py index 6679c0d6b..59ab991ad 100644 --- a/zenmap/zenmapGUI/Icons.py +++ b/zenmap/zenmapGUI/Icons.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/MainWindow.py b/zenmap/zenmapGUI/MainWindow.py index d0eaeeb1e..571372311 100644 --- a/zenmap/zenmapGUI/MainWindow.py +++ b/zenmap/zenmapGUI/MainWindow.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/NmapOutputProperties.py b/zenmap/zenmapGUI/NmapOutputProperties.py index eb15d9f9b..94be9ae46 100644 --- a/zenmap/zenmapGUI/NmapOutputProperties.py +++ b/zenmap/zenmapGUI/NmapOutputProperties.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/NmapOutputViewer.py b/zenmap/zenmapGUI/NmapOutputViewer.py index 75d767c83..dddacfc4f 100644 --- a/zenmap/zenmapGUI/NmapOutputViewer.py +++ b/zenmap/zenmapGUI/NmapOutputViewer.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/OptionBuilder.py b/zenmap/zenmapGUI/OptionBuilder.py index c041c261a..f83910fe4 100644 --- a/zenmap/zenmapGUI/OptionBuilder.py +++ b/zenmap/zenmapGUI/OptionBuilder.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/Print.py b/zenmap/zenmapGUI/Print.py index 826a6a3bd..26832a6bc 100644 --- a/zenmap/zenmapGUI/Print.py +++ b/zenmap/zenmapGUI/Print.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ProfileCombo.py b/zenmap/zenmapGUI/ProfileCombo.py index db97ce4ee..299fd9428 100644 --- a/zenmap/zenmapGUI/ProfileCombo.py +++ b/zenmap/zenmapGUI/ProfileCombo.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ProfileEditor.py b/zenmap/zenmapGUI/ProfileEditor.py index 653f148ba..d2c976e1d 100644 --- a/zenmap/zenmapGUI/ProfileEditor.py +++ b/zenmap/zenmapGUI/ProfileEditor.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ProfileHelp.py b/zenmap/zenmapGUI/ProfileHelp.py index 75c109b87..54f475a4d 100644 --- a/zenmap/zenmapGUI/ProfileHelp.py +++ b/zenmap/zenmapGUI/ProfileHelp.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanHostDetailsPage.py b/zenmap/zenmapGUI/ScanHostDetailsPage.py index 2d1e4c4b8..c2ab57f0a 100644 --- a/zenmap/zenmapGUI/ScanHostDetailsPage.py +++ b/zenmap/zenmapGUI/ScanHostDetailsPage.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanHostsView.py b/zenmap/zenmapGUI/ScanHostsView.py index 9b8ab50d9..cc5a8e613 100644 --- a/zenmap/zenmapGUI/ScanHostsView.py +++ b/zenmap/zenmapGUI/ScanHostsView.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanInterface.py b/zenmap/zenmapGUI/ScanInterface.py index 0e1561bc0..0c4bdaa7a 100644 --- a/zenmap/zenmapGUI/ScanInterface.py +++ b/zenmap/zenmapGUI/ScanInterface.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanNmapOutputPage.py b/zenmap/zenmapGUI/ScanNmapOutputPage.py index df70139ef..039204332 100644 --- a/zenmap/zenmapGUI/ScanNmapOutputPage.py +++ b/zenmap/zenmapGUI/ScanNmapOutputPage.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanOpenPortsPage.py b/zenmap/zenmapGUI/ScanOpenPortsPage.py index 4cd3de8a5..3004daab4 100644 --- a/zenmap/zenmapGUI/ScanOpenPortsPage.py +++ b/zenmap/zenmapGUI/ScanOpenPortsPage.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanRunDetailsPage.py b/zenmap/zenmapGUI/ScanRunDetailsPage.py index f9f194845..fe6e72efd 100644 --- a/zenmap/zenmapGUI/ScanRunDetailsPage.py +++ b/zenmap/zenmapGUI/ScanRunDetailsPage.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanScanListPage.py b/zenmap/zenmapGUI/ScanScanListPage.py index 1e10d039a..918a47d05 100644 --- a/zenmap/zenmapGUI/ScanScanListPage.py +++ b/zenmap/zenmapGUI/ScanScanListPage.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScanToolbar.py b/zenmap/zenmapGUI/ScanToolbar.py index 4d685ce04..201e5528e 100644 --- a/zenmap/zenmapGUI/ScanToolbar.py +++ b/zenmap/zenmapGUI/ScanToolbar.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScansListStore.py b/zenmap/zenmapGUI/ScansListStore.py index efe467092..c850dcf24 100644 --- a/zenmap/zenmapGUI/ScansListStore.py +++ b/zenmap/zenmapGUI/ScansListStore.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/ScriptInterface.py b/zenmap/zenmapGUI/ScriptInterface.py index 1e1656cce..bfe652301 100644 --- a/zenmap/zenmapGUI/ScriptInterface.py +++ b/zenmap/zenmapGUI/ScriptInterface.py @@ -2,126 +2,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/SearchGUI.py b/zenmap/zenmapGUI/SearchGUI.py index 6dbe21ae3..4ed795925 100644 --- a/zenmap/zenmapGUI/SearchGUI.py +++ b/zenmap/zenmapGUI/SearchGUI.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/SearchWindow.py b/zenmap/zenmapGUI/SearchWindow.py index 68b82669b..253405f31 100644 --- a/zenmap/zenmapGUI/SearchWindow.py +++ b/zenmap/zenmapGUI/SearchWindow.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/TargetCombo.py b/zenmap/zenmapGUI/TargetCombo.py index 12dc89af0..18d206464 100644 --- a/zenmap/zenmapGUI/TargetCombo.py +++ b/zenmap/zenmapGUI/TargetCombo.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/TopologyPage.py b/zenmap/zenmapGUI/TopologyPage.py index 8fd97e7ec..2f5f4574d 100644 --- a/zenmap/zenmapGUI/TopologyPage.py +++ b/zenmap/zenmapGUI/TopologyPage.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/__init__.py b/zenmap/zenmapGUI/__init__.py index aec2fd57c..39417d4e5 100644 --- a/zenmap/zenmapGUI/__init__.py +++ b/zenmap/zenmapGUI/__init__.py @@ -3,125 +3,57 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/__init__.py b/zenmap/zenmapGUI/higwidgets/__init__.py index f50e814a6..dbbff6571 100644 --- a/zenmap/zenmapGUI/higwidgets/__init__.py +++ b/zenmap/zenmapGUI/higwidgets/__init__.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/gtkutils.py b/zenmap/zenmapGUI/higwidgets/gtkutils.py index 1137d8aed..903b0f14f 100644 --- a/zenmap/zenmapGUI/higwidgets/gtkutils.py +++ b/zenmap/zenmapGUI/higwidgets/gtkutils.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higboxes.py b/zenmap/zenmapGUI/higwidgets/higboxes.py index 6929a9e8a..823d7a650 100644 --- a/zenmap/zenmapGUI/higwidgets/higboxes.py +++ b/zenmap/zenmapGUI/higwidgets/higboxes.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higbuttons.py b/zenmap/zenmapGUI/higwidgets/higbuttons.py index 7390b8c92..0b419143c 100644 --- a/zenmap/zenmapGUI/higwidgets/higbuttons.py +++ b/zenmap/zenmapGUI/higwidgets/higbuttons.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higdialogs.py b/zenmap/zenmapGUI/higwidgets/higdialogs.py index 51fcc66b9..167f48f58 100644 --- a/zenmap/zenmapGUI/higwidgets/higdialogs.py +++ b/zenmap/zenmapGUI/higwidgets/higdialogs.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higentries.py b/zenmap/zenmapGUI/higwidgets/higentries.py index 4ea6b763e..b48841251 100644 --- a/zenmap/zenmapGUI/higwidgets/higentries.py +++ b/zenmap/zenmapGUI/higwidgets/higentries.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higexpanders.py b/zenmap/zenmapGUI/higwidgets/higexpanders.py index 113736a01..7d6fa344e 100644 --- a/zenmap/zenmapGUI/higwidgets/higexpanders.py +++ b/zenmap/zenmapGUI/higwidgets/higexpanders.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higframe.py b/zenmap/zenmapGUI/higwidgets/higframe.py index 18de4a616..4e4220d71 100644 --- a/zenmap/zenmapGUI/higwidgets/higframe.py +++ b/zenmap/zenmapGUI/higwidgets/higframe.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higlabels.py b/zenmap/zenmapGUI/higwidgets/higlabels.py index 1c21cb390..c8d95d050 100644 --- a/zenmap/zenmapGUI/higwidgets/higlabels.py +++ b/zenmap/zenmapGUI/higwidgets/higlabels.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higlogindialogs.py b/zenmap/zenmapGUI/higwidgets/higlogindialogs.py index 92e670cc5..8776d5e30 100644 --- a/zenmap/zenmapGUI/higwidgets/higlogindialogs.py +++ b/zenmap/zenmapGUI/higwidgets/higlogindialogs.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/hignotebooks.py b/zenmap/zenmapGUI/higwidgets/hignotebooks.py index 206246762..53af2c720 100644 --- a/zenmap/zenmapGUI/higwidgets/hignotebooks.py +++ b/zenmap/zenmapGUI/higwidgets/hignotebooks.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higprogressbars.py b/zenmap/zenmapGUI/higwidgets/higprogressbars.py index d40300192..8951f1030 100644 --- a/zenmap/zenmapGUI/higwidgets/higprogressbars.py +++ b/zenmap/zenmapGUI/higwidgets/higprogressbars.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higscrollers.py b/zenmap/zenmapGUI/higwidgets/higscrollers.py index 68b2f89b6..cef4af946 100644 --- a/zenmap/zenmapGUI/higwidgets/higscrollers.py +++ b/zenmap/zenmapGUI/higwidgets/higscrollers.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higspinner.py b/zenmap/zenmapGUI/higwidgets/higspinner.py index c80613fb5..2e843df47 100644 --- a/zenmap/zenmapGUI/higwidgets/higspinner.py +++ b/zenmap/zenmapGUI/higwidgets/higspinner.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higtables.py b/zenmap/zenmapGUI/higwidgets/higtables.py index 870aad4ef..d201f4c85 100644 --- a/zenmap/zenmapGUI/higwidgets/higtables.py +++ b/zenmap/zenmapGUI/higwidgets/higtables.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higtextviewers.py b/zenmap/zenmapGUI/higwidgets/higtextviewers.py index 68a386c75..97f4dab59 100644 --- a/zenmap/zenmapGUI/higwidgets/higtextviewers.py +++ b/zenmap/zenmapGUI/higwidgets/higtextviewers.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/ diff --git a/zenmap/zenmapGUI/higwidgets/higwindows.py b/zenmap/zenmapGUI/higwidgets/higwindows.py index ad4b119bf..3c118b7a1 100644 --- a/zenmap/zenmapGUI/higwidgets/higwindows.py +++ b/zenmap/zenmapGUI/higwidgets/higwindows.py @@ -3,126 +3,58 @@ # ***********************IMPORTANT NMAP LICENSE TERMS************************ # * * -# * The Nmap Security Scanner is (C) 1996-2019 Insecure.Com LLC ("The Nmap * +# * The Nmap Security Scanner is (C) 1996-2020 Insecure.Com LLC ("The Nmap * # * Project"). Nmap is also a registered trademark of the Nmap Project. * -# * 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. * # * * -# * Note that the GPL places important restrictions on "derivative works", * -# * yet it does not provide a detailed definition of that term. To avoid * -# * misunderstandings, we interpret that term as broadly as copyright law * -# * allows. For example, we consider an application to constitute a * -# * derivative work for the purpose of this license if it does any of the * -# * following with any software or content covered by this license * -# * ("Covered Software"): * +# * This program is distributed under the terms of the Nmap Public Source * +# * License (NPSL). The exact license text applying to a particular Nmap * +# * release or source code control revision is contained in the LICENSE * +# * file distributed with that version of Nmap or source code control * +# * revision. More Nmap copyright/legal information is available from * +# * https://nmap.org/book/man-legal.html, and further information on the * +# * NPSL license itself can be found at https://nmap.org/npsl. This header * +# * summarizes some key points from the Nmap license, but is no substitute * +# * for the actual license text. * # * * -# * o Integrates source code from Covered Software. * +# * Nmap is generally free for end users to download and use themselves, * +# * including commercial use. It is available from https://nmap.org. * # * * -# * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db * -# * or nmap-service-probes. * +# * The Nmap license generally prohibits companies from using and * +# * redistributing Nmap in commercial products, but we sell a special Nmap * +# * OEM Edition with a more permissive license and special features for * +# * this purpose. See https://nmap.org/oem * # * * -# * o Is designed specifically to execute Covered Software and parse the * -# * results (as opposed to typical shell or execution-menu apps, which will * -# * execute anything you tell them to). * +# * If you have received a written Nmap license agreement or contract * +# * stating terms other than these (such as an Nmap OEM license), you may * +# * choose to use and redistribute Nmap under those terms instead. * # * * -# * o Includes Covered Software in a proprietary executable installer. The * -# * installers produced by InstallShield are an example of this. Including * -# * Nmap with other software in compressed or archival form does not * -# * trigger this provision, provided appropriate open source decompression * -# * or de-archiving software is widely available for no charge. For the * -# * purposes of this license, an installer is considered to include Covered * -# * Software even if it actually retrieves a copy of Covered Software from * -# * another source during runtime (such as by downloading it from the * -# * Internet). * -# * * -# * o Links (statically or dynamically) to a library which does any of the * -# * above. * -# * * -# * o Executes a helper program, module, or script to do any of the above. * -# * * -# * This list is not exclusive, but is meant to clarify our interpretation * -# * of derived works with some common examples. Other people may interpret * -# * the plain GPL differently, so we consider this a special exception to * -# * the GPL that we apply to Covered Software. Works which meet any of * -# * these conditions must conform to all of the terms of this license, * -# * particularly including the GPL Section 3 requirements of providing * -# * source code and allowing free redistribution of the work as a whole. * -# * * -# * 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. * -# * * -# * 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 * -# * obeying all GPL rules and restrictions. For example, source code of * -# * the whole work must be provided and free redistribution must be * -# * allowed. All GPL references to "this License", are to be treated as * -# * including the terms and conditions of this license text as well. * -# * * -# * Because this license imposes special exceptions to the GPL, Covered * -# * Work may not be combined (even as part of a larger work) with plain GPL * -# * software. The terms, conditions, and exceptions of this license must * -# * be included as well. This license is incompatible with some other open * -# * source licenses as well. In some cases we can relicense portions of * -# * Nmap or grant special permissions to use it in other open source * -# * software. Please contact fyodor@nmap.org with any such requests. * -# * Similarly, we don't incorporate incompatible open source software into * -# * Covered Software without special permission from the copyright holders. * -# * * -# * If you have any questions about the licensing restrictions on using * -# * Nmap in other works, we are happy to help. As mentioned above, we also * -# * offer an alternative license to integrate Nmap into proprietary * -# * applications and appliances. These contracts have been sold to dozens * -# * of software vendors, and generally include a perpetual license as well * -# * as providing support and updates. They also fund the continued * -# * development of Nmap. Please email sales@nmap.com for further * -# * information. * -# * * -# * If you have received a written license agreement or contract for * -# * Covered Software stating terms other than these, you may choose to use * -# * and redistribute Covered Software under those terms instead of these. * +# * The official Nmap Windows builds include the Npcap software * +# * (https://npcap.org) for packet capture and transmission. It is under * +# * separate license terms which forbid redistribution without special * +# * permission. So the official Nmap Windows builds may not be * +# * redistributed without special permission (such as an Nmap OEM * +# * license). * # * * # * Source is provided to this software because we believe users 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 the dev@nmap.org mailing list for possible incorporation into the * -# * main distribution. By sending these changes to Fyodor or one of the * -# * Insecure.Org development mailing lists, or checking them into the Nmap * -# * source code repository, it is understood (unless you specify * -# * otherwise) 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, 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. * +# * and add new features. You are highly encouraged to submit your * +# * changes as a Github PR or by email to the dev@nmap.org mailing list * +# * for possible incorporation into the main distribution. Unless you * +# * specify otherwise, it is understood that you are offering us very * +# * broad rights to use your submissions as described in the Nmap Public * +# * Source License Contributor Agreement. This is important because we * +# * fund the project by selling licenses with various terms, and also * +# * because the inability to relicense code has caused devastating * +# * problems for other Free Software projects (such as KDE and NASM). * # * * -# * This program is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Nmap * -# * license file for more details (it's in a COPYING file included with * -# * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) * +# * The free version of Nmap is distributed in the hope that it will be * +# * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * +# * indemnification and commercial support are all available through the * +# * Npcap OEM program--see https://nmap.org/oem. * # * * # ***************************************************************************/