diff --git a/docs/Npcap-Third-Party-Open-Source.fodt b/docs/Npcap-Third-Party-Open-Source.fodt
index e8ec5942..6becb6df 100644
--- a/docs/Npcap-Third-Party-Open-Source.fodt
+++ b/docs/Npcap-Third-Party-Open-Source.fodt
@@ -4,25 +4,25 @@
Third-Party Open Source Software Used By NpcapInsecure.Com LLC2016-08-17T21:15:002022-01-25T14:15:09.0900000002016-08-17T21:19:0035PT23H14M2SLibreOffice/6.4.7.2$Linux_X86_64 LibreOffice_project/40$Build-2
- 92922
+ 0
0
- 36038
- 49638
+ 22666
+ 31219
false
false
view2
- 13446
- 101593
+ 15893
+ 23902
0
- 92922
- 36036
- 142558
- 0
+ 0
+ 22664
+ 31217
+ 3
1
false
- 100
+ 159
false
false
@@ -92,7 +92,7 @@
true
- 6082627
+ 6084322
true
false
@@ -148,8 +148,8 @@
-
-
+
+
@@ -157,7 +157,7 @@
-
+
@@ -174,7 +174,7 @@
-
+
@@ -221,11 +221,11 @@
-
+
-
+
@@ -342,16 +342,16 @@
-
+
-
+
-
+
-
+
@@ -362,44 +362,24 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
@@ -419,37 +399,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -476,7 +456,7 @@
-
+
@@ -581,7 +561,7 @@
-
+
Unknown Author
@@ -589,7 +569,7 @@
-
+
Unknown Author
@@ -597,7 +577,7 @@
-
+
Unknown Author
@@ -605,7 +585,7 @@
-
+
Unknown Author
@@ -613,7 +593,7 @@
-
+
Unknown Author
@@ -621,7 +601,7 @@
-
+
Unknown Author
@@ -629,7 +609,7 @@
-
+
Unknown Author
@@ -637,7 +617,7 @@
-
+
Unknown Author
@@ -645,7 +625,7 @@
-
+
Unknown Author
@@ -653,7 +633,7 @@
-
+
Unknown Author
@@ -661,7 +641,7 @@
-
+
Unknown Author
@@ -669,7 +649,7 @@
-
+
Unknown Author
@@ -677,7 +657,7 @@
-
+
Unknown Author
@@ -685,7 +665,7 @@
-
+
Unknown Author
@@ -693,7 +673,7 @@
-
+
Unknown Author
@@ -701,7 +681,7 @@
-
+
Unknown Author
@@ -709,7 +689,7 @@
-
+
Unknown Author
@@ -717,7 +697,7 @@
-
+
Unknown Author
@@ -725,7 +705,7 @@
-
+
Unknown Author
@@ -733,7 +713,7 @@
-
+
Unknown Author
@@ -741,7 +721,7 @@
-
+
Unknown Author
@@ -749,7 +729,7 @@
-
+
Unknown Author
@@ -757,7 +737,7 @@
-
+
Unknown Author
@@ -765,7 +745,7 @@
-
+
Unknown Author
@@ -773,7 +753,7 @@
-
+
Unknown Author
@@ -789,25 +769,25 @@
- Third-Party Open Source Software Used By Npcap
+ Third-Party Open Source Software Used By Npcap
- Npcap (https://npcap.com) is a software library for packet capture and transmission on the Microsoft Windows platform,. as distributed and described at https://npcap.com. There is a free/demo Npcap which is mostly for personal use, and a commercial Npcap OEM Edition for companies who want automated deployment, commercial support, greater internal-use rights, or even to redistribute Npcap OEM within their rproducts.
+ Npcap (https://npcap.com) is a software library for packet capture and transmission on the Microsoft Windows platform,. as distributed and described at https://npcap.com. There is a free/demo Npcap which is mostly for personal use, and a commercial Npcap OEM Edition for companies who want automated deployment, commercial support, greater internal-use rights, or even to redistribute Npcap OEM within their rproducts.
- Npcap uses three third-party open source software components: Libpcap, Winpcap, and ieee80211_radiotap.h. All of these are open source with BSD-style licenses that allow for unlimited use and royalty-free redistribution within other software (including commercial/proprietary software). Some include a warranty disclaimer (relating to the original authors) and require a small amount of acknowledgment text be added to the documentation of any software which includes them (including indirectly through Npcap). An example of such text provided in the next section of this document.is in the copyright statements section at the end of this document. S Since Nmap Software LLC is not the author of this third-party code, we can not waive or modify its software copyright or license. Npcap users and redistributors must comply with the relevant Npcap license (either the free/demo license or a commercial Npcap OEM license) as well as the fairly minimal requirements of the third-party open source software listed here. Each of the three components has a section later in this document detailing the software and providing its full license text.
+ Npcap uses three third-party open source software components: Libpcap, Winpcap, and ieee80211_radiotap.h. All of these are open source with BSD-style licenses that allow for unlimited use and royalty-free redistribution within other software (including commercial/proprietary software). Some include a warranty disclaimer (relating to the original authors) and require a small amount of acknowledgment text be added to the documentation of any software which includes them (including indirectly through Npcap). An example of such text provided in the next section of this document.is in the copyright statements section at the end of this document. S Since Nmap Software LLC is not the author of this third-party code, we can not waive or modify its software copyright or license. Npcap users and redistributors must comply with the relevant Npcap license (either the free/demo license or a commercial Npcap OEM license) as well as the fairly minimal requirements of the third-party open source software listed here. Each of the three components has a section later in this document detailing the software and providing its full license text.
- Please note that all Npcap support, warranties and indemnification that we (Nmap Software LLC) offer to commercial customers apply to these third-party libraries along with all components and all other Npcap code. The warranty disclaimers in their license text just mean that the original library authors and maintainers aren’t responsible for that support you buy from us instead.
+ Please note that all Npcap support, warranties and indemnification that we (Nmap Software LLC) offer to commercial customers apply to these third-party libraries along with all components and all other Npcap code. The warranty disclaimers in their license text just mean that the original library authors and maintainers aren’t responsible for that support you buy from us instead.
This document covers Npcap version 1.60. Licensees or potential licensees who want this information for a different Npcap release should contact sales@nmap.com.
- Anyone may redistribute this document in whole or part, including incorporating it into larger documents. In particular, redistributing this document along with Npcap OEM (for parties who hold an Npcap OEM Redistribution License) is often helpful to comply with attribution and warranty disclaimer clauses of the software component licenses detailed belowherein.
-
- Suggested Acknowledgment Text
+ Anyone may redistribute this document in whole or part, including incorporating it into larger documents. In particular, redistributing this document along with Npcap OEM (for parties who hold an Npcap OEM Redistribution License) is often helpful to comply with attribution and warranty disclaimer clauses of the software component licenses detailed belowherein.
+
+ Suggested Acknowledgment Text
To give credit where due and also comply with attribution clauses of the various 3rd party software component licenses detailed in this document, we suggest that companies licensed to redistribute Npcap OEM include this document itself along with their software and also include a statement like the one below in their documentation:
- This program contains the Npcap OEM Windows packet capturing software (https://npcap.com) pursuant to a license agreement with Nmap Software LLC. Npcap OEM contains programming code from the Libpcap project (https://www.tcpdump.org) which is Copyright (c) by The TCPdump Group and its contributors. Npcap also incorporates code from the now-defunct Winpcap software (https://winpcap.org) which is Copyright (c) NetGroup, Politecnico di Torino, CACE Technologies, and The Regents of the University of California. In addition, Npcap contains an ieee80211_radiotap.h header file which is Copyright (c) David Young. Full license text and details for these 3rd party components are available in the Npcap-Third-Party-Open-Source.pdf file included with this program and/or available at https://npcap.com/src/docs/Npcap-Third-Party-Open-Source.pdf.
-
- Libpcap Portable Packet Capturing Library
+ This program contains the Npcap OEM Windows packet capturing software (https://npcap.com) pursuant to a license agreement with Nmap Software LLC. Npcap OEM contains programming code from the Libpcap project (https://www.tcpdump.org) which is Copyright (c) by The TCPdump Group and its contributors. Npcap also incorporates code from the now-defunct Winpcap software (https://winpcap.org) which is Copyright (c) NetGroup, Politecnico di Torino, CACE Technologies, and The Regents of the University of California. In addition, Npcap contains an ieee80211_radiotap.h header file which is Copyright (c) David Young. Full license text and details for these 3rd party components are available in the Npcap-Third-Party-Open-Source.pdf file included with this program and/or available at https://npcap.com/src/docs/Npcap-Third-Party-Open-Source.pdf.
+
+ Libpcap Portable Packet Capturing Library
Description: Libpcap is a popular reference implementation of the pcap packet capturing API. It is produced by The TCPdump Group and supports Linux and Mac OS X systems (among others). Npcap implements this API for Microsoft Windows by combining the high-level open source libpcap API code with our own custom Windows driver that implements the low-level network operations. Our wpcap.dll library file is mostly libpcap code. We occasionally make our own fixes and changes to the libpcap code, but we have a great relationship with The TCPdump Group and try to submit all of our changes to them for incorporation in future libpcap releases.
Software URL: http://www.tcpdump.org/
@@ -821,40 +801,40 @@
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- Winpcap Windows Packet Capturing Library
+ Winpcap Windows Packet Capturing Library
Description: Winpcap is an earlier (now abandoned) open source implementation of the pcap API for Windows. The last Winpcap release was made in March 2013. We created Npcap by starting with that abandoned code and updating it to support modern Windows NDIS API’s and fixing well-known bugs and security issues. While Npcap has diverged substantially over the years, it still contains a substantial amount of original Winpcap code, so the Winpcap license must be followed. It 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: https://www.winpcap.org/
Version used: 4.1.3
License Summary: Modified BSD license (3-clause) – allows free redistribution as long as you include attribution statement and warranty disclaimer somewhere in your documentation. The fourth clause, which relates to attribution in advertising materials has been officially removed and revoked by the University of California, Berkeley: https://ipira.berkeley.edu/sites/default/files/shared/docs/Advertising_clause_removed_from_BSD_license.pdf
License Text: This was taken from https://www.winpcap.org/misc/copyright.htm on March 11, 2016 and we made the following updates:
-
+
- Removed the “advertising clause” from University of California, Berkeley copyright statement because they have officially removed and revoked that as documented here: https://ipira.berkeley.edu/sites/default/files/shared/docs/Advertising_clause_removed_from_BSD_license.pdf
+ Removed the “advertising clause” from University of California, Berkeley copyright statement because they have officially removed and revoked that as documented here: https://ipira.berkeley.edu/sites/default/files/shared/docs/Advertising_clause_removed_from_BSD_license.pdf
- Removed copyright notice from Kungliga Tekniska Högskolan because that code is no longer in Npcap.
+ Removed copyright notice from Kungliga Tekniska Högskolan because that code is no longer in Npcap.
- Removed copyright notice from Yen Yen Lim and north Dakota State University because that code is no longer in Npcap.
+ Removed copyright notice from Yen Yen Lim and north Dakota State University because that code is no longer in Npcap.
- Removed copyright notice from Digital Equipment Corporation because that code is no longer in Npcap.
+ Removed copyright notice from Digital Equipment Corporation because that code is no longer in Npcap.
- Removed copyright notice from WIDE Project because that code is no longer in Npcap.
+ Removed copyright notice from WIDE Project because that code is no longer in Npcap.
- Removed copyright notice from Juniper Networks because that code is no longer in Npcap.
+ Removed copyright notice from Juniper Networks because that code is no longer in Npcap.
- Removed copyright notice from Daniel Hartmeier since that code is no longer in Npcap.
+ Removed copyright notice from Daniel Hartmeier since that code is no longer in Npcap.
- Removed copyright notice from Carnegie Mellon since that code is no longer in Npcap.
+ Removed copyright notice from Carnegie Mellon since that code is no longer in Npcap.
- Removed the 1983 copyright notice from UC Berkeley since that code is no longer in Npcap. The notice from their 1990’s contributions is still there.
+ Removed the 1983 copyright notice from UC Berkeley since that code is no longer in Npcap. The notice from their 1990’s contributions is still there.
@@ -873,7 +853,7 @@
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- The ieee80211_radiotap.h Header File
+ The ieee80211_radiotap.h Header File
Description: This is just a short header file defining data structures for the IEEE 802.11 radio capture header.
Software URL: http://web.mit.edu/~mkgray/afs/bar/afs/sipb.mit.edu/project/freebsd/head/contrib/wpa/src/utils/radiotap.h
@@ -886,12 +866,12 @@
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. The name of David Young may not be used to endorse or promote products derived from this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- Copyright Statements and Acknowledgment/Disclaimer Text
+ THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ Copyright Statements and Acknowledgment/Disclaimer Text
- To give credit where due and also comply with attribution clauses of the various 3rd party software component licenses detailed in this document, we suggest that companies licensed to redistribute Npcap OEM include this document along with their software and also include the following (or similar) statement in their documentation:
+ To give credit where due and also comply with attribution clauses of the various 3rd party software component licenses detailed in this document, we suggest that companies licensed to redistribute Npcap OEM include this document along with their software and also include the following (or similar) statement in their documentation:
- This program contains the Npcap OEM Windows packet capturing software (https://npcap.com) pursuant to a license agreement with Nmap Software LLC. Npcap OEM contains programming code from the Libpcap project (https://www.tcpdump.org) which is and also from WinPcap (https://winpcap.org).
+ This program contains the Npcap OEM Windows packet capturing software (https://npcap.com) pursuant to a license agreement with Nmap Software LLC. Npcap OEM contains programming code from the Libpcap project (https://www.tcpdump.org) which is and also from WinPcap (https://winpcap.org).
the following acknowledgment/disclaimer statement in the
@@ -920,7 +900,7 @@
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. The name of David Young may not be used to endorse or promote products derived from this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/docs/Npcap-Third-Party-Open-Source.pdf b/docs/Npcap-Third-Party-Open-Source.pdf
index 6a38aa1b..7dc4d315 100644
Binary files a/docs/Npcap-Third-Party-Open-Source.pdf and b/docs/Npcap-Third-Party-Open-Source.pdf differ