Browse Source

Mention trunnel in LICENSE and src/ext/README

Nick Mathewson 9 years ago
parent
commit
36700ee99e
2 changed files with 37 additions and 0 deletions
  1. 32 0
      LICENSE
  2. 5 0
      src/ext/README

+ 32 - 0
LICENSE

@@ -122,6 +122,38 @@ src/ext/csiphash.c is licensed under the following license:
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  THE SOFTWARE.
+===============================================================================
+Trunnel is distributed under this license:
+
+Copyright 2014  The Tor Project, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+    * 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.
+
+    * Neither the names of the copyright owners 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 COPYRIGHT HOLDERS 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 COPYRIGHT
+OWNER 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.
 
 
 ===============================================================================
 ===============================================================================
 src/config/geoip is licensed under the following license:
 src/config/geoip is licensed under the following license:

+ 5 - 0
src/ext/README

@@ -49,3 +49,8 @@ siphash.h
     Marek Majkowski's implementation of siphash 2-4, a secure keyed
     Marek Majkowski's implementation of siphash 2-4, a secure keyed
     hash algorithm to avoid collision-based DoS attacks against hash
     hash algorithm to avoid collision-based DoS attacks against hash
     tables.
     tables.
+
+trunnel/*.[ch]
+
+    Headers and runtime code for Trunnel, a system for generating
+    code to encode and decode binary formats.