Skip to content

Commit

Permalink
Update Npcap URL to new SSL version
Browse files Browse the repository at this point in the history
  • Loading branch information
fyodor committed Sep 28, 2018
1 parent 68b6c29 commit b3cece2
Show file tree
Hide file tree
Showing 13 changed files with 154 additions and 159 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NmapOps.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand Down
2 changes: 1 addition & 1 deletion docs/3rd-party.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
</package>
<package id="npcap">
<name>Npcap</name>
<url>http://npcap.org/</url>
<url>https://npcap.org/</url>
<copyright>Insecure.Com LLC ("The Nmap Project")</copyright>
<license>&license_npcap;</license>
</package>
Expand Down
210 changes: 107 additions & 103 deletions docs/Nmap-Third-Party-Open-Source.fodt

Large diffs are not rendered by default.

Binary file modified docs/Nmap-Third-Party-Open-Source.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/legal-notices.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ url="http://www.tcpdump.org">Libpcap portable packet capture
library</ulink><indexterm><primary>libpcap</primary></indexterm>
is distributed along with Nmap.
The Windows version of Nmap utilizes the Libpcap-derived
<ulink role="hidepdf" url="http://www.npcap.org">Ncap library</ulink><indexterm><primary>Npcap</primary></indexterm>
<ulink role="hidepdf" url="https://npcap.org">Ncap library</ulink><indexterm><primary>Npcap</primary></indexterm>
instead.
Regular expression support is provided by the
<ulink role="hidepdf" url="http://www.pcre.org">PCRE library</ulink>,<indexterm><primary>Perl Compatible Regular Expressions (PCRE)</primary></indexterm>
Expand Down
4 changes: 2 additions & 2 deletions docs/nmap-install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ We include a recent Npcap installer which is available in the zip file
as <filename>npcap-<replaceable>version</replaceable>.exe</filename>,
where <replaceable>version</replaceable> is the Npcap version rather
than the Nmap version. Alternatively, you can obtain and install
the latest version from <ulink url="http://www.npcap.org" />.
the latest version from <ulink url="https://npcap.org" />.
</para></listitem>

<listitem><para>Due to the way Nmap is compiled, it requires the
Expand Down Expand Up @@ -911,7 +911,7 @@ failures.</para></listitem>
installing our binary self-installer or executing
<filename>npcap-<replaceable>version</replaceable>.exe</filename> from
our zip package. Alternatively, you can obtain the official installer at
<ulink url="http://www.npcap.org"/>.</para></listitem>
<ulink url="https://npcap.org"/>.</para></listitem>

<listitem><para>Instructions for executing your compiled Nmap are
given in the next section.</para></listitem>
Expand Down
35 changes: 13 additions & 22 deletions docs/nmap.1
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'\" t
.\" Title: nmap
.\" Author: [see the "Author" section]
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand Down Expand Up @@ -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\&.
Expand Down Expand Up @@ -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
<fyodor@nmap\&.org>\&. 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
<fyodor@nmap\&.org>
(\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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mswin32/winfix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions ncat/docs/ncat.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
.\" Title: Ncat
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ncat/docs/ncat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ url="http://www.tcpdump.org">Libpcap portable packet capture
library</ulink><indexterm><primary>libpcap</primary></indexterm>
is distributed along with Ncat.
The Windows version of Ncat utilized the Libpcap-derived
<ulink role="hidepdf" url="http://www.npcap.org">Npcap library</ulink><indexterm><primary>Npcap</primary></indexterm>
<ulink role="hidepdf" url="https://npcap.org">Npcap library</ulink><indexterm><primary>Npcap</primary></indexterm>
instead.
Certain raw networking functions use the
<ulink role="hidepdf" url="http://libdnet.sourceforge.net">Libdnet</ulink><indexterm><primary>libdnet</primary></indexterm>
Expand Down
39 changes: 19 additions & 20 deletions nping/docs/nping.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
.\" Title: nping
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" 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
.\" -----------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
<dev@nmap\&.org>\&. 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
<dev@nmap\&.org>
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[]\&.
.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\&.
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
<dev@nmap\&.org>\&. 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
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
<fyodor@nmap\&.org>\&. 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
Expand Down
2 changes: 1 addition & 1 deletion nping/winfix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b3cece2

Please sign in to comment.