summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2015-05-25 22:16:06 -0400
committerSimon Howard2015-05-25 22:16:06 -0400
commit4ffeb43fb33f5899f1aaf2b4bae484d2a3d71211 (patch)
tree052e4df8202979e0f32cad5035b1e807f4c0b54a /src
parentd1bfae16981023899c7703ec5004655cd6f0ffaf (diff)
downloadchocolate-doom-4ffeb43fb33f5899f1aaf2b4bae484d2a3d71211.tar.gz
chocolate-doom-4ffeb43fb33f5899f1aaf2b4bae484d2a3d71211.tar.bz2
chocolate-doom-4ffeb43fb33f5899f1aaf2b4bae484d2a3d71211.zip
Change license statement on sha1.c to GPLv2.
This might seem presumptuous but is actually legitimate. The version of sha1.c here is derived from cipher/sha1.c from the GnuPG 1.4 stable branch in 2012. Since October 2007, all GnuPG releases have been made under the GPLv3, but the earlier releases were under GPLv2 and there do not appear to have been any changes to sha1.c between 2007 and 2012. So the same file was previously released under the GPLv2. The relevant commit from the GnuPG Git repository is 9a2a818887b4d36c; this commit is essentially a revert of the part of that commit that applies to cipher/sha1.c. This fixes #479.
Diffstat (limited to 'src')
-rw-r--r--src/sha1.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sha1.c b/src/sha1.c
index 06ab40ad..8504134a 100644
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -7,7 +7,7 @@
*
* GnuPG is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* GnuPG is distributed in the hope that it will be useful,
@@ -16,7 +16,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*/