aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-01-03 14:05:27 -0800
committerAnders Broman <a.broman58@gmail.com>2019-01-04 05:07:07 +0000
commit1db84c93307643ab42c726815b89fe65089f6fbc (patch)
tree6c6fe2d2edb3cea93a09fb1e48226531bd0f16ac
parent5dfec5f64f2c46a6150be5f6c63b596288e47914 (diff)
WSDG: Add a note about Npcap licensing.
Expand the Npcap text. Make it clear that you might need to purchase a license to redistribute Npcap. Change-Id: I9340ed2d363e66443797478c59859ce10d648aff Reviewed-on: https://code.wireshark.org/review/31351 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--docbook/wsdg_src/WSDG_chapter_libraries.asciidoc22
1 files changed, 20 insertions, 2 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
index f3a502e487..32b596e0ca 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
@@ -235,14 +235,32 @@ platform, you can get it at {tcpdump-main-url}.
[discrete]
==== Windows: Npcap
-You can get the Npcap Windows packet capture library at {npcap-main-url}.
+The Windows build environment compiles and links against the
+{winpcap-main-url}devel.htm[WinPcap SDK (WpdPack)] and includes the
+{npcap-main-url}[Npcap packet capture driver] with the .exe installer.
+Both are <<ChLibsSetup,automatically downloaded by CMake>>.
+
+You can download the Npcap Windows packet capture library manually from
+{npcap-main-url}.
+
+[IMPORTANT]
+.Npcap has its own license with its own restrictions
+====
+Insecure.Com LLC, aka “The Nmap Project” has granted the Wireshark
+Foundation the right to include Npcap with the installers that we
+distribute from wireshark.org. If you wish to distribute your own
+Wireshark installer or any other package that includes Npcap you must
+comply with the {npcap-license-url}[Npcap license] and may be required
+to purchase a redistribution license. Please see {npcap-main-url} for
+more details.
+====
[[ChLibsGNUTLS]]
=== GnuTLS (Optional)
The GNU Transport Layer Security Library is used to enable TLS decryption
-using a RSA private key.
+using an RSA private key.
[[ChLibsUnixGNUTLS]]