security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS. Strictly

Browse Source 
speaking this should be only in gpg_CPPFLAGS, but then we have to
compile everything twice for gpg and gpgv.

* apdu.c (open_pcsc_reader): Fix double free.

* gpg.c (main) [__APPLE__]: Default the PCSC driver to the OS X
location.  Suggested by Patty A. Hardy.
This commit is contained in:
David Shaw 2005-11-06 04:32:54 +00:00
parent db90be2e94
commit f48ef0f1f0
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/ChangeLog
View File

@ -1,3 +1,14 @@
2005-11-05 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS.
Strictly speaking this should be only in gpg_CPPFLAGS, but then we
have to compile everything twice for gpg and gpgv.
* apdu.c (open_pcsc_reader): Fix double free.
* gpg.c (main) [__APPLE__]: Default the PCSC driver to the OS X
location. Suggested by Patty A. Hardy.
2005-11-02 David Shaw <dshaw@jabberwocky.com> 2005-11-02 David Shaw <dshaw@jabberwocky.com>
* trustdb.c (clean_sigs_from_uid): Include sigs from unavailable * trustdb.c (clean_sigs_from_uid): Include sigs from unavailable

6
g10/Makefile.am
View File

@ -19,14 +19,16 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl @LIBUSB_CPPFLAGS@
EXTRA_DIST = options.skel EXTRA_DIST = options.skel
# it seems that we can't use this with automake 1.5 # it seems that we can't use this with automake 1.5
#OMIT_DEPENDENCIES = zlib.h zconf.h #OMIT_DEPENDENCIES = zlib.h zconf.h
if ! HAVE_DOSISH_SYSTEM if ! HAVE_DOSISH_SYSTEM
AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
endif endif
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
other_libs = $(LIBICONV) $(SRVLIBS) $(LIBINTL) $(CAPLIBS) other_libs = $(LIBICONV) $(SRVLIBS) $(LIBINTL) $(CAPLIBS)

1
g10/apdu.c
View File

@ -1603,7 +1603,6 @@ open_pcsc_reader (const char *portstr)
xfree (reader_table[slot].rdrname); xfree (reader_table[slot].rdrname);
reader_table[slot].rdrname = NULL; reader_table[slot].rdrname = NULL;
reader_table[slot].used = 0; reader_table[slot].used = 0;
xfree (list);
return -1 /*pcsc_error_to_sw (err)*/; return -1 /*pcsc_error_to_sw (err)*/;
} }

4
g10/gpg.c
View File

@ -1711,7 +1711,9 @@ main (int argc, char **argv )
#ifdef ENABLE_CARD_SUPPORT #ifdef ENABLE_CARD_SUPPORT
#if defined(_WIN32) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__CYGWIN__)
opt.pcsc_driver = "winscard.dll"; opt.pcsc_driver = "winscard.dll";
#elif defined(__APPLE__)
opt.pcsc_driver = "/System/Library/Frameworks/PCSC.framework/PCSC";
#else #else
opt.pcsc_driver = "libpcsclite.so"; opt.pcsc_driver = "libpcsclite.so";
#endif #endif