[svn] gcry - r1261 - in trunk: . cipher src
svn author wk
cvs at cvs.gnupg.org
Wed Aug 22 11:53:28 CEST 2007
Author: wk
Date: 2007-08-22 11:52:59 +0200 (Wed, 22 Aug 2007)
New Revision: 1261
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/cipher/ChangeLog
trunk/cipher/rndunix.c
trunk/configure.ac
trunk/src/ChangeLog
trunk/src/gcryptrnd.c
trunk/src/getrandom.c
Log:
Made all library code LGPL.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/ChangeLog 2007-08-22 09:52:59 UTC (rev 1261)
@@ -1,6 +1,7 @@
2007-08-22 Werner Koch <wk at g10code.com>
- * configure.ac (USE_RNDW32): Unmark rndw32 as GPL.
+ * README: Rewrite the license description.
+ * configure.ac (USE_RNDW32, USE_RNDUNIX): Unmark as GPL modules.
2007-08-08 Werner Koch <wk at g10code.com>
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/NEWS 2007-08-22 09:52:59 UTC (rev 1261)
@@ -1,6 +1,10 @@
Noteworthy changes in version 1.3.1
------------------------------------------------
+ * The entire library is now under the LGPL. The helper programs and
+ the manual are under the GPL. Kudos to Peter Gutmann for giving
+ permissions to relicense the rndw32 and rndunix modules.
+
* The Camellia cipher is now under the LGPL and included by default.
* Fixed a bug in the detection of symbol prefixes which inhibited the
Modified: trunk/README
===================================================================
--- trunk/README 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/README 2007-08-22 09:52:59 UTC (rev 1261)
@@ -44,20 +44,13 @@
License
-------
- Most of this library is distributed under the terms of the GNU
- Lesser General Public License (LGPL); see the file COPYING.LIB for
- the actual terms. However some parts are distributed under the
- GNU General Public License (GPL) so if you configure Libgcrypt to
- include these modules, you have to comply with the conditions of
- the GPL as found in the file COPYING. The modules under the GPL
- are:
+ The library is distributed under the terms of the GNU Lesser
+ General Public License (LGPL); see the file COPYING.LIB for the
+ actual terms. The helper programs (gcryptrnd and getrandom) as
+ well as the documentation are distributed under the terms of the
+ GNU General Public License (GPL); see the file COPYING for teh
+ actual terms.
- rndunix - Entropy gatherer for Unices without a /dev/random
- gcryptrnd - The random number daemon.
- getrandom - A client for that daemon.
-
- The documentation is available under the terms of the GPL.
-
This library used to be available under the GPL - this was changed
with version 1.1.7 with the rationale that there are now many free
crypto libraries available and many of them come with capabilities
Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/cipher/ChangeLog 2007-08-22 09:52:59 UTC (rev 1261)
@@ -1,6 +1,6 @@
2007-08-22 Werner Koch <wk at g10code.com>
- * rndw32.c: Switched tpo LGPL.
+ * rndw32.c, rndunix.c: Switched to LGPL.
2007-05-30 Werner Koch <wk at g10code.com>
Modified: trunk/cipher/rndunix.c
===================================================================
--- trunk/cipher/rndunix.c 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/cipher/rndunix.c 2007-08-22 09:52:59 UTC (rev 1261)
@@ -34,19 +34,56 @@
author, <pgut001 at cs.auckland.ac.nz> to allow them to be added to the
baseline version of the code.
- ALTERNATIVELY, the code may be distributed under the terms of the GNU
- General Public License, version 2 or any later version published by the
- Free Software Foundation, in which case the provisions of the GNU GPL are
- required INSTEAD OF the above restrictions.
+ ALTERNATIVELY, the code may be distributed under the terms of the
+ GNU Lesser General Public License, version 2.1 or any later version
+ published by the Free Software Foundation, in which case the
+ provisions of the GNU LGPL are required INSTEAD OF the above
+ restrictions.
- Although not required under the terms of the GPL, it would still be nice if
- you could make any changes available to the author to allow a consistent
- code base to be maintained */
+ Although not required under the terms of the LGPL, it would still be
+ nice if you could make any changes available to the author to allow
+ a consistent code base to be maintained. */
+/*************************************************************************
+ The above alternative was changed from GPL to LGPL on 2007-08-22 with
+ permission from Peter Gutmann:
+ ==========
+ From: pgut001 <pgut001 at cs.auckland.ac.nz>
+ Subject: Re: LGPL for the windows entropy gatherer
+ To: wk at gnupg.org
+ Date: Wed, 22 Aug 2007 03:05:42 +1200
+
+ Hi,
+
+ >As of now libgcrypt is GPL under Windows due to that module and some people
+ >would really like to see it under LGPL too. Can you do such a license change
+ >to LGPL version 2? Note that LGPL give the user the option to relicense it
+ >under GPL, so the change would be pretty easy and backwar compatible.
+
+ Sure. I assumed that since GPG was GPLd, you'd prefer the GPL for the entropy
+ code as well, but Ian asked for LGPL as an option so as of the next release
+ I'll have LGPL in there. You can consider it to be retroactive, so your
+ current version will be LGPLd as well.
+
+ Peter.
+ ==========
+ From: pgut001 <pgut001 at cs.auckland.ac.nz>
+ Subject: Re: LGPL for the windows entropy gatherer
+ To: wk at gnupg.org
+ Date: Wed, 22 Aug 2007 20:50:08 +1200
+
+ >Would you mind to extend this also to the Unix entropy gatherer which is
+ >still used on systems without /dev/random and when EGD is not installed? That
+ >would be the last GPLed piece in Libgcrypt.
+
+ Sure, it covers the entire entropy-gathering subsystem.
+
+ Peter.
+ =========
+*/
+/* Fixme: We use plain mallocs here because it may be used as a module.
+ * Should be changed. */
-/* Fixme: We use plain mallocs here beucase it may be used as a module
- * should be changed. */
-
/* General includes */
#include <config.h>
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/configure.ac 2007-08-22 09:52:59 UTC (rev 1261)
@@ -906,8 +906,7 @@
LIST_MEMBER(unix, $random_modules)
-test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo" \
- && gpl="$gpl rndunix"
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo"
AC_DEFINE_UNQUOTED(USE_RNDUNIX, $found,
[Defined if the default Unix RNG should be used.])
if test "$found" = "1"; then
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/src/ChangeLog 2007-08-22 09:52:59 UTC (rev 1261)
@@ -1,3 +1,8 @@
+2007-08-22 Werner Koch <wk at g10code.com>
+
+ * getrandom.c (print_version): Use new standard license line.
+ * gcryptrnd.c (print_version): Ditto.
+
2007-06-06 Werner Koch <wk at g10code.com>
* gcrypt.h.in (GCRY_THREAD_OPTION_PTH_IMPL): Factror network
Modified: trunk/src/gcryptrnd.c
===================================================================
--- trunk/src/gcryptrnd.c 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/src/gcryptrnd.c 2007-08-22 09:52:59 UTC (rev 1261)
@@ -216,9 +216,10 @@
{
fputs (MYVERSION_LINE "\n"
"Copyright (C) 2006 Free Software Foundation, Inc.\n"
- "This program comes with ABSOLUTELY NO WARRANTY.\n"
- "This is free software, and you are welcome to redistribute it\n"
- "under certain conditions. See the file COPYING for details.\n",
+ "License GPLv2+: GNU GPL version 2 or later "
+ "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+ "This is free software: you are free to change and redistribute it.\n"
+ "There is NO WARRANTY, to the extent permitted by law.\n",
stdout);
if (with_help)
Modified: trunk/src/getrandom.c
===================================================================
--- trunk/src/getrandom.c 2007-08-22 09:11:06 UTC (rev 1260)
+++ trunk/src/getrandom.c 2007-08-22 09:52:59 UTC (rev 1261)
@@ -79,9 +79,10 @@
{
fputs (MYVERSION_LINE "\n"
"Copyright (C) 2006 Free Software Foundation, Inc.\n"
- "This program comes with ABSOLUTELY NO WARRANTY.\n"
- "This is free software, and you are welcome to redistribute it\n"
- "under certain conditions. See the file COPYING for details.\n",
+ "License GPLv2+: GNU GPL version 2 or later "
+ "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+ "This is free software: you are free to change and redistribute it.\n"
+ "There is NO WARRANTY, to the extent permitted by law.\n",
stdout);
if (with_help)
More information about the Gnupg-commits
mailing list