summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <martin@matuska.org>2018-10-06 22:13:44 +0200
committerMartin Matuska <martin@matuska.org>2018-10-06 22:21:23 +0200
commitf77e06a338a9b5414444de406da5a03f0bda8c00 (patch)
tree81a45c1c549cf668a646ce52430046b29cf0dae9
parentc5013112229053d438cfd722497220742a146db6 (diff)
downloadlibarchive-f77e06a338a9b5414444de406da5a03f0bda8c00.tar.gz
Add information about BLAKE2 multi-license to COPYING
The BLAKE2 source files are multi-licensed with the ability to choose between CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses. For libarchive the CC0 1.0 Universal Public Domain Dedication should be acceptable.
-rw-r--r--COPYING9
1 files changed, 8 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 93952b77..14bbefa0 100644
--- a/COPYING
+++ b/COPYING
@@ -23,6 +23,13 @@ the actual statements in the files are controlling.
* The following source files are in the public domain:
libarchive/archive_getdate.c
+* The following source files are triple-licensed with the ability to choose
+ from CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses:
+ libarchive/archive_blake2.h
+ libarchive/archive_blake2_impl.h
+ libarchive/archive_blake2s_ref.c
+ libarchive/archive_blake2sp_ref.c
+
* The build files---including Makefiles, configure scripts,
and auxiliary scripts used as part of the compile process---have
widely varying licensing terms. Please check individual files before
@@ -34,7 +41,7 @@ do use the license below. The varying licensing of the build scripts
seems to be an unavoidable mess.
-Copyright (c) 2003-2009 <author(s)>
+Copyright (c) 2003-2018 <author(s)>
All rights reserved.
Redistribution and use in source and binary forms, with or without