diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e6aaed..89542ee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ + +* Improve the license to allow unlimited copies of Npcap to be used + (removes the 5 copy limitation) if the copies are solely used for + Nmap and/or Wireshark. + ## Npcap 0.99-r3 [2018-04-06] * Fix recording of the Npcap Loopback Adapter's name in the service registry @@ -13,9 +18,14 @@ ## Npcap 0.99-r1 [2018-03-05] -* New Internal Use licensing option for Npcap OEM for users who need silent - installs or more than five computers, but do not want to pay for - redistribution rights. +* We now offer an Npcap OEM Edition internal-use license. This + provides all the advantages of Npcap OEM (such as the silent + installer) and removes the 5-copy limitation of the free Npcap, + while also providing for commercial support and updates. It is + for companies who only want to use Nmap internally. We also still + offer the Npcap OEM redistribution license for companies wanting to + redistribute Npcap with their software. See + https://nmap.org/npcap/oem/. * Improved installation of the Npcap Loopback Adapter, ensuring it can be correctly removed and reinstalled. diff --git a/LICENSE b/LICENSE index b7e6f04f..5e59f407 100644 --- a/LICENSE +++ b/LICENSE @@ -77,16 +77,27 @@ only have one instance of this Agreement active at once. For example, downloading the software multiple times, downloading multiple versions of the software, and/or executing the software installer multiple times do not grant any additional rights such as using the software on -more machines. Users wishing to redistribute this software or exceed -the usage limits imposed by this free license should contact -sales@nmap.com to obtain an appropriate commercial license agreement. -More details on our OEM edition is also available from -https://nmap.org/npcap/oem/. +more machines. The terms "computer" and "machine" in this license include any computing device, including software computing instances such as virtual machines and Docker containers. +Copies of Npcap do not count toward the five copy, five computer, or +five user limitations imposed by this section if they are installed +and used solely in conjunction with any of the following software: + +o The Nmap Security Scanner, as distributed from https://nmap.org + +o The Wireshark network protocl analyzer, as distributed from + https://www.wireshark.org/ + +Users wishing to redistribute Npcap or exceed the usage limits imposed +by this free license or benefit from commercial support and features +such as a silent installer should contact sales@nmap.com to obtain an +appropriate commercial license agreement. More details on our OEM +edition is also available from https://nmap.org/npcap/oem/. + DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY This program is distributed in the hope that it will be useful, but