summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-10 15:43:56 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-10 15:43:56 +0200
commitf54aecd113d5ee6834672838ed83a732fd383786 (patch)
tree913b9079f76a01c81a1d981e46e7a9d895bf285b
parentd9cb3ec173aa798445eb5844f911f4eba5a59a05 (diff)
parenta3601fc27b73cdf0bfd67fca19fc2f656adec2eb (diff)
Merge branch 'master' into official-master
-rw-r--r--LICENSE32
1 files changed, 32 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 5d630b8..d148bf8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,8 @@
+This file contains the license for Catlfish, an Erlang implementation
+of a Certificate Transparency log server (RFC 6962).
+
+It also contains the licenses for other components used by Catlfish.
+--------------------------------------------------------------------------------
Catlfish is distributed under this license:
Copyright (c) 2014-2015, NORDUnet A/S
@@ -29,3 +34,30 @@ 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.
+--------------------------------------------------------------------------------
+tools/rfc2459.py is licensed under the following license:
+
+# Copyright (c) 2005-2013, Ilya Etingof <ilya@glas.net>
+# All rights reserved.
+#
+# 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.
+#
+# 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 HOLDER 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.