summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-08-15 00:19:42 -0400
committerRich Felker <dalias@aerifal.cx>2012-08-15 00:19:42 -0400
commit0d4d1a96e4fd827267250e469affc7ebfc44324f (patch)
treea11d544e2cb6567e66e37d9ccbedba5455ee3bc0
parent94e920d0cd12d1ef7d82ba72d912771235710328 (diff)
downloadmusl-0d4d1a96e4fd827267250e469affc7ebfc44324f.tar.gz
update copyright/credits for recent code additions
-rw-r--r--COPYRIGHT14
1 files changed, 12 insertions, 2 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 8cd7d73c..f3b5a58a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -43,8 +43,13 @@ and labelled as such. All have been licensed under extremely
permissive terms. See the comments in the individual files for
details.
-The implementation of DES for crypt (src/misc/crypt.c) is Copyright ©
-1994 David Burren. It is licensed under a BSD license.
+The implementation of DES for crypt (src/misc/crypt_des.c) is
+Copyright © 1994 David Burren. It is licensed under a BSD license.
+
+The implementation of blowfish crypt (src/misc/crypt_blowfish.c) was
+originally written by Solar Designer and placed into the public
+domain. The code also comes with a fallback permissive license for use
+in jurisdictions that may not recognize the public domain.
The smoothsort implementation (src/stdlib/qsort.c) is Copyright © 2011
Valentin Ochs and is licensed under an MIT-style license.
@@ -60,6 +65,11 @@ were released into the public domain; others are licensed under the
standard MIT license terms at the top of this file. See individual
files for their copyright status.
+The mips port was originally written by Richard Pennington for use in
+the ellcc project. The original code was adapted by Rich Felker for
+build system and code conventions during upstream integration. It is
+licensed under the standard MIT terms.
+
All files which have no copyright comments are original works
Copyright © 2005-2012 Rich Felker, the main author of this library.
The decision to exclude such comments is intentional, as it should be