diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 19 | ||||
| -rw-r--r-- | cipher/ChangeLog | 2 | ||||
| -rw-r--r-- | cipher/rndunix.c | 61 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gcryptrnd.c | 7 | ||||
| -rw-r--r-- | src/getrandom.c | 7 |
9 files changed, 76 insertions, 35 deletions
@@ -1,6 +1,7 @@ 2007-08-22 Werner Koch <wk@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@g10code.com> @@ -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 @@ -44,19 +44,12 @@ 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: - - 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. + 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. 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 diff --git a/cipher/ChangeLog b/cipher/ChangeLog index e3274172..0e9df8f0 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,6 +1,6 @@ 2007-08-22 Werner Koch <wk@g10code.com> - * rndw32.c: Switched tpo LGPL. + * rndw32.c, rndunix.c: Switched to LGPL. 2007-05-30 Werner Koch <wk@g10code.com> diff --git a/cipher/rndunix.c b/cipher/rndunix.c index 7b21a7f5..4f0f79ee 100644 --- a/cipher/rndunix.c +++ b/cipher/rndunix.c @@ -34,18 +34,55 @@ author, <pgut001@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. - - 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 */ - - -/* Fixme: We use plain mallocs here beucase it may be used as a module - * should be changed. */ + 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 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@cs.auckland.ac.nz> + Subject: Re: LGPL for the windows entropy gatherer + To: wk@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@cs.auckland.ac.nz> + Subject: Re: LGPL for the windows entropy gatherer + To: wk@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. */ /* General includes */ diff --git a/configure.ac b/configure.ac index 5e087e9c..18623e7a 100644 --- a/configure.ac +++ b/configure.ac @@ -906,8 +906,7 @@ AC_DEFINE_UNQUOTED(USE_RNDLINUX, $found, 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 diff --git a/src/ChangeLog b/src/ChangeLog index af8c2209..7d5f726a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-08-22 Werner Koch <wk@g10code.com> + + * getrandom.c (print_version): Use new standard license line. + * gcryptrnd.c (print_version): Ditto. + 2007-06-06 Werner Koch <wk@g10code.com> * gcrypt.h.in (GCRY_THREAD_OPTION_PTH_IMPL): Factror network diff --git a/src/gcryptrnd.c b/src/gcryptrnd.c index c15be287..e15fecaf 100644 --- a/src/gcryptrnd.c +++ b/src/gcryptrnd.c @@ -216,9 +216,10 @@ print_version (int with_help) { 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) diff --git a/src/getrandom.c b/src/getrandom.c index 9123c0c6..f4c9b4b2 100644 --- a/src/getrandom.c +++ b/src/getrandom.c @@ -79,9 +79,10 @@ print_version (int with_help) { 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) |