summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE21
-rw-r--r--c_src/erlport.c2
-rw-r--r--c_src/erlport.h2
-rw-r--r--c_src/fsynchelper.c2
-rw-r--r--c_src/hsmhelper.c2
-rw-r--r--c_src/pkcs11.c2
6 files changed, 25 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index 64a2bfc..4daeadb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,9 @@
-Plop is distributed under this license:
+This file contains the license for Plop, an Erlang implementation of a
+public, non-trusted, append-only, distributed log.
+
+It also contains the licenses for other components used by Plop.
+--------------------------------------------------------------------------------
+Plop is distributed under the following license:
Copyright (c) 2014-2015, NORDUnet A/S
@@ -29,3 +34,17 @@ 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.
+--------------------------------------------------------------------------------
+c_src/pkcs11.h is licensed under the following license:
+
+Copyright 2006, 2007 g10 Code GmbH
+Copyright 2006 Andreas Jellinghaus
+
+This file is free software; as a special exception the author gives
+unlimited permission to copy and/or distribute it, with or without
+modifications, as long as this notice is preserved.
+
+This file is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.
diff --git a/c_src/erlport.c b/c_src/erlport.c
index 77f1410..372f98d 100644
--- a/c_src/erlport.c
+++ b/c_src/erlport.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, NORDUnet A/S.
+ * Copyright (c) 2014-2015, NORDUnet A/S.
* See LICENSE for licensing information.
*/
diff --git a/c_src/erlport.h b/c_src/erlport.h
index 0a7d3c7..58b2591 100644
--- a/c_src/erlport.h
+++ b/c_src/erlport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, NORDUnet A/S.
+ * Copyright (c) 2014-2015, NORDUnet A/S.
* See LICENSE for licensing information.
*/
diff --git a/c_src/fsynchelper.c b/c_src/fsynchelper.c
index 2a942be..c4035d8 100644
--- a/c_src/fsynchelper.c
+++ b/c_src/fsynchelper.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, NORDUnet A/S.
+ * Copyright (c) 2014-2015, NORDUnet A/S.
* See LICENSE for licensing information.
*/
diff --git a/c_src/hsmhelper.c b/c_src/hsmhelper.c
index 5ab9045..e7029a0 100644
--- a/c_src/hsmhelper.c
+++ b/c_src/hsmhelper.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, NORDUnet A/S.
+ * Copyright (c) 2015, NORDUnet A/S.
* See LICENSE for licensing information.
*/
diff --git a/c_src/pkcs11.c b/c_src/pkcs11.c
index 23b947a..df89ad1 100644
--- a/c_src/pkcs11.c
+++ b/c_src/pkcs11.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, NORDUnet A/S.
+ * Copyright (c) 2015, NORDUnet A/S.
* See LICENSE for licensing information.
*/