aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS22
1 files changed, 13 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS
index 6b79b44ef..76eb6e4c6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,7 @@ List of Copyright holders
Copyright (C) 1992-1996 Regents of the University of Michigan.
Copyright (C) 2000 Dimitrios Souflis
Copyright (C) 2008,2009,2010,2012-2016 William Ahern
+ Copyright (C) 2017 Bundesamt für Sicherheit in der Informationstechnik
Authors with a FSF copyright assignment
@@ -237,19 +238,22 @@ The test driver is based on TinySCHEME by Dimitrios Souflis and
available under a permissive license; see COPYING.other.
-Copyright
-=========
+License
+========
GnuPG is distributed under the GNU General Public License, version 3
-or later.
+or later (see file COPYING).
Note that some files are under a combination of the GNU Lesser General
-Public License, version 3 and the GNU General Public License, version
-2. A few files carry an all permissive license note as found at the
-bottom of this file. A few files are distributed under permissive
-licenses as listed in the file COPYING.other. Some other small files
-are distributed under the Creative Commons Zero license (see file
-COPYING.CC0) which basically puts them into the public domain.
+Public License, version 3 (see file COPYING.LGPL3) and the GNU General
+Public License, version 2 (see file COPYING.GPL2). Some files are
+under the GNU Lesser General Public License, version 2.1 (see file
+COPYING.LGPL21). A few files carry an all permissive license note as
+found at the bottom of this file. A few files are distributed under
+permissive licenses as listed in the file COPYING.other. Some other
+small files are distributed under the Creative Commons Zero license
+(see file COPYING.CC0) which basically puts them into the public
+domain.
=========