diff options
| author | Werner Koch <wk@gnupg.org> | 2006-10-17 16:34:42 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-10-17 16:34:42 +0200 |
| commit | be410be660305328787559a18b8c9b69790dbfe8 (patch) | |
| tree | 32a7dd94b21d1973c1ceedc3d71e13df34f0c83b /sm | |
| parent | Fixed aegypten bug 372 (diff) | |
| download | gnupg2-be410be660305328787559a18b8c9b69790dbfe8.tar.xz gnupg2-be410be660305328787559a18b8c9b69790dbfe8.zip | |
Pth tweaks and improved estream.c
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 3 | ||||
| -rw-r--r-- | sm/Makefile.am | 7 | ||||
| -rw-r--r-- | sm/gpgsm.c | 9 |
3 files changed, 7 insertions, 12 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 586a8882a..b135a63b7 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,5 +1,8 @@ 2006-10-17 Werner Koch <wk@g10code.com> + * gpgsm.c: No need for pth.h. + (main): or to init it. It used to be hack for W32. + * sign.c (gpgsm_get_default_cert): Changed to return only certificates usable for signing. diff --git a/sm/Makefile.am b/sm/Makefile.am index f3c4564b1..88bd0142d 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -22,8 +22,7 @@ bin_PROGRAMS = gpgsm -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \ - $(PTH_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl include $(top_srcdir)/am/cmacros.am @@ -58,8 +57,8 @@ common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \ ../common/libcommon.a ../gl/libgnu.a gpgsm_LDADD = $(common_libs) \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) \ - -lgpg-error $(LIBINTL) $(PTH_LIBS) $(ZLIBS) + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ + $(GPG_ERROR_LIBS) $(LIBINTL) $(ZLIBS) # Make sure that all libs are build before we use them. This is # important for things like make -j2. diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 08251647b..8abae14b4 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -28,9 +28,7 @@ #include <ctype.h> #include <unistd.h> #include <fcntl.h> -#ifdef USE_GNU_PTH -# include <pth.h> -#endif + #include "gpgsm.h" #include <gcrypt.h> @@ -773,11 +771,6 @@ main ( int argc, char **argv) NEED_KSBA_VERSION, ksba_check_version (NULL) ); } -#ifdef HAVE_W32_SYSTEM - /* For W32 we need pth. */ - pth_init (); -#endif - gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); |