diff options
| -rw-r--r-- | checks/ChangeLog | 5 | ||||
| -rw-r--r-- | checks/Makefile.am | 2 | ||||
| -rw-r--r-- | checks/options.in | 1 | ||||
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/gpgv.c | 2 | ||||
| -rw-r--r-- | g10/keyserver.c | 1 |
6 files changed, 11 insertions, 3 deletions
diff --git a/checks/ChangeLog b/checks/ChangeLog index 4fe3d9964..27e1b398d 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Werner Koch <[email protected]> + + * options.in: Remove load-extension tiger + * Makefile.am (./options): append it if there is such a module. + 2001-10-23 Werner Koch <[email protected]> * defs.inc, Makefile.am: Do not use $srcdir when invoking gpg. diff --git a/checks/Makefile.am b/checks/Makefile.am index c2992a91c..9cade48d0 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -61,6 +61,8 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./options: $(srcdir)/options.in cat $(srcdir)/options.in >./options + @set -e; if echo "@DYNAMIC_CIPHER_MODS@" |grep tiger >/dev/null ;then \ + echo load-extension ../cipher/tiger >>./options; fi ./gpg_dearmor: echo '#!/bin/sh' >./gpg_dearmor diff --git a/checks/options.in b/checks/options.in index 166512ff3..b279c0388 100644 --- a/checks/options.in +++ b/checks/options.in @@ -1,6 +1,5 @@ no-greeting no-secmem-warning -load-extension ../cipher/tiger batch emulate-md-encode-bug no-auto-check-trustdb diff --git a/g10/ChangeLog b/g10/ChangeLog index 0e5e9204c..1d3e69579 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -32,7 +32,8 @@ 2001-12-19 Werner Koch <[email protected]> - * g10.c, passphrase.c [CYGWIN32]: Allow this as an alias for MINGW32. + * g10.c, passphrase.c, gpgv.c [CYGWIN32]: Allow this as an alias + for MINGW32. 2001-12-18 David Shaw <[email protected]> diff --git a/g10/gpgv.c b/g10/gpgv.c index 3044d9e4b..8720e51d9 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -151,7 +151,7 @@ main( int argc, char **argv ) opt.always_trust = 1; opt.batch = 1; - #ifdef __MINGW32__ + #if defined (__MINGW32__) || defined (__CYGWIN32__) opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); #else opt.homedir = getenv("GNUPGHOME"); diff --git a/g10/keyserver.c b/g10/keyserver.c index 89f2c68ad..7e5f28731 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -295,6 +295,7 @@ keyserver_spawn(int action,STRLIST list,u32 (*kidlist)[2],int count) filename=m_alloc(strlen("gpgkeys_")+strlen(opt.keyserver_scheme)+1); + strcpy(filename,"gpgkeys_"); strcat(filename,opt.keyserver_scheme); |