summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2017-02-24 13:34:01 +0000
committerEdward Thomson <ethomson@github.com>2017-03-03 10:50:27 +0000
commit2dfd1294f7a694bfa9e864a9489ae3cb318a5ed0 (patch)
tree51970e392a6dadb1b0e2900ec4dd3868bf6cbc5f /COPYING
parenta371a8ae94ff234acdc19cb35dead4312465ffce (diff)
downloadlibgit2-2dfd1294f7a694bfa9e864a9489ae3cb318a5ed0.tar.gz
hash: include sha1collisiondetection
Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING33
1 files changed, 33 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index 1b88b9b8e..da695ebdb 100644
--- a/COPYING
+++ b/COPYING
@@ -958,3 +958,36 @@ necessary. Here is a sample; alter the names:
That's all there is to it!
----------------------------------------------------------------------
+
+The bundled SHA1 collision detection code is licensed under the MIT license:
+
+MIT License
+
+Copyright (c) 2017:
+ Marc Stevens
+ Cryptology Group
+ Centrum Wiskunde & Informatica
+ P.O. Box 94079, 1090 GB Amsterdam, Netherlands
+ marc@marc-stevens.nl
+
+ Dan Shumow
+ Microsoft Research
+ danshu@microsoft.com
+
+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.