diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | cipher/ChangeLog | 4 | ||||
| -rw-r--r-- | cipher/md.c | 6 | ||||
| -rw-r--r-- | cipher/rndw32.c | 40 | ||||
| -rw-r--r-- | configure.ac | 17 |
6 files changed, 55 insertions, 21 deletions
@@ -1,3 +1,11 @@ +2007-08-22 Werner Koch <wk@g10code.com> + + * configure.ac (USE_RNDW32): Unmark rndw32 as GPL. + +2007-08-08 Werner Koch <wk@g10code.com> + + * configure.ac: Use $host and not $target. + 2007-07-26 Werner Koch <wk@g10code.com> * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Fix a syntax error @@ -53,7 +53,6 @@ are: rndunix - Entropy gatherer for Unices without a /dev/random - rndw32 - Entropy gatherer for MS Windows gcryptrnd - The random number daemon. getrandom - A client for that daemon. diff --git a/cipher/ChangeLog b/cipher/ChangeLog index da784fd6..e3274172 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +2007-08-22 Werner Koch <wk@g10code.com> + + * rndw32.c: Switched tpo LGPL. + 2007-05-30 Werner Koch <wk@g10code.com> * camellia.h, camellia.c: Replace by new LGPL version and adjusted diff --git a/cipher/md.c b/cipher/md.c index 28860135..e1cb27dd 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -885,7 +885,7 @@ md_read( gcry_md_hd_t a, int algo ) { /* return the first algorithm */ if (r && r->next) - log_debug("more than algorithm in md_read(0)\n"); + log_debug ("more than one algorithm in md_read(0)\n"); return r->digest->read( &r->context.c ); } else @@ -1133,7 +1133,7 @@ gcry_md_algo_info (int algo, int what, void *buffer, size_t *nbytes) memcpy (buffer, asn, asnlen); *nbytes = asnlen; } - else if ((! buffer) && nbytes) + else if (!buffer && nbytes) *nbytes = asnlen; else { @@ -1200,7 +1200,7 @@ md_stop_debug( gcry_md_hd_t md ) * Returns 1 when the handle works on secured memory * otherwise 0 is returned. There is no error return. * GCRYCTL_IS_ALGO_ENABLED: - * Returns 1 if the algo is enanled for that handle. + * Returns 1 if the algo is enabled for that handle. * The algo must be passed as the address of an int. */ gcry_error_t diff --git a/cipher/rndw32.c b/cipher/rndw32.c index d21dc128..e5c864e2 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -34,15 +34,38 @@ * 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. + * 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@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. + *========== */ #include <config.h> @@ -481,7 +504,8 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) pPerfData = gcry_realloc (pPerfData, cbPerfData); } else { - log_debug ( "rndw32: get performance data problem\n"); + log_debug ("rndw32: get performance data problem: ec=%ld\n", + status); break; } } diff --git a/configure.ac b/configure.ac index 7ba6bd8e..5e087e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -53,9 +53,9 @@ PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION AC_CONFIG_SRCDIR([src/libgcrypt.vers]) -AC_CANONICAL_TARGET() AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_CONFIG_HEADER(config.h) +AC_CANONICAL_HOST AM_MAINTAINER_MODE AH_TOP([ @@ -156,8 +156,8 @@ LIBGCRYPT_THREAD_MODULES="" print_egd_notice=no have_w32_system=no -# Setup some stuff depending on host/target. -case "${target}" in +# Setup some stuff depending on host. +case "${host}" in *-*-mingw32*) available_random_modules="w32" ac_cv_have_dev_random=no @@ -218,7 +218,7 @@ AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) # A printable OS Name is sometimes useful. -case "${target}" in +case "${host}" in *-*-mingw32*) PRINTABLE_OS_NAME="MingW32" ;; @@ -241,7 +241,7 @@ case "${target}" in esac # Figure out the name of the random device -case "${target}" in +case "${host}" in *-openbsd*) # FIXME: Are these the best flags for OpenBSD? NAME_OF_DEV_RANDOM="/dev/srandom" @@ -641,7 +641,7 @@ if test "$random" = "default"; then # Try Linuxish random device. random_modules="linux" else - case "${target}" in + case "${host}" in *-*-mingw32*|*-*-cygwin*) # Windows random device. random_modules="w32" @@ -920,8 +920,7 @@ AC_DEFINE_UNQUOTED(USE_RNDEGD, $found, [Defined if the EGD based RNG should be used.]) LIST_MEMBER(w32, $random_modules) -test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndw32.lo" \ - && gpl="$gpl rndw32" +test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndw32.lo" AC_DEFINE_UNQUOTED(USE_RNDW32, $found, [Defined if the Windows specific RNG should be used.]) @@ -1010,5 +1009,5 @@ if test -n "$gpl"; then fi # Give some feedback -echo " Configured for: $PRINTABLE_OS_NAME ($target)" +echo " Configured for: $PRINTABLE_OS_NAME ($host)" echo |