aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-12 10:09:45 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-12 10:09:45 -0500
commitf4656c0cc9c13d3ba9d069f97771e98f160a87f8 (patch)
tree0523d4f03724a69761051cfe85f1ecc50ccab54d /LICENSE
parent10d4d3e2d58f94418ca9554aee251232bbaaab99 (diff)
downloadtor-f4656c0cc9c13d3ba9d069f97771e98f160a87f8.tar
tor-f4656c0cc9c13d3ba9d069f97771e98f160a87f8.tar.gz
Raw import of Marek Majkowski's cisphash.c
siphash is a hash function designed for producing hard-to-predict 64-bit outputs from short inputs and a 128-bit key. It's chosen for security and speed. See https://131002.net/siphash/ for more information on siphash. Source: https://github.com/majek/csiphash/
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE23
1 files changed, 23 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 8a6fccaf4..4ebab1823 100644
--- a/LICENSE
+++ b/LICENSE
@@ -101,6 +101,29 @@ src/ext/tor_queue.h is licensed under the following license:
* SUCH DAMAGE.
===============================================================================
+src/ext/csiphash.c is licensed under the following license:
+
+ Copyright (c) 2013 Marek Majkowski <marek@popcount.org>
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ 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
+ THE SOFTWARE.
+
+===============================================================================
src/config/geoip is licensed under the following license:
OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)