diff --git a/CHANGELOG b/CHANGELOG index d635982c5..c6b756f96 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1045,7 +1045,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 http://npcap.org. And + security improvements and many bug fixes. See https://npcap.org. 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/NmapOps.cc b/NmapOps.cc index cff370978..6149ae998 100644 --- a/NmapOps.cc +++ b/NmapOps.cc @@ -431,7 +431,7 @@ void NmapOps::ValidateOptions() { #ifdef WIN32 if (!have_pcap) privreq = "Npcap, but it seems to be missing.\n\ -Npcap is available from http://www.npcap.org. The Npcap driver service must\n\ +Npcap is available from https://npcap.org. 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 874d22a03..0706f8981 100644 --- a/docs/3rd-party.xml +++ b/docs/3rd-party.xml @@ -285,7 +285,7 @@ Npcap - http://npcap.org/ + https://npcap.org/ Insecure.Com LLC ("The Nmap Project") &license_npcap; diff --git a/docs/Nmap-Third-Party-Open-Source.fodt b/docs/Nmap-Third-Party-Open-Source.fodt index 7c52e4109..b3b1b0765 100644 --- a/docs/Nmap-Third-Party-Open-Source.fodt +++ b/docs/Nmap-Third-Party-Open-Source.fodt @@ -1,90 +1,69 @@ - Nmap Technology License AgreementInsecure.Com LLC2016-08-17T21:15:002017-09-22T14:13:22.4824407252016-08-17T21:19:0020PT22H20M22SLibreOffice/5.3.1.2$Linux_X86_64 LibreOffice_project/30m0$Build-2FALSE0RealEstate4RealEstate4IR1:481112.1 + Nmap Technology License AgreementInsecure.Com LLC2016-08-17T21:15:002018-09-28T16:25:49.1603267922016-08-17T21:19:0021PT22H21M19SLibreOffice/6.0.3.2$Linux_X86_64 LibreOffice_project/00m0$Build-2FALSE0RealEstate4RealEstate4IR1:481112.1 - 84575 + 84653 0 - 22588 - 13291 + 22608 + 20579 true false view2 - 10739 - 89937 + 7754 + 21093 0 - 84575 - 22587 - 97864 + 84653 + 22606 + 105230 3 0 false - 177 + 193 false false - false - true - true - true - 0 - true - true - false - false - false - false - true - false - true - false - true - false - false - true - true + false - false - true - 365532 - false - true - true - false - - false - false - true - false - true - - true - false - true - false - false - 2639232 false - false - true - false - true - true + false + false + false + true + false + true + true + false + + true + + false false - true - 0 + true + false + true + false + 365532 + true + true + false false + false true - high-resolution - false - false + true + true + true + true + true + false + false ja @@ -94,34 +73,56 @@ $([\{£¥‘“〈《「『【〔＄（［｛｢￡￥ - false - true - false - false 1 - true - false - true - true - true - - true - false - false - true - false - false - false - - false - true false + true + false + + false + false + + false + true + false + + false + 0 + false + 0 + true + true false false - - false + false + true + true + false + false + true + 2716134 + true + false + true + false + high-resolution + true + true + false + true + true + true + false + false + true + false + false + false + true + false + 0 + true @@ -149,7 +150,7 @@ - + @@ -2669,33 +2670,36 @@ - + - + - + - + - + - + - + - + - + + + + @@ -2724,7 +2728,7 @@ - 2 + 4 @@ -2758,15 +2762,15 @@ License Summary: Modified BSD license (3-clause) License Text Location: BSD-modified.txt - Npcap Windows Packet Library + Npcap Windows Packet Library Description: Npcap is used by Nmap on Windows for raw packet reading during host discovery, port scanning, and OS detection. It is a derivative of LibPcap, so that license (see LibPcap section) must be followed as well. It is only needed and used on Windows. - Software URL: http://www.npcap.org/ + Software URL: https://npcap.org Version used: 0.92 License Summary: License Text Location: - Libdnet Raw Networking Library + Libdnet Raw Networking Library Description: Libdnet is bundled with Nmap and is required on all platforms for low-level tasks such as sending raw Ethernet frames. We have made many changes and so it is important that our version (distributed with Nmap) be used. Software URL: http://libdnet.sourceforge.net/ Version used: 1.12 @@ -2774,7 +2778,7 @@ License Summary: Modified BSD license (3-clause) License Text Location: Libdnet-license.txt - LibPCRE Perl Compatible Regular Expressions Library + LibPCRE Perl Compatible Regular Expressions Library Description: LibPCRE is used for regular expression matching as part of Nmap version detection. It is bundled with Nmap in the libpcre subdirectory. Software URL: http://www.pcre.org/ @@ -2782,20 +2786,20 @@ License Summary: Modified BSD license (3-clause) License Text Location: PCRE-license.txt - Lua Programming Language + Lua Programming Language Description: The LUA programming language may optionally be embedded into Nmap as part of the Nmap Scripting Engine functionality. LUA will not be included if the –without-liblua configuration option is given. If Lua is included, Nmap also includes some LUA libraries which also fall under the free LUA license (they have their own section in this document). Software URL: https://www.lua.org/ Version used: 5.3.3 License Summary: MIT license - License Text Location: Lua-license.txt + License Text Location: Lua-license.txt Lua libraries Description: If Lua is included in an Nmap build, four 3rd party Lua libraries are included as well. They are SLAXML (an XML parsing library), LuaFileSystem (for filesystem operations), LPeg (Lua Parsing Expression Grammars), lzlib for accessing Zlib compression library functions, and Base3264 for base 32 and 64 encoding and decoding. They are all under the Lua license (which is the MIT license) although the copyright statement referred to by the license is different because they were created by different authors. All four of those libraries are included in this section - SLAXML URL: https://github.com/Phrogz/SLAXML - SLAXML Version: 0.7 - SLAXML Copyright Statement: Copyright (c) 2013 Gavin Kistner + SLAXML URL: https://github.com/Phrogz/SLAXML + SLAXML Version: 0.7 + SLAXML Copyright Statement: Copyright (c) 2013 Gavin Kistner LuaFileSystem URL: https://keplerproject.github.io/luafilesystem/ LuaFileSystem Version: 1.2 LuaFileSystem Copyright Statement: Copyright © 2003 Kepler Project. @@ -2817,15 +2821,15 @@ Software URL: https://www.openssl.org/ Version used: 1.0.2l in the binaries we distribute. If you build Nmap yourself and include OpenSSL, you supply your own preferred version. License Summary: 4-clause BSD style - License Text Location: OpenSSL-license.txt + License Text Location: OpenSSL-license.txt - LIBLINEAR Linear Classification Library + LIBLINEAR Linear Classification Library Description: LIBLINEAR is used as part of Nmap’s machine-learning based IPv6 OS detection system. It’s included in the “liblinear” directory in the Nmap source tree. Software URL: https://www.csie.ntu.edu.tw/~cjlin/liblinear/ Version used: 1.7 License Summary: Modified BSD license (3-clause) - License Text Location: LIBLINEAR-license.txt + License Text Location: LIBLINEAR-license.txt Ike-scan Fingerprinting Data @@ -2833,7 +2837,7 @@ Software URL: http://www.nta-monitor.com/wiki/index.php/Ike-scan_program_notes Version used: Unversioned License Summary: Simplified (2-clause) BSD license - License Text Location: BSD-simplified + License Text Location: BSD-simplified LibSSH2 @@ -2849,7 +2853,7 @@ Software URL: https://zlib.net/ Version used: 1.2.8 License Summary: Zlib license (allows free commercial use and redistribution) - License Text Location: zlib-license.txt + License Text Location: zlib-license.txt \ No newline at end of file diff --git a/docs/Nmap-Third-Party-Open-Source.pdf b/docs/Nmap-Third-Party-Open-Source.pdf index 7d2148812..61a5c6fce 100644 Binary files a/docs/Nmap-Third-Party-Open-Source.pdf and b/docs/Nmap-Third-Party-Open-Source.pdf differ diff --git a/docs/legal-notices.xml b/docs/legal-notices.xml index f43aba93f..90f311cf8 100644 --- a/docs/legal-notices.xml +++ b/docs/legal-notices.xml @@ -197,7 +197,7 @@ url="http://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 9796045ee..0e1f0f27c 100644 --- a/docs/nmap-install.xml +++ b/docs/nmap-install.xml @@ -834,7 +834,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 @@ -911,7 +911,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/docs/nmap.1 b/docs/nmap.1 index 95ff63e38..cb0193aac 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -1,13 +1,13 @@ '\" t .\" Title: nmap -.\" Author: [see the "Author" section] +.\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/15/2018 +.\" Date: 09/28/2018 .\" Manual: Nmap Reference Guide .\" Source: Nmap .\" Language: English .\" -.TH "NMAP" "1" "03/15/2018" "Nmap" "Nmap Reference Guide" +.TH "NMAP" "1" "09/28/2018" "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\&.70 ( https://nmap\&.org ) +Nmap 7\&.70SVN ( https://nmap\&.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc\&. @@ -2457,18 +2457,16 @@ If you are able to write a patch improving Nmap or fixing a bug, that is even be .PP Particularly sensitive issues such as a security reports may be sent directly to Nmap\*(Aqs author Fyodor directly at \&. All other reports and comments should use the dev list or issue tracker instead because more people read, follow, and respond to those\&. -.SH "AUTHOR" +.SH "AUTHORS" .PP Gordon \(lqFyodor\(rq Lyon -(\m[blue]\fB\%http://insecure.org\fR\m[]) -.PP -Hundreds of people have made valuable contributions to Nmap over the years\&. These are detailed in the +wrote and released Nmap in 1997\&. Since then, hundreds of people have made valuable contributions, as detailed in the CHANGELOG -file which is distributed with Nmap and also available from -\m[blue]\fB\%https://nmap.org/changelog.html\fR\m[]\&. +file distributed with Nmap and also available from +\m[blue]\fB\%https://nmap.org/changelog.html\fR\m[]\&. David Fifield and Daniel Miller deserve special recognition for their enormous multi\-year contributions! .SH "LEGAL NOTICES" .SS "Nmap Copyright and Licensing" .PP @@ -2632,14 +2630,12 @@ and the .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[31]\d\s+2 -export control\&. It is exempt in accordance with -\m[blue]\fBScope of the Export Administration Regulations\fR\m[]\&\s-2\u[32]\d\s+2 -per \(sc734\&.2(b)(3)(i) and \(sc734\&.7(a)(4)\&. As such, there is no applicable ECCN (export control classification number) and exportation does not require any special license, permit, or other governmental authorization\&. +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[33]\d\s+2 +\m[blue]\fB5D002\fR\m[]\&\s-2\u[32]\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[34]\d\s+2\&. +\m[blue]\fBEAR 740\&.13(e)\fR\m[]\&\s-2\u[33]\d\s+2\&. .SH "NOTES" .IP " 1." 4 Nmap Network Scanning: The Official Nmap Project Guide to Network Discovery and Security Scanning @@ -2749,7 +2745,7 @@ Libpcap portable packet capture library .IP "22." 4 Ncap library .RS 4 -\%http://www.npcap.org +\%https://npcap.org .RE .IP "23." 4 PCRE library @@ -2797,16 +2793,11 @@ Export Administration Regulations (EAR) \%http://www.access.gpo.gov/bis/ear/ear_data.html .RE .IP "32." 4 -Scope of the Export Administration Regulations -.RS 4 -\%https://bis.doc.gov/index.php/forms-documents/doc_view/412-part-734-scope-of-the-export-administration-regulations -.RE -.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 "34." 4 +.IP "33." 4 EAR 740.13(e) .RS 4 \%http://www.access.gpo.gov/bis/ear/pdf/740.pdf diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index c7dda997e..3d22f2902 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -363,7 +363,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 http://www.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.org. Resorting to connect() mode -- Nmap may not function completely"); o.have_pcap=false; } #endif diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1 index 1907dae23..0a3d3c2de 100644 --- a/ncat/docs/ncat.1 +++ b/ncat/docs/ncat.1 @@ -2,12 +2,12 @@ .\" Title: Ncat .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/15/2018 +.\" Date: 09/28/2018 .\" Manual: Ncat Reference Guide .\" Source: Ncat .\" Language: English .\" -.TH "NCAT" "1" "03/15/2018" "Ncat" "Ncat Reference Guide" +.TH "NCAT" "1" "09/28/2018" "Ncat" "Ncat Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -43,7 +43,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog .RS 4 .\} .nf -Ncat 7\&.70 ( https://nmap\&.org/ncat ) +Ncat 7\&.70SVN ( https://nmap\&.org/ncat ) Usage: ncat [options] [hostname] [port] Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds, @@ -77,6 +77,7 @@ Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds, \-\-append\-output Append rather than clobber specified output files \-\-send\-only Only send data, ignoring received; quit on EOF \-\-recv\-only Only receive data, never send anything + \-\-no\-shutdown Continue half\-duplex when receiving EOF on stdin \-\-allow Allow only given hosts to connect to Ncat \-\-allowfile A file of hosts allowed to connect to Ncat \-\-deny Deny given hosts from connecting to Ncat @@ -473,7 +474,7 @@ If this option is passed, then Ncat will only send data and will ignore anything .PP \fB\-\-no\-shutdown\fR (Do not shutdown into half\-duplex mode) .RS 4 -If this option is passed, Ncat will not invoke shutdown on a socket aftering seeing EOF on stdin\&. This is provided for backward\-compatibility with OpenBSD netcat, which exhibits this behavior when executed with its \*(Aq\-d\*(Aq option\&. +If this option is passed, Ncat will not invoke shutdown on a socket after seeing EOF on stdin\&. This is provided for backward\-compatibility with OpenBSD netcat, which exhibits this behavior when executed with its \*(Aq\-d\*(Aq option\&. .RE .PP \fB\-t\fR, \fB\-\-telnet\fR (Answer Telnet negotiations) @@ -703,7 +704,7 @@ Libpcap portable packet capture library .IP " 4." 4 Npcap library .RS 4 -\%http://www.npcap.org +\%https://npcap.org .RE .IP " 5." 4 Libdnet diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml index a8d57f40d..dc84162ed 100644 --- a/ncat/docs/ncat.xml +++ b/ncat/docs/ncat.xml @@ -1104,7 +1104,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/docs/nping.1 b/nping/docs/nping.1 index f17fd205d..f682d8639 100644 --- a/nping/docs/nping.1 +++ b/nping/docs/nping.1 @@ -2,12 +2,12 @@ .\" Title: nping .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 03/15/2018 +.\" Date: 09/28/2018 .\" Manual: Nping Reference Guide .\" Source: Nping .\" Language: English .\" -.TH "NPING" "1" "03/15/2018" "Nping" "Nping Reference Guide" +.TH "NPING" "1" "09/28/2018" "Nping" "Nping Reference Guide" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -78,7 +78,13 @@ Nping done: 2 IP addresses pinged in 4\&.01 seconds .if n \{\ .RE .\} -.SH "OPTIONS SUMMARY" +.PP +The newest version of Nping can be obtained with Nmap at +\m[blue]\fB\%https://nmap.org\fR\m[]\&. The newest version of this man page is available at +\m[blue]\fB\%https://nmap.org/book/nping-man.html\fR\m[]\&. + +\-\-> + .SH "OPTIONS SUMMARY" .PP This options summary is printed when Nping is run with no arguments\&. It helps people remember the most common options, but is no substitute for the in\-depth documentation in the rest of this manual\&. Some obscure options aren\*(Aqt even included here\&. .sp @@ -1748,23 +1754,16 @@ Like level 5 but it enables full, very detailed, debug information related to ex .RE .SH "BUGS" .PP -Like its author, Nping isn\*(Aqt perfect\&. But you can help make it better by sending bug reports or even writing patches\&. If Nping doesn\*(Aqt behave the way you expect, first upgrade to the latest Nmap version available from -\m[blue]\fB\%https://nmap.org/download.html\fR\m[]\&. If the problem persists, do some research to determine whether it has already been discovered and addressed\&. Try searching for the error message on our search page at -\m[blue]\fB\%http://insecure.org/search.html\fR\m[] -or at Google\&. Also try browsing the -nmap\-dev -archives at -\m[blue]\fB\%http://seclists.org/\fR\m[] -Read this full manual page as well\&. If nothing comes out of this, mail a bug report to -\&. Please include everything you have learned about the problem, as well as what version of Nping you are running and what operating system version it is running on\&. Problem reports and Nping usage questions sent to - -are far more likely to be answered than those sent to Fyodor directly\&. If you subscribe to the nmap\-dev list before posting, your message will bypass moderation and get through more quickly\&. Subscribe at -\m[blue]\fB\%https://nmap.org/mailman/listinfo/dev\fR\m[]\&. +Like its authors, Nping isn\*(Aqt perfect\&. But you can help make it better by sending bug reports or even writing patches\&. If Nping doesn\*(Aqt behave the way you expect, first upgrade to the latest version available from +\m[blue]\fB\%https://nmap.org\fR\m[]\&. If the problem persists, do some research to determine whether it has already been discovered and addressed\&. Try searching for the problem or error message on Google since that aggregates so many forums\&. If nothing comes of this, create an Issue on our tracker (\m[blue]\fB\%http://issues.nmap.org\fR\m[]) and/or mail a bug report to +\&. If you subscribe to the nmap\-dev list before posting, your message will bypass moderation and get through more quickly\&. Subscribe at +\m[blue]\fB\%https://nmap.org/mailman/listinfo/dev\fR\m[]\&. Please include everything you have learned about the problem, as well as what version of Nping you are using and what operating system version it is running on\&. Other suggestions for improving Nping may be sent to the Nmap dev mailing list as well\&. .PP -Code patches to fix bugs are even better than bug reports\&. Basic instructions for creating patch files with your changes are available at -\m[blue]\fB\%https://svn.nmap.org/nmap/HACKING\fR\m[]\&. Patches may be sent to -nmap\-dev -(recommended) or to any of the authors listed in the next section directly\&. +If you are able to write a patch improving Nping or fixing a bug, that is even better! Instructions for submitting patches or git pull requests are available from +\m[blue]\fB\%https://github.com/nmap/nmap/blob/master/CONTRIBUTING.md\fR\m[] +.PP +Particularly sensitive issues such as a security reports may be sent directly to Fyodor directly at +\&. All other reports and comments should use the dev list or issue tracker instead because more people read, follow, and respond to those\&. .SH "AUTHORS" .PP Luis MartinGarcia diff --git a/nping/winfix.cc b/nping/winfix.cc index 8aab563ea..82413765d 100644 --- a/nping/winfix.cc +++ b/nping/winfix.cc @@ -362,7 +362,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 http://www.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.org. Resorting to connect() mode -- Nmap may not function completely"); o.setHavePcap(false); } #endif