diff --git a/CHANGELOG b/CHANGELOG index defa62203..40c9ace44 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,7 +20,7 @@ Nmap 7.92 [2021-08-07] o [Windows] Upgraded Npcap (our Windows raw packet capturing and transmission driver) from version 1.00 to the latest version 1.50. You can read about the dozens of performance improvements, bug fixes and feature - enhancements at https://npcap.org/changelog. + enhancements at https://npcap.com/changelog. o [Windows] Thanks to the Npcap 1.50 upgrade, Nmap now works on the Windows ARM architecture so you can run it on lightweight and power-efficient @@ -82,7 +82,7 @@ o [GH#2350] Upgraded OpenSSL to version 1.1.1k. This addresses some https://github.com/nmap/nmap/issues/2350 o Removed support for the ancient WinPcap library since we already include - our own Npcap library (https://npcap.org) supporting the same API. WinPcap + our own Npcap library (https://npcap.com) supporting the same API. WinPcap was abandoned years ago and it's official download page says that "WE RECOMMEND USING Npcap INSTEAD" for security, stability, compatibility, and support reasons. @@ -219,7 +219,7 @@ 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. + at https://npcap.com/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 @@ -512,10 +512,10 @@ o [NSE] Fixed a bug in http-wordpress-users.nse that could cause Nmap 7.80 [2019-08-10] -o [Windows] The Npcap Windows packet capturing library (https://npcap.org/) +o [Windows] The Npcap Windows packet capturing library (https://npcap.com/) is faster and more stable than ever. Nmap 7.80 updates the bundled Npcap from version 0.99-r2 to 0.9982, including all of these changes from the - last 15 Npcap releases: https://nmap.org/npcap/changelog + last 15 Npcap releases: https://npcap.com/changelog o [NSE] Added 11 NSE scripts, from 8 authors, bringing the total up to 598! They are all listed at https://nmap.org/nsedoc/, and the summaries are @@ -843,11 +843,11 @@ o New service probe and match lines for adb, the Android Debug Bridge, which Nmap 7.70 [2018-03-20] o [Windows] We made a ton of improvements to our Npcap Windows packet - capturing library (https://nmap.org/npcap/) for greater performance and + capturing library (https://npcap.com/) for greater performance and stability, as well as smoother installer and better 802.11 raw frame capturing support. Nmap 7.70 updates the bundled Npcap from version 0.93 to 0.99-r2, including all these changes from the last seven Npcap releases: - https://nmap.org/npcap/changelog + https://npcap.com/changelog o Integrated all of your service/version detection fingerprints submitted from March 2017 to August 2017 (728 of them). The signature count went up 1.02% @@ -1754,7 +1754,7 @@ Nmap 7.25BETA1 [2016-07-15] o Nmap now ships with and uses Npcap, our new packet sniffing library for Windows. It's based on WinPcap (unmaintained for years), but uses modern Windows APIs for better performance. It also includes - security improvements and many bug fixes. See https://npcap.org. And + security improvements and many bug fixes. See https://npcap.com. And it enables Nmap to perform SYN scans and OS detection against localhost, which we haven't been able to do on Windows since Microsoft removed the raw sockets API in 2003. [Yang Luo, Daniel diff --git a/LICENSE b/LICENSE index ffb37f25f..a7fb0aa63 100644 --- a/LICENSE +++ b/LICENSE @@ -244,7 +244,7 @@ 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 +(https://npcap.com) 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 diff --git a/NmapOps.cc b/NmapOps.cc index d100713fb..2c4d00175 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -366,7 +366,7 @@ void NmapOps::ValidateOptions() { #ifdef WIN32 if (!have_pcap) privreq = "Npcap, but it seems to be missing.\n\ -Npcap is available from https://npcap.org. The Npcap driver service must\n\ +Npcap is available from https://npcap.com. The Npcap driver service must\n\ be started by an administrator before Npcap can be used. Running nmap.exe\n\ will open a UAC dialog where you can start the service if you have\n\ administrator privileges."; diff --git a/docs/3rd-party.xml b/docs/3rd-party.xml index 189ee6fb1..981dd1f2a 100644 --- a/docs/3rd-party.xml +++ b/docs/3rd-party.xml @@ -260,7 +260,7 @@ Npcap - https://npcap.org/ + https://npcap.com/ Nmap Software LLC ("The Nmap Project") &license_npcap; diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml index 5cae07900..0857cf50e 100644 --- a/docs/legal-notices.xml +++ b/docs/legal-notices.xml @@ -126,7 +126,7 @@ 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 +Ncap libraryNpcap instead. Regular expression support is provided by the PCRE library,Perl Compatible Regular Expressions (PCRE) diff --git a/docs/nmap-install.xml b/docs/nmap-install.xml index 761a336d8..2ce6ababb 100644 --- a/docs/nmap-install.xml +++ b/docs/nmap-install.xml @@ -828,7 +828,7 @@ We include a recent Npcap installer which is available in the zip file as npcap-version.exe, where version is the Npcap version rather than the Nmap version. Alternatively, you can obtain and install -the latest version from . +the latest version from . Due to the way Nmap is compiled, it requires the @@ -904,7 +904,7 @@ failures. installing our binary self-installer or executing npcap-version.exe from our zip package. Alternatively, you can obtain the official installer at -. +. Instructions for executing your compiled Nmap are given in the next section. diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index 5a486e908..a059caaa5 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -268,7 +268,7 @@ SectionEnd !endif Section /o "Check online for newer Npcap" SecNewNpcap - ExecShell "open" "https://npcap.org/#download" + ExecShell "open" "https://npcap.com/#download" SectionEnd Section "Network Performance Improvements" SecPerfRegistryMods @@ -457,7 +457,7 @@ FunctionEnd LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executable, NSE scripts and Visual C++ ${VCREDISTYEAR} runtime components" 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_SecNewNpcap ${LANG_ENGLISH} "Opens npcap.org in your web browser so you can check for a newer version of Npcap." + LangString DESC_SecNewNpcap ${LANG_ENGLISH} "Opens npcap.com in your web browser so you can check for a newer version of Npcap." 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. Recommended." diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index 12e6b6a47..9aad993f5 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -251,7 +251,7 @@ void win_init() } #ifdef _MSC_VER __except (1) { - error("WARNING: Could not import all necessary Npcap functions. You may need to upgrade to the latest version from https://npcap.org. Resorting to connect() mode -- Nmap may not function completely"); + error("WARNING: Could not import all necessary Npcap functions. You may need to upgrade to the latest version from https://npcap.com. Resorting to connect() mode -- Nmap may not function completely"); o.have_pcap=false; } #endif diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml index 894d6036b..ff40f6877 100644 --- a/ncat/docs/ncat.xml +++ b/ncat/docs/ncat.xml @@ -1206,7 +1206,7 @@ url="http://www.tcpdump.org">Libpcap portable packet capture librarylibpcap is distributed along with Ncat. The Windows version of Ncat utilized the Libpcap-derived -Npcap libraryNpcap +Npcap libraryNpcap instead. Certain raw networking functions use the Libdnetlibdnet diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc index 8a024ad3a..1ad6c1cac 100644 --- a/nping/NpingOps.cc +++ b/nping/NpingOps.cc @@ -2232,7 +2232,7 @@ const char *privreq = "root privileges"; #ifdef WIN32 //if (!this->have_pcap) privreq = "Npcap, but it seems to be missing.\n\ -Npcap is available from https://npcap.org. The Npcap driver service must\n\ +Npcap is available from https://npcap.com. The Npcap driver service must\n\ be started by an administrator before Npcap can be used. Running nping.exe\n\ will open a UAC dialog where you can start the service if you have\n\ administrator privileges."; diff --git a/nping/winfix.cc b/nping/winfix.cc index b603e257c..d57b2ab18 100644 --- a/nping/winfix.cc +++ b/nping/winfix.cc @@ -248,7 +248,7 @@ void win_init() } #ifdef _MSC_VER __except (1) { - error("WARNING: Could not import all necessary Npcap functions. You may need to upgrade to the latest version from https://npcap.org. Resorting to connect() mode -- Nmap may not function completely"); + error("WARNING: Could not import all necessary Npcap functions. You may need to upgrade to the latest version from https://npcap.com. Resorting to connect() mode -- Nmap may not function completely"); o.setHavePcap(false); } #endif